rpms/NetworkManager/devel no-wpa-no-scan1.patch, NONE, 1.1 NetworkManager.spec, 1.99, 1.100

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28728

Modified Files:
	NetworkManager.spec 
Added Files:
	no-wpa-no-scan1.patch 
Log Message:
* Mon Mar  6 2006 Dan Williams <dcbw at redhat.com> 0.6.0-2
- Don't let wpa_supplicant perform scanning with non-WPA drivers



no-wpa-no-scan1.patch:
 nm-device-802-11-wireless.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE no-wpa-no-scan1.patch ---
Index: src/nm-device-802-11-wireless.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
retrieving revision 1.61
diff -u -p -r1.61 nm-device-802-11-wireless.c
--- src/nm-device-802-11-wireless.c	4 Mar 2006 05:01:57 -0000	1.61
+++ src/nm-device-802-11-wireless.c	4 Mar 2006 06:17:00 -0000
@@ -2462,6 +2462,8 @@ supplicant_send_network_config (NMDevice
 	gboolean			user_created;
 	char *			hex_essid;
 	char *			ap_scan = "AP_SCAN 1";
+	guint32			caps;
+	gboolean			supports_wpa;
 
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (req != NULL, FALSE);
@@ -2472,9 +2474,17 @@ supplicant_send_network_config (NMDevice
 	ctrl = self->priv->supplicant.ctrl;
 	g_assert (ctrl);
 
+	/* Assume that drivers that don't support WPA pretty much suck,
+	 * and can't handle NM scanning along with wpa_supplicant.  Which
+	 * is the case for most of them, airo in particular.
+	 */
+	caps = nm_device_get_type_capabilities (NM_DEVICE (self));
+	supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA)
+				|| (caps & NM_802_11_CAP_PROTO_WPA2);
+
 	/* Ad-Hoc and non-broadcasting networks need AP_SCAN 2 */
 	user_created = nm_ap_get_user_created (ap);
-	if (!nm_ap_get_broadcast (ap) || user_created)
+	if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa)
 		ap_scan = "AP_SCAN 2";
 
 	/* Tell wpa_supplicant that we'll do the scanning */


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- NetworkManager.spec	6 Mar 2006 15:15:19 -0000	1.99
+++ NetworkManager.spec	6 Mar 2006 15:32:31 -0000	1.100
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.6.0
-Release: 1%{?nm_cvs_version}
+Release: 2%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -23,6 +23,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch0: special-case-madwifi.patch
+Patch1: no-wpa-no-scan1.patch
 
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
@@ -117,6 +118,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .madwifi
+%patch1 -p0 -b .no-wpa-no-scan1
 
 %build
 %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes
@@ -211,6 +213,9 @@
 
 
 %changelog
+* Mon Mar  6 2006 Dan Williams <dcbw at redhat.com> 0.6.0-2
+- Don't let wpa_supplicant perform scanning with non-WPA drivers
+
 * Mon Mar  6 2006 Dan Williams <dcbw at redhat.com> 0.6.0-1
 - Update to 0.6.0 release
 - Move autostart file to /usr/share/gnome/autostart