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

2006-01-08 Dan Williams <dcbw@redhat.com>

Browse source 
* libnm-util/dbus-helpers.c
		- (nmu_security_serialize_wpa_psk): pass a blank key through
			dbus when key == NULL


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1296 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-01-08 23:01:51 +00:00
parent 9b602d8151
commit e73ed7ea26
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-01-08 Dan Williams <dcbw@redhat.com>
* libnm-util/dbus-helpers.c
- (nmu_security_serialize_wpa_psk): pass a blank key through
dbus when key == NULL
2006-01-08 Dan Williams <dcbw@redhat.com>
* gnome/applet/nm-gconf-wso-wpa-psk.c

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

@ -145,13 +145,14 @@ nmu_security_serialize_wpa_psk (DBusMessageIter *iter,
int wpa_version,
int key_mgt)
{
const char * fake_key = "";
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (key != NULL, FALSE);
g_return_val_if_fail ((wpa_version == IW_AUTH_WPA_VERSION_WPA) || (wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
g_return_val_if_fail ((key_mgt == IW_AUTH_KEY_MGMT_802_1X) || (key_mgt == IW_AUTH_KEY_MGMT_PSK), FALSE);
/* Second arg: hashed key (STRING) */
dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &key);
dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, key ? &key : &fake_key);
/* Third arg: WPA version (INT32) */
dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &wpa_version);