[pkg-wpa-devel] r872 - in /wpasupplicant/trunk/debian: changelog patches/00list patches/10_fix_non_wpa_zero_len_ssid.dpatch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Fri Aug 24 13:41:07 2007
New Revision: 872

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=872
Log:
* Add 10_fix_non_wpa_zero_len_ssid.dpatch to fix regression inhibiting
  selection of non-WPA zero length ssid. (Closes: #431102)

Added:
    wpasupplicant/trunk/debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/00list

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=872&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Aug 24 13:41:07 2007
@@ -9,8 +9,10 @@
     value in /etc/network/interfaces. (Closes: #367655)
   * Truncate default build .config. Make madwifi config option conditional on
     MADWIFI variable.
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 24 Aug 2007 21:37:59 +1000
+  * Add 10_fix_non_wpa_zero_len_ssid.dpatch to fix regression inhibiting
+    selection of non-WPA zero length ssid. (Closes: #431102)
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 24 Aug 2007 23:26:08 +1000
 
 wpasupplicant (0.6.0-2) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/00list?rev=872&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/00list (original)
+++ wpasupplicant/trunk/debian/patches/00list Fri Aug 24 13:41:07 2007
@@ -1,3 +1,4 @@
+10_fix_non_wpa_zero_len_ssid
 20_madwifi_headers
 30_dbus_policy
 40_debian_doc_examples

Added: wpasupplicant/trunk/debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch?rev=872&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch (added)
+++ wpasupplicant/trunk/debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch Fri Aug 24 13:41:07 2007
@@ -1,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_non_wpa_zero_len_ssid.dpatch by Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: (re)allow selection of zero length non-WPA ssid by
+## DP: wpa_supplicant_select_bss
+
+ at DPATCH@
+diff -Nrup wpa_supplicant-0.6.0.orig/wpa_supplicant/events.c wpa_supplicant-0.6.0/wpa_supplicant/events.c
+--- wpa_supplicant-0.6.0.orig/wpa_supplicant/events.c	2007-05-29 03:26:55.000000000 +1000
++++ wpa_supplicant-0.6.0/wpa_supplicant/events.c	2007-08-24 23:00:03.000000000 +1000
+@@ -444,9 +444,10 @@ wpa_supplicant_select_bss(struct wpa_sup
+ 				wpa_printf(MSG_DEBUG, "   skip - disabled");
+ 				continue;
+ 			}
+-			if (bss->ssid_len != ssid->ssid_len ||
++			if (ssid->ssid_len != 0 &&
++			    (bss->ssid_len != ssid->ssid_len ||
+ 			    os_memcmp(bss->ssid, ssid->ssid,
+-				      bss->ssid_len) != 0) {
++				      bss->ssid_len) != 0)) {
+ 				wpa_printf(MSG_DEBUG, "   skip - "
+ 					   "SSID mismatch");
+ 				continue;