diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-06-28 15:50:46 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-06-28 16:46:41 +0100 |
| commit | b138aa0f9403878376b8ca4b64cf52f65eecb90f (patch) | |
| tree | 5ce3e2defd91ec7a9b853f14725cd078bca7ddeb | |
| parent | 93616f0d3712388fbee7927ca5b58421d3a9359c (diff) | |
| download | dbus-b138aa0f9403878376b8ca4b64cf52f65eecb90f.tar.gz | |
Properly concat DBUS_CONSOLE_AUTH_DIR with username
This removes the assumption that DBUS_CONSOLE_AUTH_DIR ends with a
trailing /.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51521
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index ef86d738..caa38d0e 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -540,7 +540,7 @@ _dbus_user_at_console (const char *username, DBusError *error) { - DBusString f; + DBusString u, f; dbus_bool_t result; result = FALSE; @@ -556,8 +556,9 @@ _dbus_user_at_console (const char *username, goto out; } + _dbus_string_init_const (&u, username); - if (!_dbus_string_append (&f, username)) + if (!_dbus_concat_dir_and_file (&f, &u)) { _DBUS_SET_OOM (error); goto out; |