summaryrefslogtreecommitdiff
path: root/dbus/dbus-auth-script.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-08-23 11:09:34 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-08-23 11:10:41 +0100
commit414cb42dee3d7678ae24aca2f55ec0d83892fbb4 (patch)
treee0514ab6b1064ef7d97f9d0ae489b08f3457fda7 /dbus/dbus-auth-script.c
parent75f5b682cc57828fa8593b00f83342c03743cad1 (diff)
downloaddbus-414cb42dee3d7678ae24aca2f55ec0d83892fbb4.tar.gz
Revert "Actually use DBusAuthorization in DBusAuth EXTERNAL mech"
This reverts commit d5d25b5efd35d8d9bbb9d58cae441debf8f7ded6.
Diffstat (limited to 'dbus/dbus-auth-script.c')
-rw-r--r--dbus/dbus-auth-script.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 445452c7..c1f0c88e 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -30,7 +30,6 @@
#include "dbus-hash.h"
#include "dbus-credentials.h"
#include "dbus-internals.h"
-#include "dbus-authorization.h"
/**
* @defgroup DBusAuthScript code for running unit test scripts for DBusAuth
@@ -402,7 +401,6 @@ _dbus_auth_script_run (const DBusString *filename)
"SERVER"))
{
DBusCredentials *creds;
- DBusAuthorization *authorization;
if (auth != NULL)
{
@@ -410,16 +408,7 @@ _dbus_auth_script_run (const DBusString *filename)
goto out;
}
- /* empty authorization, it will use default rules */
- authorization = _dbus_authorization_new ();
- if (authorization == NULL)
- {
- _dbus_warn ("no memory to create DBusAuthorization\n");
- goto out;
- }
- auth = _dbus_auth_server_new (&guid, authorization);
- /* DBusAuth owns it, or finalized on OOM */
- _dbus_authorization_unref (authorization);
+ auth = _dbus_auth_server_new (&guid);
if (auth == NULL)
{
_dbus_warn ("no memory to create DBusAuth\n");