diff options
| author | Michael Biebl <biebl@debian.org> | 2015-05-05 17:48:57 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-05-05 17:48:57 +0200 |
| commit | f408e27bccfacf347605a8d98649975a68f38a17 (patch) | |
| tree | 654fd6695c31511baf919b1c0870d119a352ed75 /libnm-core/nm-setting-8021x.c | |
| parent | 2c032d8f1c6292c1338a615e6ec40252889ba85c (diff) | |
Imported Upstream version 1.0.2 upstream/1.0.2
Diffstat (limited to 'libnm-core/nm-setting-8021x.c')
| -rw-r--r-- | libnm-core/nm-setting-8021x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index f739f2c7..41559e0c 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -1884,6 +1884,7 @@ nm_setting_802_1x_get_private_key_format (NMSetting8021x *setting) g_error_free (error); return NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; } + g_error_free (error); return NM_SETTING_802_1X_CK_FORMAT_RAW_KEY; default: break; @@ -2164,6 +2165,7 @@ nm_setting_802_1x_get_phase2_private_key_format (NMSetting8021x *setting) g_error_free (error); return NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; } + g_error_free (error); return NM_SETTING_802_1X_CK_FORMAT_RAW_KEY; default: break; @@ -3258,8 +3260,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * no verification of the server certificate's altSubjectName is performed. **/ /* ---ifcfg-rh--- - * property: altubject-matches - * variable: IEEE_8021X_AlTSUBJECT_MATCHES(+) + * property: altsubject-matches + * variable: IEEE_8021X_ALTSUBJECT_MATCHES(+) * description: List of strings to be matched against the altSubjectName. * example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc" * ---end--- |