diff options
| author | Michael Biebl <biebl@debian.org> | 2019-11-06 20:45:33 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-11-06 20:45:33 +0100 |
| commit | 9c642eac191ef0dce49855d8da0a9e9af18d5113 (patch) | |
| tree | 3d1c7574a02b28c68dd5f9a7288565c7ea4f0fe0 /src/devices/wifi | |
| parent | d0425f68f7ee83a1dc5a6ad3688627c1b472a58b (diff) | |
New upstream version 1.20.6 upstream/1.20.6
Diffstat (limited to 'src/devices/wifi')
| -rw-r--r-- | src/devices/wifi/nm-iwd-manager.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c index 5b550ea4..c79f6cc6 100644 --- a/src/devices/wifi/nm-iwd-manager.c +++ b/src/devices/wifi/nm-iwd-manager.c @@ -150,6 +150,11 @@ agent_dbus_method_cb (GDBusConnection *connection, network = g_dbus_object_manager_get_interface (priv->object_manager, network_path, NM_IWD_NETWORK_INTERFACE); + if (!network) { + _LOGE ("unable to find the network object"); + return; + } + device_path = get_property_string_or_null (G_DBUS_PROXY (network), "Device"); if (!device_path) { @@ -271,9 +276,22 @@ register_agent (NMIwdManager *self) GDBusInterface *agent_manager; agent_manager = g_dbus_object_manager_get_interface (priv->object_manager, - "/", + "/net/connman/iwd", NM_IWD_AGENT_MANAGER_INTERFACE); + if (!agent_manager) { + /* IWD prior to 1.0 dated 30 October, 2019 has the agent manager on a + * different path. */ + agent_manager = g_dbus_object_manager_get_interface (priv->object_manager, + "/", + NM_IWD_AGENT_MANAGER_INTERFACE); + } + + if (!agent_manager) { + _LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work"); + return; + } + /* Register our agent */ g_dbus_proxy_call (G_DBUS_PROXY (agent_manager), "RegisterAgent", |