diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-17 23:17:04 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-17 23:17:04 +0000 |
| commit | 88cd5da3c0ec86fed29942b062c2f7bf0f8fda44 (patch) | |
| tree | 9ca9236af208046ed5d6edae99cf62d13237f1d0 /dbus/dbus-auth.c | |
| parent | 4219b08bfa318443419c7a3acde28f0b237b05fe (diff) | |
2003-04-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-userdb.c, dbus/dbus-sysdeps.c: redo all the passwd
database usage so it all goes via the DBusUserDatabase cache.
Diffstat (limited to 'dbus/dbus-auth.c')
| -rw-r--r-- | dbus/dbus-auth.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c index 5ee31e52..c585bd08 100644 --- a/dbus/dbus-auth.c +++ b/dbus/dbus-auth.c @@ -26,6 +26,7 @@ #include "dbus-internals.h" #include "dbus-keyring.h" #include "dbus-sha.h" +#include "dbus-userdb.h" /* See doc/dbus-sasl-profile.txt */ @@ -712,8 +713,7 @@ handle_client_initial_response_cookie_sha1_mech (DBusAuth *auth, retval = FALSE; - if (!_dbus_user_info_from_current_process (&username, - NULL, NULL)) + if (!_dbus_username_from_current_process (&username)) goto out_0; if (!_dbus_string_base64_encode (username, 0, @@ -1000,8 +1000,8 @@ handle_server_data_external_mech (DBusAuth *auth, } else { - if (!_dbus_credentials_from_uid_string (&auth->identity, - &auth->desired_identity)) + if (!_dbus_uid_from_string (&auth->identity, + &auth->desired_identity.uid)) { _dbus_verbose ("could not get credentials from uid string\n"); return send_rejected (auth); @@ -1066,7 +1066,8 @@ handle_client_initial_response_external_mech (DBusAuth *auth, if (!_dbus_string_init (&plaintext)) return FALSE; - if (!_dbus_string_append_our_uid (&plaintext)) + if (!_dbus_string_append_uint (&plaintext, + _dbus_getuid ())) goto failed; if (!_dbus_string_base64_encode (&plaintext, 0, |