conf/143079: hostapd startup missing multi wlan functionality

[Matthias Meyser]

>Number:         143079
>Category:       conf
>Synopsis:       hostapd startup missing multi wlan functionality
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 22 10:30:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Meyser
>Release:        FreeBSD 8-stable
>Organization:
XeNEt GmbH
>Environment:
FreeBSD wlan00.xenet.de 8.0-STABLE FreeBSD 8.0-STABLE #0: Thu Jan 14 20:04:44 CET 2010     root at intserv1.intern:/usr/obj/usr/src/sys/GATE  i386
>Description:
Hostapd itself can handle more than one wlan by using more than one configfile.
At the moment there ist only one hardcodeds configfile.
With the attached patch one or more configfiles can be set in rc.conf.
Default ist the original configfile.
>How-To-Repeat:

>Fix:
see patch

Patch attached with submission follows:

--- usr/src/etc/defaults/rc.conf.orig   2010-01-22 10:58:00.000000000 +0100
+++ usr/src/etc/defaults/rc.conf        2010-01-22 11:05:22.000000000 +0100
@@ -239,6 +239,8 @@

 ### Network daemon (miscellaneous) ###
 hostapd_enable="NO"            # Run hostap daemon.
+hostapd_config="/etc/hostapd.conf"     # Path to the configuration file
+#hostapd_config="/etc/hostapd.conf.wlan0 /etc/hostapd.conf.wlan1"      # Dual WLAN config
 syslogd_enable="YES"           # Run syslog daemon (or NO).
 syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
 syslogd_flags="-s"             # Flags to syslogd (if enabled).

--- usr/src/etc/rc.d/hostapd.orig       2010-01-22 10:57:14.000000000 +0100
+++ usr/src/etc/rc.d/hostapd    2010-01-22 10:56:21.000000000 +0100
@@ -11,15 +11,14 @@

 name="hostapd"
 command="/usr/sbin/${name}"
-rcvar=`set_rcvar`
-
-conf_file="/etc/${name}.conf"
 pidfile="/var/run/${name}.pid"
-
-command_args="-P ${pidfile} -B ${conf_file}"
-required_files="${conf_file}"
+rcvar=`set_rcvar`
 required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
+
+load_rc_config $name
+config="${hostapd_config:-/etc/${name}.conf}"
+command_args="-P ${pidfile} -B ${config}"
+required_files="${config}"
 extra_commands="reload"

-load_rc_config ${name}
 run_rc_command "$1"



>Release-Note:
>Audit-Trail:
>Unformatted: