From 86097cc2e84989577bbcea44834f28e535e9d7d9 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 6 Oct 2019 23:19:32 +0200
Subject: [PATCH] libnm: fix return value for
 nm_remote_settings_reload_connections*() to ignore server result

Note that the server always returns TRUE for the boolean return value
of ReloadConnections. Hence, this should not change in behavior, because
the server would never have returned FALSE.

However, change behavior of the API. It's odd that the function might
return %FALSE without setting the error output. It's also not clear
what the boolean value of the "ReloadConnections" D-Bus would mean
anyway.
---
 introspection/org.freedesktop.NetworkManager.Settings.xml | 2 +-
 libnm/nm-remote-settings.c                                | 6 +++---
 src/settings/nm-settings.c                                | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index 59e0d57549..0587db5f45 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -120,7 +120,7 @@
 
     <!--
         ReloadConnections:
-        @status: Success or failure.
+        @status: This always returns %TRUE.
 
         Tells NetworkManager to reload all connection files from disk, including
         noticing any added or deleted connection files. By default, connections
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index 3c6dc4ec93..1b218c3005 100644
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -503,10 +503,10 @@ nm_remote_settings_reload_connections (NMRemoteSettings *settings,
 	                                                   cancellable, error)) {
 		if (error && *error)
 			g_dbus_error_strip_remote_error (*error);
-		success = FALSE;
+		return FALSE;
 	}
 
-	return success;
+	return TRUE;
 }
 
 static void
@@ -519,7 +519,7 @@ reload_connections_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
 	if (nmdbus_settings_call_reload_connections_finish (NMDBUS_SETTINGS (proxy),
 	                                                    &success,
 	                                                    result, &error))
-		g_simple_async_result_set_op_res_gboolean (simple, success);
+		g_simple_async_result_set_op_res_gboolean (simple, TRUE);
 	else {
 		g_dbus_error_strip_remote_error (error);
 		g_simple_async_result_take_error (simple, error);
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index a8377a5aba..1029474fc5 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -2821,6 +2821,7 @@ impl_settings_reload_connections (NMDBusObject *obj,
 
 	nm_audit_log_connection_op (NM_AUDIT_OP_CONNS_RELOAD, NULL, TRUE, NULL, invocation, NULL);
 
+	/* We MUST return %TRUE here, otherwise older libnm versions might misbehave. */
 	g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", TRUE));
 }