[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3af89eb5857600d79926ac2c4bf032d239422536

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3af89eb5857600d79926ac2c4bf032d239422536

[git]

[-- Attachment #1: Type: text/plain, Size: 4310 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  3af89eb5857600d79926ac2c4bf032d239422536 (commit)
       via  fe3f3050bd0ca87b5593417e2623e92b8a9e12f7 (commit)
      from  7135f608ba972cf2d83f198870720fabfca32e2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3af89eb5857600d79926ac2c4bf032d239422536
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 24 13:47:41 2013 +0100

    wlanap.cgi: check pwd for non-ascii chars.

commit fe3f3050bd0ca87b5593417e2623e92b8a9e12f7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 24 13:44:03 2013 +0100

    wlanap.cgi: set channel manually if no channels are reported.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/wlanap.cgi | 28 +++++++++++++++++++++++-----
 lfs/hostapd             |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 83d65db..2233af9 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2012  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2005-2013  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -124,11 +124,16 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 }
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
-	# verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc
+	# verify WPA Passphrase - only with enabled enc
 	if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+		# must be 8 .. 63 characters
 		if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
 			$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
 		}
+		# only ASCII alowed
+		if ( ($wlanapsettings{'PWD'} !~ m/[\x00-\x7f]/) ){
+			$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
+		}
 	}
 
 	if ( $errormessage eq '' ){
@@ -391,16 +396,29 @@ print <<END
 		<option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
 	</select>
 </td></tr>
+END
+;
+
+if ( scalar @channellist > 0 ){
+	print <<END
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
 	<select name='CHANNEL'>
 END
 ;
-foreach $channel (@channellist){
-	print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+	foreach $channel (@channellist){
+		print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+	}
+	print "</select></td></tr>"
+} else {
+	print <<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
+<input type='text' name='CHANNEL' size='10' value='$wlanapsettings{'CHANNEL'}' />
+</td></tr>
+END
+;
 }
 
 print <<END
-</select></td></tr>
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
 	<select name='COUNTRY'>
 END
diff --git a/lfs/hostapd b/lfs/hostapd
index 2ce9c21..690f138 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    = 24
+PAK_VER    = 25
 
 DEPS       = ""
 


hooks/post-receive
--
IPFire 2.x development tree