Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 6 insertions, 15 deletions

diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 9211d9a0..4cbf7d2d 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -209,25 +209,16 @@ do_agent_all (NmCli *nmc, int argc, char **argv)
 }
 
 static const NMCCommand agent_cmds[] = {
-	{"secret",  do_agent_secret,  usage_agent_secret },
-	{"polkit",  do_agent_polkit,  usage_agent_polkit },
-	{"all",     do_agent_all,     usage_agent_all },
-	{NULL,      do_agent_all,     usage }
+	{ "secret",  do_agent_secret,  usage_agent_secret,  TRUE,   TRUE },
+	{ "polkit",  do_agent_polkit,  usage_agent_polkit,  TRUE,   TRUE },
+	{ "all",     do_agent_all,     usage_agent_all,     TRUE,   TRUE },
+	{ NULL,      do_agent_all,     usage,               TRUE,   TRUE },
 };
 
-
 NMCResultCode
 do_agent (NmCli *nmc, int argc, char **argv)
 {
-	/* Get NMClient object */
-	nmc->get_client (nmc);
+	nmc_do_cmd (nmc, agent_cmds, *argv, argc, argv);
 
-	/* Check whether NetworkManager is running */
-	if (!nm_client_get_nm_running (nmc->client)) {
-		g_string_printf (nmc->return_text, _("Error: NetworkManager is not running."));
-		nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
-		return nmc->return_value;
-	}
-
-	return nmc_do_cmd (nmc, agent_cmds, *argv, argc, argv);
+	return nmc->return_value;
 }