summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-auth.c
diff options
context:
space:
mode:
authorJoe Shaw <joeshaw@novell.com>2003-02-18 22:51:35 +0000
committerJoe Shaw <joeshaw@novell.com>2003-02-18 22:51:35 +0000
commit9ada6e2cad0d623fb578f349790a0c62297d2394 (patch)
tree2925acc28c0d15a6bb8bc78909502035847476b8 /dbus/dbus-auth.c
parent9e1b2fe28e0f8ef49221113634d8d591d106820d (diff)
2003-02-18 Joe Shaw <joe@assbarn.com>
* dbus/dbus-auth.c (handle_server_data_stupid_test_mech): Just get credentials from our currently running process. (get_word): Fix a buglet where we were copying the entire length instead of relative to our position. * dbus/dbus-hash.c (_dbus_hash_test): Don't try to allocate the keys on the stack... it's 640k of data. * dbus/dbus-sysdeps.c (_dbus_read_credentials_unix_socket): Always read the credentials byte off the socket, even if we don't have SO_PEERCRED. (_dbus_poll): Implement poll() using select() for systems which don't have it. * glib/test-dbus-glib.c (main): Print out an error if no parameters are given. * test/data/auth/fallback.auth-script: Added. Tests that a client can fallback to a secondary auth mechanism if the first fails.
Diffstat (limited to 'dbus/dbus-auth.c')
-rw-r--r--dbus/dbus-auth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index dca83ba3..c4e1c5e8 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -321,6 +321,8 @@ handle_server_data_stupid_test_mech (DBusAuth *auth,
"OK\r\n"))
return FALSE;
+ _dbus_credentials_from_current_process (&auth->authorized_identity);
+
auth->authenticated_pending_begin = TRUE;
return TRUE;
@@ -799,7 +801,7 @@ get_word (const DBusString *str,
if (i > *start)
{
- if (!_dbus_string_copy_len (str, *start, i, word, 0))
+ if (!_dbus_string_copy_len (str, *start, i - *start, word, 0))
return FALSE;
*start = i;