colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't hardcode the zero. The key type is NM_AUTH_TYPE_WPA_PSK_AUTO.

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1631 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-03-22 21:26:58 +00:00
parent 2edcffb40e
commit aeec0b1d89
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnome/applet/wireless-security-option.c
View File

@@ -208,7 +208,7 @@ wso_wpa_create_key_type_model (int capabilities, gboolean wpa_eap, int *num_adde
name = _("Automatic (Default)"); name = _("Automatic (Default)");
gtk_list_store_append (model, &iter); gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name, gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
WPA_KEY_TYPE_CIPHER_COL, 0, -1); WPA_KEY_TYPE_CIPHER_COL, NM_AUTH_TYPE_WPA_PSK_AUTO, -1);
if (capabilities & NM_802_11_CAP_CIPHER_CCMP) if (capabilities & NM_802_11_CAP_CIPHER_CCMP)
{ {

6
libnm-util/dbus-helpers.c
View File

@@ -268,7 +268,7 @@ nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
|| (eap_method == NM_EAP_METHOD_PEAP) || (eap_method == NM_EAP_METHOD_PEAP)
|| (eap_method == NM_EAP_METHOD_TLS) || (eap_method == NM_EAP_METHOD_TLS)
|| (eap_method == NM_EAP_METHOD_TTLS), FALSE); || (eap_method == NM_EAP_METHOD_TTLS), FALSE);
g_return_val_if_fail ((key_type == 0) g_return_val_if_fail ((key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
|| (key_type == IW_AUTH_CIPHER_CCMP) || (key_type == IW_AUTH_CIPHER_CCMP)
|| (key_type == IW_AUTH_CIPHER_TKIP) || (key_type == IW_AUTH_CIPHER_TKIP)
|| (key_type == IW_AUTH_CIPHER_WEP104), FALSE); || (key_type == IW_AUTH_CIPHER_WEP104), FALSE);
@@ -331,7 +331,7 @@ nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
|| (eap_method == NM_EAP_METHOD_PEAP) || (eap_method == NM_EAP_METHOD_PEAP)
|| (eap_method == NM_EAP_METHOD_TLS) || (eap_method == NM_EAP_METHOD_TLS)
|| (eap_method == NM_EAP_METHOD_TTLS), FALSE); || (eap_method == NM_EAP_METHOD_TTLS), FALSE);
g_return_val_if_fail ((key_type == 0) g_return_val_if_fail ((key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
|| (key_type == IW_AUTH_CIPHER_CCMP) || (key_type == IW_AUTH_CIPHER_CCMP)
|| (key_type == IW_AUTH_CIPHER_TKIP) || (key_type == IW_AUTH_CIPHER_TKIP)
|| (key_type == IW_AUTH_CIPHER_WEP104), FALSE); || (key_type == IW_AUTH_CIPHER_WEP104), FALSE);
@@ -406,7 +406,7 @@ nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
g_return_val_if_fail (dbus_message_iter_next (iter), FALSE); g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE); g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE);
dbus_message_iter_get_basic (iter, &dbus_key_type); dbus_message_iter_get_basic (iter, &dbus_key_type);
g_return_val_if_fail ((dbus_key_type == 0) g_return_val_if_fail ((dbus_key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
|| (dbus_key_type == IW_AUTH_CIPHER_CCMP) || (dbus_key_type == IW_AUTH_CIPHER_CCMP)
|| (dbus_key_type == IW_AUTH_CIPHER_TKIP) || (dbus_key_type == IW_AUTH_CIPHER_TKIP)
|| (dbus_key_type == IW_AUTH_CIPHER_WEP104), FALSE); || (dbus_key_type == IW_AUTH_CIPHER_WEP104), FALSE);

2
src/nm-ap-security-wpa-eap.c
View File

@@ -196,7 +196,7 @@ real_write_supplicant_config (NMAPSecurity *instance,
|| eap_method == NM_EAP_METHOD_PEAP || eap_method == NM_EAP_METHOD_PEAP
|| eap_method == NM_EAP_METHOD_TLS || eap_method == NM_EAP_METHOD_TLS
|| eap_method == NM_EAP_METHOD_TTLS, FALSE); || eap_method == NM_EAP_METHOD_TTLS, FALSE);
g_return_val_if_fail ((key_type == 0) g_return_val_if_fail ((key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
|| (key_type == IW_AUTH_CIPHER_CCMP) || (key_type == IW_AUTH_CIPHER_CCMP)
|| (key_type == IW_AUTH_CIPHER_TKIP) || (key_type == IW_AUTH_CIPHER_TKIP)
|| (key_type == IW_AUTH_CIPHER_WEP104), FALSE); || (key_type == IW_AUTH_CIPHER_WEP104), FALSE);