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

2006-02-28 Robert Love <rml@novell.com>

Browse source 
* libnm-util/dbus-helpers.c, src/nm-ap-security-wpa-eap.c,
	  src/nm-ap-security-wpa-psk.c: Fix FIXMEs: Callers of the DBUS
	  deserializers are responsible for freeing the returned DBUS strings.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1514 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-02-28 19:40:22 +00:00 • committed by Robert Love
parent 81af94af87
commit 929b45c69f
5 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2006-02-28 Robert Love <rml@novell.com>
* libnm-util/dbus-helpers.c, src/nm-ap-security-wpa-eap.c,
src/nm-ap-security-wpa-psk.c: Fix FIXMEs: Callers of the DBUS
deserializers are responsible for freeing the returned DBUS strings.
2006-02-27 Christopher Aillon <caillon@redhat.com>
* src/nm-device-802-11-wireless.c:
@ -161,7 +167,7 @@
Patch from Dan Winship <danw@novell.com>:
* gnome/applet/eggtrayicon.c: Update EggTrayIcon code. Set the gdk
area to transparent.
2006-02-21 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet.[ch]

18
libnm-util/dbus-helpers.c
View file

@ -57,6 +57,11 @@ nmu_security_serialize_wep (DBusMessageIter *iter,
return TRUE;
}
/*
* nmu_security_deserialize_wep
*
* Callers are responsible for freeing 'key' via dbus_free().
*/
dbus_bool_t
nmu_security_deserialize_wep (DBusMessageIter *iter,
char **key,
@ -162,6 +167,11 @@ nmu_security_serialize_wpa_psk (DBusMessageIter *iter,
return TRUE;
}
/*
* nmu_security_deserialize_wpa_psk
*
* Callers are responsible for freeing 'key' via dbus_free().
*/
dbus_bool_t
nmu_security_deserialize_wpa_psk (DBusMessageIter *iter,
char **key,
@ -326,7 +336,13 @@ nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
return result;
}
/*
* nmu_security_deserialize_wpa_eap
*
* Callers are responsible for freeing identity, passwd, anon_identity,
* private_key_passwd, private_key_file, client_cert_file, and ca_cert_file
* via dbus_free().
*/
dbus_bool_t
nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
int *eap_method,

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

@ -86,13 +86,19 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
security->priv->ca_cert_file = g_strdup (ca_cert_file);
security->priv->wpa_version = wpa_version;
/* FIXME: free passwd, cert_file, and key_file ? */
if (wpa_version == IW_AUTH_WPA_VERSION_WPA2)
nm_ap_security_set_description (NM_AP_SECURITY (security), _("WPA2 Enterprise"));
else
nm_ap_security_set_description (NM_AP_SECURITY (security), _("WPA Enterprise"));
dbus_free (identity);
dbus_free (passwd);
dbus_free (anon_identity);
dbus_free (private_key_passwd);
dbus_free (private_key_file);
dbus_free (client_cert_file);
dbus_free (ca_cert_file);
out:
return security;
}

5
src/nm-ap-security-wpa-psk.c
View file

@ -83,7 +83,10 @@ nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher)
security = g_object_new (NM_TYPE_AP_SECURITY_WPA_PSK, NULL);
nm_ap_security_set_we_cipher (NM_AP_SECURITY (security), we_cipher);
if (key)
nm_ap_security_set_key (NM_AP_SECURITY (security), key, key_len); /* FIXME: Free 'key' ? */
{
nm_ap_security_set_key (NM_AP_SECURITY (security), key, key_len);
dbus_free (key);
}
security->priv->wpa_version = wpa_version;
security->priv->key_mgt = key_mgt;

6
src/vpn-manager/nm-vpn-act-request.c
View file

@ -41,7 +41,7 @@ struct NMVPNActRequest
char ** data_items;
int data_count;
char ** user_routes;
int user_routes_count;
int user_routes_count;
guint daemon_wait_count;
guint callback_id;
@ -50,8 +50,8 @@ struct NMVPNActRequest
NMVPNActRequest *nm_vpn_act_request_new (NMVPNManager *manager, NMVPNService *service, NMVPNConnection *vpn,
NMDevice *parent_dev, char **password_items, int password_count, char **data_items, int data_count,
char **user_routes, int user_routes_count)
NMDevice *parent_dev, char **password_items, int password_count,
char **data_items, int data_count, char **user_routes, int user_routes_count)
{
NMVPNActRequest *req;