diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-24 23:36:28 +0000 | 
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-24 23:36:28 +0000 | 
| commit | b68ec936d7c8b934c9c415aefa2e508c581ccd45 (patch) | |
| tree | f23e49fd8dbae1afa0d1e19642efe8afacd66b66 /daemon/echo.c | |
| parent | 43d88387413875f41b491545372c3086e9659fbe (diff) | |
Fix authorization request handling
Diffstat (limited to 'daemon/echo.c')
| -rw-r--r-- | daemon/echo.c | 14 | 
1 files changed, 10 insertions, 4 deletions
| diff --git a/daemon/echo.c b/daemon/echo.c index 97d7742c..91d544c4 100644 --- a/daemon/echo.c +++ b/daemon/echo.c @@ -43,8 +43,6 @@  #include "dbus.h"  #include "logging.h" -static GMainLoop *main_loop = NULL; -  static sdp_session_t *sdp_session = NULL;  static sdp_record_t *sdp_record = NULL; @@ -70,12 +68,18 @@ static void authorization_callback(DBusPendingCall *call, void *data)  {  	DBusMessage *reply = dbus_pending_call_steal_reply(call);  	GIOChannel *io = data; +	DBusError err; -	debug("Authorization request returned"); +	dbus_error_init(&err); -	if (dbus_message_get_args(reply, NULL, DBUS_TYPE_INVALID) == TRUE) +	if (dbus_set_error_from_message(&err, reply)) { +		error("Access to the service has been %s", err.message); +		dbus_error_free(&err); +	} else { +		info("Accepting incoming connection");  		g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR,  						session_event, NULL); +	}  	g_io_channel_unref(io); @@ -264,6 +268,8 @@ static int register_standalone(DBusConnection *conn)  	return 0;  } +static GMainLoop *main_loop = NULL; +  static void sig_term(int sig)  {  	g_main_loop_quit(main_loop); | 
