domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 22893
This commit is contained in:
Jo-Philipp Wich
2010-09-04 16:09:49 +00:00
parent 6edf2c577b
commit 52dcaeb65d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/6in4/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=5 PKG_VERSION:=5
PKG_RELEASE:=1 PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
package/6in4/files/6in4.hotplug
View File

@@ -32,7 +32,7 @@ if [ "$ACTION" = ifup ]; then
config_get password "$cfg" password config_get password "$cfg" password
[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$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%% *}" password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
} }
uci_set_state network "$cfg" ipaddr "$wanip" uci_set_state network "$cfg" ipaddr "$wanip"