6in4: replace sed match with variable substitution, change pattern from a-z to a-f (hex only)

SVN-Revision: 22893
master
Jo-Philipp Wich 14 years ago
parent 6edf2c577b
commit 52dcaeb65d
  1. 2
      package/6in4/Makefile
  2. 2
      package/6in4/files/6in4.hotplug

@ -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

@ -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"

Loading…
Cancel
Save