From c489c5881a1d47a18ff47625deaf2bdf7245e5a0 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 18 Mar 2014 14:49:14 +0100 Subject: [PATCH] charon-nm: No additional secrets are required once a password has been entered Recent versions of NM will call need_secrets() as long as it returns TRUE, but then fail as the number of calls is limited by an assert. Fixes #547. --- src/charon-nm/nm/nm_service.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c index f0daff61e..3ee885a48 100644 --- a/src/charon-nm/nm/nm_service.c +++ b/src/charon-nm/nm/nm_service.c @@ -660,6 +660,10 @@ static gboolean need_secrets(NMVPNPlugin *plugin, NMConnection *connection, key->destroy(key); return FALSE; } + else if (nm_setting_vpn_get_secret(settings, "password")) + { + return FALSE; + } } } else if (streq(method, "smartcard"))