From 7e050c88719553d0c74e3dc68caf7bc50ae99590 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 5 Mar 2003 02:01:34 +0000 Subject: 2003-03-04 Havoc Pennington * 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. --- test/data/auth/fallback.auth-script | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'test/data/auth/fallback.auth-script') diff --git a/test/data/auth/fallback.auth-script b/test/data/auth/fallback.auth-script index 1b8c40f5..ebe7ae28 100644 --- a/test/data/auth/fallback.auth-script +++ b/test/data/auth/fallback.auth-script @@ -5,17 +5,18 @@ CLIENT ## Will try EXTERNAL by default first without first calling AUTH alone. EXPECT_COMMAND AUTH -SEND 'REJECTED EXTERNAL DBUS_STUPID_TEST_MECH' +SEND 'REJECTED EXTERNAL DBUS_COOKIE_SHA1 DBUS_TEST_NONEXISTENT_MECH' ## Will try EXTERNAL again. EXPECT_COMMAND AUTH -SEND 'REJECTED EXTERNAL DBUS_STUPID_TEST_MECH' +SEND 'REJECTED EXTERNAL DBUS_COOKIE_SHA1 DBUS_TEST_NONEXISTENT_MECH' -## And this time we get DBUS_STUPID_TEST_MECH. +## And this time we get DBUS_COOKIE_SHA1 EXPECT_COMMAND AUTH +## of course real DBUS_COOKIE_SHA1 would not send this here... SEND 'OK' EXPECT_COMMAND BEGIN -EXPECT_STATE AUTHENTICATED +EXPECT_STATE AUTHENTICATED -- cgit