From e5f16e571667908ca9eb149bc52c1a0ea980a3c1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 23 Aug 2013 11:09:31 +0100 Subject: [PATCH] Revert "Enable anonymous authorization for tests" This reverts commit 22fc03d274f186a788efbdbe6b6dfcff1ad474df. --- dbus/dbus-auth-script.c | 9 ++------- test/data/auth/anonymous-server-successful.auth-script | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c index 107c92b..445452c 100644 --- a/dbus/dbus-auth-script.c +++ b/dbus/dbus-auth-script.c @@ -398,8 +398,8 @@ _dbus_auth_script_run (const DBusString *filename) _dbus_credentials_unref (creds); } - else if (_dbus_string_starts_with_c_str (&line, "SERVER") || - _dbus_string_starts_with_c_str (&line, "SERVER_ANONYMOUS")) + else if (_dbus_string_starts_with_c_str (&line, + "SERVER")) { DBusCredentials *creds; DBusAuthorization *authorization; @@ -417,11 +417,6 @@ _dbus_auth_script_run (const DBusString *filename) _dbus_warn ("no memory to create DBusAuthorization\n"); goto out; } - /* if we are testing an anonymous server, we need to enable - * anonymous authorization, or the mech will REJECT */ - if (_dbus_string_starts_with_c_str (&line, "SERVER_ANONYMOUS")) - _dbus_authorization_set_allow_anonymous (authorization, TRUE); - auth = _dbus_auth_server_new (&guid, authorization); /* DBusAuth owns it, or finalized on OOM */ _dbus_authorization_unref (authorization); diff --git a/test/data/auth/anonymous-server-successful.auth-script b/test/data/auth/anonymous-server-successful.auth-script index c53b30f..172ae9d 100644 --- a/test/data/auth/anonymous-server-successful.auth-script +++ b/test/data/auth/anonymous-server-successful.auth-script @@ -1,7 +1,6 @@ ## this tests the server side in a successful auth of type ANONYMOUS -## Act as a server that accepts anonymous authorization -SERVER_ANONYMOUS +SERVER ## verify that prior to doing anything, we haven't authed as anyone EXPECT_HAVE_NO_CREDENTIALS SEND 'AUTH ANONYMOUS 442d42757320312e312e31' -- 2.7.4