diff -Nru network-manager-applet-0.6.5.original/debian/changelog network-manager-applet-0.6.5/debian/changelog --- network-manager-applet-0.6.5.original/debian/changelog 2007-11-11 11:57:08.000000000 +0000 +++ network-manager-applet-0.6.5/debian/changelog 2007-11-11 12:07:18.000000000 +0000 @@ -1,3 +1,12 @@ +network-manager-applet (0.6.5-0ubuntu11) gutsy; urgency=medium + + * src/applet-dbus-info.c: applied patch to fix bug #132473 (will + not reconnect to WPA2 enterprise network). Patch found by Paul + Novotny upstream at + http://www.mail-archive.com/networkmanager-list@gnome.org/msg06535.html + + -- Steven Ayre Sun, 11 Nov 2007 12:02:12 +0000 + network-manager-applet (0.6.5-0ubuntu10) gutsy; urgency=low * debian/control: add missing depends on gksu to allow manual diff -Nru network-manager-applet-0.6.5.original/src/applet-dbus-info.c network-manager-applet-0.6.5/src/applet-dbus-info.c --- network-manager-applet-0.6.5.original/src/applet-dbus-info.c 2007-04-19 19:01:13.000000000 +0100 +++ network-manager-applet-0.6.5/src/applet-dbus-info.c 2007-11-11 11:56:39.000000000 +0000 @@ -152,6 +152,7 @@ char * temp = NULL; char * escaped_network; int we_cipher = -1; + char * private_key_file = NULL; g_return_val_if_fail (applet != NULL, NULL); g_return_val_if_fail (message != NULL, NULL); @@ -182,9 +183,14 @@ || !temp) new_key = TRUE; + nm_gconf_get_string_helper (applet->gconf_client, + GCONF_PATH_WIRELESS_NETWORKS, + "wpa_eap_private_key_file", escaped_network, &private_key_file); + /* Hack: 802.1x passwords are not stored in the keyring */ if (!new_key && - (we_cipher == NM_AUTH_TYPE_WPA_EAP || we_cipher == NM_AUTH_TYPE_LEAP)) + ((we_cipher == NM_AUTH_TYPE_WPA_EAP && !private_key_file) || + we_cipher == NM_AUTH_TYPE_LEAP)) { NMGConfWSO *gconf_wso; gconf_wso = nm_gconf_wso_new_deserialize_gconf (applet->gconf_client,