diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-11-22 09:58:52 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-12-11 11:15:53 +0100 |
| commit | dfdcbfe115a700adc83c44ba50438d091fb6e54f (patch) | |
| tree | 95463e695cd876bc0a73a7a4bc93f13b0aebae16 | |
| parent | a3f9e51927939dce17944b31c698060db89bc77d (diff) | |
| download | NetworkManager-dfdcbfe115a700adc83c44ba50438d091fb6e54f.tar.gz | |
core: don't wipe out VPN secrets if we're changing the connection
The VPN secret properties are hashes and thus the default property value does
not work with them.
| -rw-r--r-- | src/settings/nm-settings-connection.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 49331d6d72..529f4d8f4b 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -1229,6 +1229,12 @@ has_some_secrets_cb (NMSetting *setting, { GParamSpec *pspec; + if (NM_IS_SETTING_VPN (setting)) { + if (nm_setting_vpn_get_num_secrets (NM_SETTING_VPN(setting))) + *((gboolean *) user_data) = TRUE; + return; + } + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), key); if (pspec) { if ( (flags & NM_SETTING_PARAM_SECRET) |