← Back to branch summary

~ubuntu-branches/ubuntu/lucid/wpasupplicant/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/05_default_conf.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Kyle McMartin
  • Date: 2005-02-15 00:51:28 UTC
  • Revision ID: james.westby@ubuntu.com-20050215005128-4cnlxpp3vc3synqq
Tags: 0.3.8-1
http://bugs.debian.org/295143
* New upstream release.
* This release fixes a crash due to a buffer overflow, caused by
  a missing validation step on EAPOL-Key frames. Receiving malformed
  frames trigger the crash. More information available in the notes:
  http://lists.shmoo.com/pipermail/hostap/2005-February/009465.html
* Fix some badness with the init script. Missed the -B option
  to daemonize wpa_supplicant... pidfile is not currently being used
  as it requires modifying wpa_supplicant.
* patches/
  - 12_ipw_open_aps (closes: #295143)
    + merge patch against driver_ipw to fix association with
      open access points.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_default_conf.dpatch
 
1
#! /bin/sh -e
 
2
## 05_default_conf.dpatch by  <kyle@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
if [ $# -lt 1 ]; then
 
8
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
9
    exit 1
 
10
fi
 
11
 
 
12
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
13
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
 
14
 
 
15
case "$1" in
 
16
    -patch) patch -p1 ${patch_opts} < $0;;
 
17
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
 
18
    *)
 
19
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
20
        exit 1;;
 
21
esac
 
22
 
 
23
exit 0
 
24
 
 
25
@DPATCH@
 
26
diff -urNad wpasupplicant-0.3.1/wpa_supplicant.c /tmp/dpep.aNiCdz/wpasupplicant-0.3.1/wpa_supplicant.c
 
27
--- wpasupplicant-0.3.1/wpa_supplicant.c        2004-12-16 12:43:04.000000000 -0500
 
28
+++ /tmp/dpep.aNiCdz/wpasupplicant-0.3.1/wpa_supplicant.c       2004-12-16 12:52:28.000000000 -0500
 
29
@@ -111,6 +111,7 @@
 
30
                                     struct wpa_ssid *ssid,
 
31
                                     u8 *wpa_ie, int *wpa_ie_len);
 
32
 
 
33
+static const char *default_conf = "/etc/wpa_supplicant.conf";
 
34
 
 
35
 extern int wpa_debug_level;
 
36
 extern int wpa_debug_show_keys;
 
37
@@ -1677,6 +1678,10 @@
 
38
                return -1;
 
39
        }
 
40
 
 
41
+       if (confname == NULL) {
 
42
+               confname = default_conf;
 
43
+       }
 
44
+
 
45
        if (confname) {
 
46
                wpa_s->confname = rel2abs_path(confname);
 
47
                if (wpa_s->confname == NULL) {