X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8c69d5f95c0721ffbe9d72e1f7187d60784a2cb9..c03c029dae81531d67022b3f8496298cf61a89fe:/package/6in4/files/6in4.hotplug

diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 0a196c25b..534682e99 100644
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -14,7 +14,7 @@ if [ "$ACTION" = ifup ]; then
 		[ "$proto" = 6in4 ] || return 0
 
 		local wandev
-		config_get wandev "$cfg" wan_device
+		config_get wandev "$cfg" wan_device "$(find_6in4_wanif)"
 		[ "$wandev" = "$DEVICE" ] || return 0
 
 		local oldip
@@ -32,7 +32,9 @@ if [ "$ACTION" = ifup ]; then
 			config_get password "$cfg" password
 
 			[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
-				password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+				[ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] || {
+					password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+				}
 				uci_set_state network "$cfg" ipaddr "$wanip"
 
 				( wget -qO/dev/null "http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" && ifup "$cfg" )&