diff options
| author | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
| commit | 636b831a0f663aa53b0e186d5dc44a623150d376 (patch) | |
| tree | 48ef86c0ff45c7c2c7fcddf910a9102d768c957c /clients/cli/agent.c | |
| parent | c8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff) | |
| parent | 270c4830551c9810ad4e83f9a1db2b1cb946208c (diff) | |
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'clients/cli/agent.c')
| -rw-r--r-- | clients/cli/agent.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/clients/cli/agent.c b/clients/cli/agent.c index bc837c72..9211d9a0 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -96,7 +96,8 @@ get_secrets_from_user (const char *request_id, char *pwd = NULL; /* Ask user for the password */ - g_print ("%s\n", msg); + if (msg) + g_print ("%s\n", msg); if (secret->value) { /* Prefill the password if we have it. */ rl_startup_hook = set_deftext; @@ -148,7 +149,10 @@ do_agent_secret (NmCli *nmc, int argc, char **argv) nmc->should_wait++; nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent), NULL); - g_signal_connect (nmc->secret_agent, "request-secrets", G_CALLBACK (secrets_requested), nmc); + g_signal_connect (nmc->secret_agent, + NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS, + G_CALLBACK (secrets_requested), + nmc); g_print (_("nmcli successfully registered as a NetworkManager's secret agent.\n")); } else { g_string_printf (nmc->return_text, _("Error: secret agent initialization failed")); |