From 168518360fb3beb686bb5982a415e9b614e4875b Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Fri, 21 Nov 2008 07:40:25 +0000 Subject: [PATCH] 2008-11-21 Tambet Ingo * system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): Make suse plugin compile again. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4323 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ system-settings/plugins/ifcfg-suse/parser.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa3b177b1d..68defb6f13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-21 Tambet Ingo + + * system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): Make suse + plugin compile again. + 2008-11-20 Dan Williams Patch from Tambet Ingo diff --git a/system-settings/plugins/ifcfg-suse/parser.c b/system-settings/plugins/ifcfg-suse/parser.c index 3783bcb3be..e9fc57b307 100644 --- a/system-settings/plugins/ifcfg-suse/parser.c +++ b/system-settings/plugins/ifcfg-suse/parser.c @@ -430,6 +430,7 @@ read_wpa_eap_settings (shvarFile *ifcfg) NMSetting8021x *s_802_1x; char *str; GError *err = NULL; + NMSetting8021xCKType cert_type; s_802_1x = NM_SETTING_802_1X (nm_setting_802_1x_new ()); @@ -468,7 +469,7 @@ read_wpa_eap_settings (shvarFile *ifcfg) str = svGetValue (ifcfg, "WIRELESS_CA_CERT"); if (str) { - nm_setting_802_1x_set_ca_cert_from_file (s_802_1x, str, &err); + nm_setting_802_1x_set_ca_cert_from_file (s_802_1x, str, &cert_type, &err); if (err) { g_warning ("Error loading WIRELESS_CA_CERT: %s", err->message); g_error_free (err); @@ -479,7 +480,7 @@ read_wpa_eap_settings (shvarFile *ifcfg) str = svGetValue (ifcfg, "WIRELESS_CLIENT_CERT"); if (str) { - nm_setting_802_1x_set_client_cert_from_file (s_802_1x, str, &err); + nm_setting_802_1x_set_client_cert_from_file (s_802_1x, str, &cert_type, &err); if (err) { g_warning ("Error loading WIRELESS_CLIENT_CERT: %s", err->message); g_error_free (err); @@ -494,7 +495,7 @@ read_wpa_eap_settings (shvarFile *ifcfg) password = svGetValue (ifcfg, "WIRELESS_CLIENT_KEY_PASSWORD"); if (password) { - nm_setting_802_1x_set_private_key_from_file (s_802_1x, str, password, &err); + nm_setting_802_1x_set_private_key_from_file (s_802_1x, str, password, &cert_type, &err); if (err) { g_warning ("Error loading WIRELESS_CLIENT_KEY: %s", err->message); g_error_free (err);