[pkg-wpa-devel] Bug#375599: wpasupplicant: ifupdown.sh loses config file reference if it doesn't define ctrl_interface

[Jason Lunz]

Package: wpasupplicant
Version: 0.5.3+20060522-3
Severity: minor
Tags: patch


When wpa-conf (or wpa-roam) is used in /etc/network/interfaces, a call
to sed scans the given config file for the ctrl_interface. If it isn't
found, the WPA_SUP_CONF variable is overridden, dropping the
previously-set reference to the config file passed from /e/n/i.

The patch below fixes the use of "wpa-roam
/etc/my_wpa_supplicant.conf" when the config omits ctrl_interface.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)

Versions of packages wpasupplicant depends on:
ii  libc6                         2.3.6-15   GNU C Library: Shared libraries
ii  libncurses5                   5.5-2      Shared libraries for terminal hand
ii  libreadline5                  5.1-7      GNU readline and history libraries
ii  libssl0.9.8                   0.9.8b-2   SSL shared libraries

wpasupplicant recommends no packages.

-- no debconf information

*** /tmp/ifupdown.patch
diff -ur wpasupplicant-0.5.3+20060522.orig/debian/ifupdown.sh wpasupplicant-0.5.3+20060522/debian/ifupdown.sh
--- wpasupplicant-0.5.3+20060522.orig/debian/ifupdown.sh	2006-06-26 21:32:12.000000000 -0500
+++ wpasupplicant-0.5.3+20060522/debian/ifupdown.sh	2006-06-26 21:32:28.503283250 -0500
@@ -73,7 +73,7 @@
 	if [ -n "$WPA_SUP_CONF_CTRL_IFACE" ]; then
 		WPA_COMMON_CTRL_IFACE="$WPA_SUP_CONF_CTRL_IFACE"
 	else
-		WPA_SUP_CONF="-C $WPA_COMMON_CTRL_IFACE"
+		WPA_SUP_CONF="$WPA_SUP_CONF -C $WPA_COMMON_CTRL_IFACE"
 	fi
 elif env | grep -q "^IF_WPA"; then
 	WPA_SUP_CONF="-C $WPA_COMMON_CTRL_IFACE"