From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 25 Jan 2019 11:24:41 +0100 Subject: New upstream version 1.15.2 --- clients/cli/polkit-agent.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'clients/cli/polkit-agent.c') diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 338f0b15..b895599b 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -40,24 +40,25 @@ polkit_request (NMPolkitListener *listener, gboolean echo_on, gpointer user_data) { - char *response, *tmp, *p; + NmCli *nmc = user_data; g_print ("%s\n", message); g_print ("(action_id: %s)\n", action_id); /* Ask user for polkit authorization password */ if (user) { + gs_free char *tmp = NULL; + char *p; + /* chop of ": " if present */ tmp = g_strdup (request); p = strrchr (tmp, ':'); - if (p && !strcmp (p, ": ")) + if (p && nm_streq (p, ": ")) *p = '\0'; - response = nmc_readline_echo (echo_on, "%s (%s): ", tmp, user); - g_free (tmp); - } else - response = nmc_readline_echo (echo_on, "%s", request); + return nmc_readline_echo (&nmc->nmc_config, echo_on, "%s (%s): ", tmp, user); + } - return response; + return nmc_readline_echo (&nmc->nmc_config, echo_on, "%s", request); } static void -- cgit 1.3.0-6-gf8a5