From cdbeabe2213e045d8d3e5e4eb09949d2bbacdb6f Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 1 Mar 2013 00:06:51 +0100
Subject: [PATCH] hostapd: fix ascii check and add country code to
 hostapd.conf.

---
 html/cgi-bin/wlanap.cgi | 6 ++++--
 lfs/hostapd             | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index ce8f051aa7..58c6376fea 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -131,7 +131,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
 			$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
 		}
 		# only ASCII alowed
-		if ( ($wlanapsettings{'PWD'} !~ m/[\x00-\x7f]/) ){
+		if ( !($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/) ){
 			$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
 		}
 	}
@@ -529,10 +529,12 @@ sub WriteConfig_hostapd{
 
 	open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
 	print CONFIGFILE <<END
+driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 ######################### basic hostapd configuration ##########################
 #
 interface=$wlanapsettings{'INTERFACE'}
-driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+country_code=$wlanapsettings{'COUNTRY'}
+ieee80211d=1
 channel=$wlanapsettings{'CHANNEL'}
 END
 ;
diff --git a/lfs/hostapd b/lfs/hostapd
index 690f138b79..ff02a19914 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 25
+PAK_VER    = 26
 
 DEPS       = ""
 
-- 
2.39.5