aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2014-03-18 14:49:14 +0100
committerTobias Brunner <tobias@strongswan.org>2014-03-18 14:53:40 +0100
commitc489c5881a1d47a18ff47625deaf2bdf7245e5a0 (patch)
treef2d8eb9cf38d252ca62d21937d1bf7ff4f29e097 /src
parent11f31ceb6af75c8653ba68d93f5f6c8def1391e0 (diff)
downloadstrongswan-c489c5881a1d47a18ff47625deaf2bdf7245e5a0.tar.bz2
strongswan-c489c5881a1d47a18ff47625deaf2bdf7245e5a0.tar.xz
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.
Diffstat (limited to 'src')
-rw-r--r--src/charon-nm/nm/nm_service.c4
1 files changed, 4 insertions, 0 deletions
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"))