From fa68b119c02e696fc11afbec0a77761b5a669ca9 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 15 Nov 2007 20:25:19 +0000 Subject: [PATCH] 2007-11-15 Dan Williams * src/supplicant-manager/nm-supplicant-config.c - (nm_supplicant_config_add_setting_wireless_security): handle PEAP options git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3088 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/supplicant-manager/nm-supplicant-config.c | 21 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5a3c6aa7c0..21c6ecb8e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-15 Dan Williams + + * src/supplicant-manager/nm-supplicant-config.c + - (nm_supplicant_config_add_setting_wireless_security): handle PEAP + options + 2007-11-15 Dan Williams * src/NetworkManagerUtils.c diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index 721770ef1d..00edc77348 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -507,8 +507,29 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig * self, if ( (strcmp (setting->key_mgmt, "ieee8021x") == 0) || (strcmp (setting->key_mgmt, "wpa-eap") == 0)) { + char *phase1 = NULL; + if (!nm_supplicant_config_add_option (self, "fragment_size", "1300", -1, FALSE)) return FALSE; + + if (setting->phase1_peapver) { + if (phase1) + phase1 = g_strdup_printf ("%s peapver=%s", phase1, setting->phase1_peapver); + else + phase1 = g_strdup_printf ("peapver=%s", setting->phase1_peapver); + } + + if (setting->phase1_peaplabel) { + if (phase1) + phase1 = g_strdup_printf ("%s peaplabel=%s", phase1, setting->phase1_peaplabel); + else + phase1 = g_strdup_printf ("peaplabel=%s", setting->phase1_peaplabel); + } + + if (phase1) { + ADD_STRING_VAL (phase1, "phase1", FALSE, FALSE, FALSE); + g_free (phase1); + } } return TRUE;