diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-11-16 02:38:41 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-11-16 02:38:41 +0000 |
| commit | f438eed4b3c60f9dc5985a1fa430cc26816fc52d (patch) | |
| tree | c428c1a115b243a15a60a53aac37f6f5b0c1774b /usr/local/www | |
| parent | b67d192d1bb6017fc460ad4a005d0e49f8227ed2 (diff) | |
| download | pfsense-f438eed4b3c60f9dc5985a1fa430cc26816fc52d.zip pfsense-f438eed4b3c60f9dc5985a1fa430cc26816fc52d.tar.gz | |
MFC 7668
Fix wpa_supplicant startup issue and fix macaddress filtering backend function (ticket 684).
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/interfaces_wlan.inc | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc index 251032f..07247c1 100755 --- a/usr/local/www/interfaces_wlan.inc +++ b/usr/local/www/interfaces_wlan.inc @@ -48,6 +48,7 @@ function wireless_config_init() { $pconfig['hidessid_enable'] = isset($optcfg['wireless']['hidessid']['enable']); $pconfig['debug_mode'] = $optcfg['wireless']['wpa']['debug_mode']; $pconfig['macaddr_acl'] = $optcfg['wireless']['wpa']['macaddr_acl']; + $pconfig['macaddr_acl_enable'] = $optcfg['wireless']['wpa']['macaddr_acl_enable']; $pconfig['auth_algs'] = $optcfg['wireless']['wpa']['auth_algs']; $pconfig['wpa_mode'] = $optcfg['wireless']['wpa']['wpa_mode']; $pconfig['wpa_key_mgmt'] = $optcfg['wireless']['wpa']['wpa_key_mgmt']; @@ -139,7 +140,6 @@ function wireless_config_post() { $optcfg['wireless']['channel'] = $_POST['channel']; $optcfg['wireless']['authmode'] = $_POST['authmode']; $optcfg['wireless']['txpower'] = $_POST['txpower']; - $optcfg['wireless']['wpa']['macaddr_acl'] = $_POST['macaddr_acl']; $optcfg['wireless']['wpa']['auth_algs'] = $_POST['auth_algs']; $optcfg['wireless']['wpa']['wpa_mode'] = $_POST['wpa_mode']; @@ -155,6 +155,11 @@ function wireless_config_post() { else unset($optcfg['wireless']['hidessid']['enable']); + if($_POST['macaddr_acl_enable'] == "yes") + $optcfg['wireless']['wpa']['macaddr_acl_enable'] = true; + else + unset($optcfg['wireless']['wpa']['macaddr_acl_enable']); + if($_POST['ieee8021x_enable'] == "yes") $optcfg['wireless']['wpa']['ieee8021x']['enable'] = true; else @@ -384,16 +389,14 @@ function wireless_config_print() { <tr> <td> </td> <td> WPA Pre Shared Key </td> - </tr> - <tr> + </tr> + <tr> <td>PSK: </td> - <td> - <input name="passphrase" type="text" class="formfld" id="passphrase" size="66" value="<?=htmlspecialchars($pconfig['passphrase']);?>"> + <td><input name="passphrase" type="text" class="formfld" id="passphrase" size="66" value="<?=htmlspecialchars($pconfig['passphrase']);?>"></td> + </tr> + </table> + <br/>Passphrase must be from 8 to 63 chars. </td> - </tr> - </table> - <br/>Passphrase must be from 8 to 63 chars. - </td> </tr> <tr> <td valign="top" class="vncell">WPA Mode</td> @@ -424,7 +427,8 @@ function wireless_config_print() { <option <? if ($pconfig['macaddr_acl'] == '2') echo "selected";?> value="2">Radius</option> </select> <br/><br/> - Setting this to "Allow" will allow all clients in not in deny list, while "Deny" will deny all clients not in allow list. Radius will cause allow and deny list to be searched and then query radius.</br> + Setting this to "Allow" will allow all clients in not in deny list, while "Deny" will deny all clients not in allow list. + Radius will cause allow and deny list to be searched and then query radius.</br> </td> </tr> <tr> |
