From ab09843c9f3175f7918498eb7dacc9dd70cf4dfb Mon Sep 17 00:00:00 2001 From: Robert Love Date: Wed, 14 Jun 2006 18:19:38 +0000 Subject: [PATCH] 2006-06-14 Robert Love * src/nm-ap-security-wpa-eap.c: In real_copy_constructor(), actually copy the strings. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1828 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-ap-security-wpa-eap.c | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89b0aa3d01..4a2b909135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-14 Robert Love + + * src/nm-ap-security-wpa-eap.c: In real_copy_constructor(), actually + copy the strings. + + 2006-06-14 Dan Williams Patch from Lorenzo Colitti gnome.org #344825 diff --git a/src/nm-ap-security-wpa-eap.c b/src/nm-ap-security-wpa-eap.c index 0d9603aeca..d059b6db71 100644 --- a/src/nm-ap-security-wpa-eap.c +++ b/src/nm-ap-security-wpa-eap.c @@ -248,11 +248,12 @@ real_write_supplicant_config (NMAPSecurity *instance, if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i anonymous_identity \"%s\"", nwid, anon_identity)) goto out; - if (private_key_file && private_key_passwd && strlen (private_key_file) > 0 && strlen (private_key_passwd) > 0) - { + if (private_key_file && strlen (private_key_file) > 0) if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i private_key \"%s\"", nwid, private_key_file)) goto out; + if (private_key_passwd && strlen (private_key_passwd) > 0) + { msg = g_strdup_printf ("SET_NETWORK %i private_key_passwd ", nwid); if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, msg, "SET_NETWORK %i private_key_passwd \"%s\"", nwid, private_key_passwd)) { @@ -329,13 +330,13 @@ real_copy_constructor (NMAPSecurity *instance) dst->priv->key_type = self->priv->key_type; dst->priv->wpa_version = self->priv->wpa_version; dst->priv->key_mgmt = self->priv->key_mgmt; - dst->priv->identity = self->priv->identity; - dst->priv->passwd = self->priv->passwd; - dst->priv->anon_identity = self->priv->anon_identity; - dst->priv->private_key_passwd = self->priv->private_key_passwd; - dst->priv->private_key_file = self->priv->private_key_file; - dst->priv->client_cert_file = self->priv->client_cert_file; - dst->priv->ca_cert_file = self->priv->ca_cert_file; + dst->priv->identity = g_strdup (self->priv->identity); + dst->priv->passwd = g_strdup (self->priv->passwd); + dst->priv->anon_identity = g_strdup (self->priv->anon_identity); + dst->priv->private_key_passwd = g_strdup (self->priv->private_key_passwd); + dst->priv->private_key_file = g_strdup (self->priv->private_key_file); + dst->priv->client_cert_file = g_strdup (self->priv->client_cert_file); + dst->priv->ca_cert_file = g_strdup (self->priv->ca_cert_file); nm_ap_security_copy_properties (NM_AP_SECURITY (self), NM_AP_SECURITY (dst));