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-script.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-script.c')
| -rw-r--r-- | dbus/dbus-auth-script.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c index b8015c2d..d61ecb59 100644 --- a/dbus/dbus-auth-script.c +++ b/dbus/dbus-auth-script.c @@ -30,6 +30,7 @@ #include "dbus-hash.h" #include "dbus-internals.h" #include "dbus-marshal.h" +#include "dbus-userdb.h" /** * @defgroup DBusAuthScript code for running unit test scripts for DBusAuth @@ -373,7 +374,8 @@ _dbus_auth_script_run (const DBusString *filename) goto out; } - if (!_dbus_string_append_our_uid (&username)) + if (!_dbus_string_append_uint (&username, + _dbus_getuid ())) { _dbus_warn ("no memory for userid\n"); _dbus_string_free (&username); @@ -407,7 +409,7 @@ _dbus_auth_script_run (const DBusString *filename) goto out; } - if (!_dbus_user_info_from_current_process (&u, NULL, NULL) || + if (!_dbus_username_from_current_process (&u) || !_dbus_string_copy (u, 0, &username, _dbus_string_get_length (&username))) { |