diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-01-23 17:12:45 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-01-23 17:12:45 -0600 |
| commit | d9653484859c426f707b4759bc9882f7a57c1152 (patch) | |
| tree | 4c2c34d365be9fc9808b9446bb357af110341e7a | |
| parent | 4b39267b9df394f8fb802073206899004cc84c69 (diff) | |
wifi: fix crash after "merge: remove at_console..." for wifi scan requests
Fix a crash caused by "merge: remove at_console..." when a scan request
comes in via the D-Bus interface. This usage of the device "auth-request"
signal was missed the first time around.
| -rw-r--r-- | src/devices/nm-device-wifi.c | 1 | ||||
| -rw-r--r-- | src/nm-manager.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c index d9fd0edf12..1b1c3ff9b3 100644 --- a/src/devices/nm-device-wifi.c +++ b/src/devices/nm-device-wifi.c @@ -1445,6 +1445,7 @@ impl_device_request_scan (NMDeviceWifi *self, g_signal_emit_by_name (device, NM_DEVICE_AUTH_REQUEST, context, + NULL, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE, request_scan_cb, diff --git a/src/nm-manager.c b/src/nm-manager.c index e5a9702966..c4c79620e7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1682,10 +1682,10 @@ device_auth_request_cb (NMDevice *device, } /* Ensure the subject has permissions for this connection */ - if (!nm_auth_uid_in_acl (connection, - nm_session_monitor_get (), - nm_auth_subject_get_uid (subject), - &error_desc)) { + if (connection && !nm_auth_uid_in_acl (connection, + nm_session_monitor_get (), + nm_auth_subject_get_uid (subject), + &error_desc)) { error = g_error_new_literal (NM_MANAGER_ERROR, NM_MANAGER_ERROR_PERMISSION_DENIED, error_desc); |