summaryrefslogtreecommitdiff
path: root/dbus
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-08-23 11:09:31 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-08-23 11:10:40 +0100
commite5f16e571667908ca9eb149bc52c1a0ea980a3c1 (patch)
tree930b95db567297659f43a9df1d358757b766f5b8 /dbus
parent3006b952dbd939d01507d1397e8c4a0e03f2d7a6 (diff)
downloaddbus-e5f16e571667908ca9eb149bc52c1a0ea980a3c1.tar.gz
Revert "Enable anonymous authorization for tests"
This reverts commit 22fc03d274f186a788efbdbe6b6dfcff1ad474df.
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-auth-script.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 107c92b2..445452c7 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);