From a37c1d1e17e3161b61f51816018ad10af1fa569b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 17 Mar 2016 10:37:42 +0100 Subject: [PATCH] libnm: don't normalize connection for nm_device_get_applied_connection() Normalizing means that we fail on invalid connections. Which can happen when the server is newer than the libnm version. We just want to return whatever we can. The caller should make sense of this. This makes libnm more accepting and thus is not going to break existing applications. Also, nm_device_get_applied_connection() is new API since nm-1-1. --- libnm/nm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 81077bee4..5679fd5f3 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2355,7 +2355,7 @@ nm_device_get_applied_connection (NMDevice *device, return NULL; } - connection = nm_simple_connection_new_from_dbus (dict, error); + connection = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, error); if (!connection) return NULL; @@ -2397,7 +2397,7 @@ device_get_applied_connection_cb (GObject *proxy, goto out; } - connection = nm_simple_connection_new_from_dbus (dict, &error); + connection = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error); if (!connection) { g_simple_async_result_take_error (simple, error); goto out; -- 2.17.1