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.

7 files changed, 16 insertions, 15 deletions

diff --git a/test/data/auth/external-failed.auth-script b/test/data/auth/external-failed.auth-script
index f5723521..8f0d1aa9 100644
--- a/test/data/auth/external-failed.auth-script
+++ b/test/data/auth/external-failed.auth-script
@@ -2,7 +2,7 @@
 
 SERVER
 NO_CREDENTIALS
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
diff --git a/test/data/auth/external-root.auth-script b/test/data/auth/external-root.auth-script
index 720b7e51..c126067c 100644
--- a/test/data/auth/external-root.auth-script
+++ b/test/data/auth/external-root.auth-script
@@ -2,7 +2,7 @@
 
 SERVER
 ROOT_CREDENTIALS
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND OK
 EXPECT_STATE WAITING_FOR_INPUT
 SEND 'BEGIN'
diff --git a/test/data/auth/external-silly.auth-script b/test/data/auth/external-silly.auth-script
index 3e12c153..cbfef8fd 100644
--- a/test/data/auth/external-silly.auth-script
+++ b/test/data/auth/external-silly.auth-script
@@ -2,7 +2,7 @@
 
 SERVER
 SILLY_CREDENTIALS
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
diff --git a/test/data/auth/external-successful.auth-script b/test/data/auth/external-successful.auth-script
index 1b380802..02ecdc08 100644
--- a/test/data/auth/external-successful.auth-script
+++ b/test/data/auth/external-successful.auth-script
@@ -1,7 +1,7 @@
 ## this tests a successful auth of type EXTERNAL
 
 SERVER
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND OK
 EXPECT_STATE WAITING_FOR_INPUT
 SEND 'BEGIN'
diff --git a/test/data/auth/extra-bytes.auth-script b/test/data/auth/extra-bytes.auth-script
index df8df52b..0bd705dc 100644
--- a/test/data/auth/extra-bytes.auth-script
+++ b/test/data/auth/extra-bytes.auth-script
@@ -1,7 +1,7 @@
 ## this tests that we have the expected extra bytes at the end
 
 SERVER
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND OK
 EXPECT_STATE WAITING_FOR_INPUT
 SEND 'BEGIN\r\nHello'
diff --git a/test/data/auth/fail-after-n-attempts.auth-script b/test/data/auth/fail-after-n-attempts.auth-script
index 75bd3801..ae3b907a 100644
--- a/test/data/auth/fail-after-n-attempts.auth-script
+++ b/test/data/auth/fail-after-n-attempts.auth-script
@@ -4,30 +4,30 @@ SERVER
 NO_CREDENTIALS
 
 # 1
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
 # 2
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
 # 3
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
 # 4
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
 # 5
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_COMMAND REJECTED
 EXPECT_STATE WAITING_FOR_INPUT
 
 # 6
-SEND 'AUTH EXTERNAL USERNAME_BASE64'
+SEND 'AUTH EXTERNAL USERID_BASE64'
 EXPECT_STATE NEED_DISCONNECT
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