diff options
| author | Romain Francoise <rfrancoise@debian.org> | 2014-04-15 19:35:31 +0200 |
|---|---|---|
| committer | Romain Francoise <rfrancoise@debian.org> | 2014-04-15 19:35:31 +0200 |
| commit | df40590dead5696facf9943f46e222a5e831286d (patch) | |
| tree | d701325b24c0e1c5676fa9cb8ed959254dd4367a /src/charon-nm | |
| parent | 91b54afb0421705a4fb9d990d813007cd45bc2ce (diff) | |
| parent | c5ebfc7b9c16551fe825dc1d79c3f7e2f096f6c9 (diff) | |
| download | vyos-strongswan-df40590dead5696facf9943f46e222a5e831286d.tar.gz vyos-strongswan-df40590dead5696facf9943f46e222a5e831286d.zip | |
Merge tag 'upstream/5.1.3'
Upstream version 5.1.3
* tag 'upstream/5.1.3':
Import upstream version 5.1.3
Diffstat (limited to 'src/charon-nm')
| -rw-r--r-- | src/charon-nm/Makefile.in | 1 | ||||
| -rw-r--r-- | src/charon-nm/nm/nm_service.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/charon-nm/Makefile.in b/src/charon-nm/Makefile.in index 955d15313..edc3d7743 100644 --- a/src/charon-nm/Makefile.in +++ b/src/charon-nm/Makefile.in @@ -347,7 +347,6 @@ nm_LIBS = @nm_LIBS@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ -openac_plugins = @openac_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c index f0daff61e..67366a067 100644 --- a/src/charon-nm/nm/nm_service.c +++ b/src/charon-nm/nm/nm_service.c @@ -329,7 +329,6 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection, { g_set_error(err, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, "Failed to create dummy TUN device."); - gateway->destroy(gateway); return FALSE; } address = nm_setting_vpn_get_data_item(vpn, "address"); @@ -660,6 +659,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")) |