From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 18 Mar 2014 13:49:14 +0000 (+0100)
Subject: charon-nm: No additional secrets are required once a password has been entered
X-Git-Tag: 5.1.3dr1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c489c5881a1d47a18ff47625deaf2bdf7245e5a0;p=thirdparty%2Fstrongswan.git

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.
---

diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index f0daff61e9..3ee885a48e 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"))