fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-05 19:40:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-06-14 Robert Love <rml@novell.com>

Browse source 
* 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
This commit is contained in:
Robert Love 2006-06-14 18:19:38 +00:00 • committed by Robert Love
parent 845e4b3705
commit ab09843c9f
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-06-14 Robert Love <rml@novell.com>
* src/nm-ap-security-wpa-eap.c: In real_copy_constructor(), actually
copy the strings.
2006-06-14 Dan Williams <dcbw@redhat.com>
Patch from Lorenzo Colitti <lorenzo@colitti.com> gnome.org #344825

19
src/nm-ap-security-wpa-eap.c
View file

@ -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 <key>", 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));