diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-04 16:09:49 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-04 16:09:49 +0000 |
| commit | bcab7d9363f55d8ec433f6cb51fc24cfcbca813d (patch) | |
| tree | 5dc3238ace5d3206432bbaac41fd17e55d643970 /package/6in4 | |
| parent | e46ddf2d454f760f458bf7a172e6c0bae8bab940 (diff) | |
[package] 6in4: replace sed match with variable substitution, change pattern from a-z to a-f (hex only)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22893 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/6in4')
| -rw-r--r-- | package/6in4/Makefile | 2 | ||||
| -rw-r--r-- | package/6in4/files/6in4.hotplug | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile index c56b9c57c..b9fa220df 100644 --- a/package/6in4/Makefile +++ b/package/6in4/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 PKG_VERSION:=5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(INCLUDE_DIR)/package.mk diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug index b695b527e..790edc0e1 100644 --- a/package/6in4/files/6in4.hotplug +++ b/package/6in4/files/6in4.hotplug @@ -32,7 +32,7 @@ if [ "$ACTION" = ifup ]; then config_get password "$cfg" password [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && { - [ "${#password}" != 32 ] || [ -n "$(echo "$password" | sed 's/[a-z0-9]//g')" ] && { + [ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] && { password="$(echo -n "$password" | md5sum)"; password="${password%% *}" } uci_set_state network "$cfg" ipaddr "$wanip" |