From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 6 Oct 2005 20:39:18 +0000 (+0000)
Subject: small bugfixes
X-Git-Tag: whiterussian_rc4~144
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e9dd2c654ca902070646c29e7d7a5b53d5b5b36c;p=openwrt%2Fsvn-archive%2Fopenwrt.git

small bugfixes

SVN-Revision: 2061
---

diff --git a/openwrt/package/webif/files/usr/lib/webif/apply.sh b/openwrt/package/webif/files/usr/lib/webif/apply.sh
index 833fa36699..8253d01245 100644
--- a/openwrt/package/webif/files/usr/lib/webif/apply.sh
+++ b/openwrt/package/webif/files/usr/lib/webif/apply.sh
@@ -7,8 +7,8 @@ HANDLERS_config='
 	network) reload_network;;
 '
 HANDLERS_file='
-	hosts) rm -f /etc/hosts; mv $config /etc/hosts;;
-	ethers) rm -f /etc/ethers; mv $config /etc/ethers;;
+	hosts) rm -f /etc/hosts; mv $config /etc/hosts; killall -HUP dnsmasq ;;
+	ethers) rm -f /etc/ethers; mv $config /etc/ethers; killall -HUP dnsmasq ;;
 '
 
 reload_network() {
diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh b/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
index d31aa48d8c..e0f8a72022 100755
--- a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
+++ b/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
@@ -133,6 +133,7 @@ int|FORM_channel|Channel|required min=1 max=$CHANNEL_MAX|$FORM_channel" && {
 					wpa1wpa2) save_setting wireless wl0_akm "psk psk2";;
 				esac
 				save_setting wireless wl0_wpa_psk "$FORM_wpa_psk"
+				save_setting wireless wl0_wep "disabled"
 				;;
 			wpa)
 				case "${FORM_wpa1}${FORM_wpa2}" in
@@ -142,6 +143,7 @@ int|FORM_channel|Channel|required min=1 max=$CHANNEL_MAX|$FORM_channel" && {
 				esac
 				save_setting wireless wl0_radius_ipaddr "$FORM_radius_ipaddr"
 				save_setting wireless wl0_radius_key "$FORM_radius_key"
+				save_setting wireless wl0_wep "disabled"
 				;;
 			wep)
 				save_setting wireless wl0_wep enabled