← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/wpasupplicant/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler, Alexander Sack
  • Date: 2007-08-26 16:06:57 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070826160657-2m8pxoweuxe8f93t
Tags: 0.6.0+0.5.8-0ubuntu1
https://launchpad.net/bugs/140763
https://launchpad.net/bugs/141233
* New upstream release
* remove patch 11_erroneous_manpage_ref, applied upstream
* remove patch 25_wpas_dbus_unregister_iface_fix, applied upstream

[ Alexander Sack ]
* bumping upstream version to replace development version 0.6.0 with
  this package from stable release branch.
* attempt to fix wierd timeout and high latency issues by going
  back to stable upstream version (0.5.9) (LP: #140763,
  LP: #141233).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## fix_non_wpa_zero_len_ssid.dpatch by Kel Modderman <kel@otaku42.de>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: (re)allow selection of zero length non-WPA ssid by
6
 
## DP: wpa_supplicant_select_bss
7
 
 
8
 
@DPATCH@
9
 
diff -Nrup wpa_supplicant-0.6.0.orig/wpa_supplicant/events.c wpa_supplicant-0.6.0/wpa_supplicant/events.c
10
 
--- wpa_supplicant-0.6.0.orig/wpa_supplicant/events.c   2007-05-29 03:26:55.000000000 +1000
11
 
+++ wpa_supplicant-0.6.0/wpa_supplicant/events.c        2007-08-24 23:00:03.000000000 +1000
12
 
@@ -444,9 +444,10 @@ wpa_supplicant_select_bss(struct wpa_sup
13
 
                                wpa_printf(MSG_DEBUG, "   skip - disabled");
14
 
                                continue;
15
 
                        }
16
 
-                       if (bss->ssid_len != ssid->ssid_len ||
17
 
+                       if (ssid->ssid_len != 0 &&
18
 
+                           (bss->ssid_len != ssid->ssid_len ||
19
 
                            os_memcmp(bss->ssid, ssid->ssid,
20
 
-                                     bss->ssid_len) != 0) {
21
 
+                                     bss->ssid_len) != 0)) {
22
 
                                wpa_printf(MSG_DEBUG, "   skip - "
23
 
                                           "SSID mismatch");
24
 
                                continue;