fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 12:38:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-11-21 Tambet Ingo <tambet@gmail.com>

Browse source 
* 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
This commit is contained in:
Tambet Ingo 2008-11-21 07:40:25 +00:00
parent 93f1c85b26
commit 168518360f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-11-21 Tambet Ingo <tambet@gmail.com>
* system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): Make suse
plugin compile again.
2008-11-20 Dan Williams <dcbw@redhat.com> 2008-11-20 Dan Williams <dcbw@redhat.com>
Patch from Tambet Ingo <tambet@gmail.com> Patch from Tambet Ingo <tambet@gmail.com>

7
system-settings/plugins/ifcfg-suse/parser.c
View file

@ -430,6 +430,7 @@ read_wpa_eap_settings (shvarFile *ifcfg)
NMSetting8021x *s_802_1x; NMSetting8021x *s_802_1x;
char *str; char *str;
GError *err = NULL; GError *err = NULL;
NMSetting8021xCKType cert_type;
s_802_1x = NM_SETTING_802_1X (nm_setting_802_1x_new ()); 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"); str = svGetValue (ifcfg, "WIRELESS_CA_CERT");
if (str) { 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) { if (err) {
g_warning ("Error loading WIRELESS_CA_CERT: %s", err->message); g_warning ("Error loading WIRELESS_CA_CERT: %s", err->message);
g_error_free (err); g_error_free (err);
@ -479,7 +480,7 @@ read_wpa_eap_settings (shvarFile *ifcfg)
str = svGetValue (ifcfg, "WIRELESS_CLIENT_CERT"); str = svGetValue (ifcfg, "WIRELESS_CLIENT_CERT");
if (str) { 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) { if (err) {
g_warning ("Error loading WIRELESS_CLIENT_CERT: %s", err->message); g_warning ("Error loading WIRELESS_CLIENT_CERT: %s", err->message);
g_error_free (err); g_error_free (err);
@ -494,7 +495,7 @@ read_wpa_eap_settings (shvarFile *ifcfg)
password = svGetValue (ifcfg, "WIRELESS_CLIENT_KEY_PASSWORD"); password = svGetValue (ifcfg, "WIRELESS_CLIENT_KEY_PASSWORD");
if (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) { if (err) {
g_warning ("Error loading WIRELESS_CLIENT_KEY: %s", err->message); g_warning ("Error loading WIRELESS_CLIENT_KEY: %s", err->message);
g_error_free (err); g_error_free (err);