>From 232fa58e502df054d9e2089b72ae6dca8ab95747 Mon Sep 17 00:00:00 2001 From: "M. Vefa Bicakci" Date: Sat, 24 May 2014 19:37:00 -0400 Subject: [PATCH] core: Emit NM_DEVICE_AUTH_REQUEST signal correctly --- src/nm-device-wifi.c | 1 + src/nm-manager.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 8ca527807e..e7e270de4e 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -1563,6 +1563,7 @@ impl_device_request_scan (NMDeviceWifi *self, g_signal_emit_by_name (device, NM_DEVICE_AUTH_REQUEST, context, + nm_device_get_connection (device), NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE, request_scan_cb, diff --git a/src/nm-manager.c b/src/nm-manager.c index 9037e649c0..96bf3b4479 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1874,10 +1874,10 @@ device_auth_request_cb (NMDevice *device, } /* Ensure the subject has permissions for this connection */ - if (!nm_auth_uid_in_acl (connection, - priv->session_monitor, - sender_uid, - &error_desc)) { + if (connection != NULL && !nm_auth_uid_in_acl (connection, + priv->session_monitor, + sender_uid, + &error_desc)) { error = g_error_new_literal (NM_MANAGER_ERROR, NM_MANAGER_ERROR_PERMISSION_DENIED, error_desc); -- 2.0.0.rc4