diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-05 02:01:34 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-05 02:01:34 +0000 |
| commit | 7e050c88719553d0c74e3dc68caf7bc50ae99590 (patch) | |
| tree | f7a9abccae6591849e58e71d45dded9aa76512ec /dbus/dbus-sysdeps.c | |
| parent | 6bea42d2b84121152e4e5c719d23ed22901a972a (diff) | |
2003-03-04 Havoc Pennington <hp@pobox.com>
* test/data/auth/*: adapt to changes
* dbus/dbus-auth-script.c (_dbus_auth_script_run): add
USERID_BASE64 and change USERNAME_BASE64 to put in username not
userid
* dbus/dbus-keyring.c (_dbus_keyring_validate_context): prevent
more stuff from being in a context name, to make the protocol
simpler to deal with
* dbus/dbus-errors.c (dbus_error_has_name): new function
(dbus_error_is_set): new function
* dbus/dbus-auth.c: replace DBUS_STUPID_TEST_MECH auth
with DBUS_COOKIE_SHA1, implement DBUS_COOKIE_SHA1
* dbus/dbus-connection.c (dbus_connection_flush): also read
messages during a flush operation
* dbus/Makefile.am: remove dbus-md5 since it isn't currently used.
Diffstat (limited to 'dbus/dbus-sysdeps.c')
| -rw-r--r-- | dbus/dbus-sysdeps.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 2310b000..d096ce3e 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -1107,14 +1107,17 @@ get_user_info (const DBusString *username, DBusString *username_out) { const char *username_c_str; - - credentials->pid = -1; - credentials->uid = -1; - credentials->gid = -1; - + /* exactly one of username/uid provided */ _dbus_assert (username != NULL || uid >= 0); _dbus_assert (username == NULL || uid < 0); + + if (credentials) + { + credentials->pid = -1; + credentials->uid = -1; + credentials->gid = -1; + } if (username != NULL) _dbus_string_get_const_data (username, &username_c_str); |