diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-14 20:59:16 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-14 20:59:16 +0000 |
| commit | 48c6f1472dc315c9572cb1aebf8c7b68a66f5bef (patch) | |
| tree | 75c1b5a65141ac5a69ee11cf1d6354b5211bc45d /dbus/dbus-auth-script.c | |
| parent | 323790705782bee0d54ea9a342718a49b4ee5be6 (diff) | |
2007-06-14 Havoc Pennington <hp@redhat.com>
* dbus/dbus-auth.c: adapt to keyring changes
* dbus/dbus-keyring.c: change to avoid using user ID and home
directory directly; instead use a
keyring-location-from-credentials function in dbus-sysdeps
* fix to use _dbus_append_user_from_current_process() instead of
_dbus_username_from_current_process() or _dbus_append_desired_identity().
Diffstat (limited to 'dbus/dbus-auth-script.c')
| -rw-r--r-- | dbus/dbus-auth-script.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c index eb145e49..b23fbfcb 100644 --- a/dbus/dbus-auth-script.c +++ b/dbus/dbus-auth-script.c @@ -488,7 +488,7 @@ _dbus_auth_script_run (const DBusString *filename) goto out; } - if (!_dbus_append_desired_identity (&username)) + if (!_dbus_append_user_from_current_process (&username)) { _dbus_warn ("no memory for userid\n"); _dbus_string_free (&username); @@ -513,7 +513,6 @@ _dbus_auth_script_run (const DBusString *filename) "USERNAME_HEX", &where)) { DBusString username; - const DBusString *u; if (!_dbus_string_init (&username)) { @@ -522,9 +521,7 @@ _dbus_auth_script_run (const DBusString *filename) goto out; } - if (!_dbus_username_from_current_process (&u) || - !_dbus_string_copy (u, 0, &username, - _dbus_string_get_length (&username))) + if (!_dbus_append_user_from_current_process (&username)) { _dbus_warn ("no memory for username\n"); _dbus_string_free (&username); |