From 9e2aad3fde6b1a9c4c0080c2c7434ab41f0b36ce Mon Sep 17 00:00:00 2001 From: Wenli Looi Date: Wed, 19 May 2021 11:42:25 -0700 Subject: [PATCH] ddns-scripts: Fix for domains with dash Signed-off-by: Wenli Looi --- net/ddns-scripts/Makefile | 2 +- .../files/usr/lib/ddns/dynamic_dns_functions.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 3b54e604f..047eab9c8 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_LICENSE:=GPL-2.0 diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh index b5dac0ee2..2a677785e 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh @@ -70,11 +70,11 @@ IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\( # characters that are dangerous to pass to a shell command line SHELL_ESCAPE="[\"\'\`\$\!();><{}?|\[\]\*\\\\]" -# dns character set +# dns character set. "-" must be the last character DNS_CHARSET="[@a-zA-Z0-9._-]" -# domains can have * for wildcard -DNS_CHARSET_DOMAIN="[@a-zA-Z0-9._-*]" +# domains can have * for wildcard. "-" must be the last character +DNS_CHARSET_DOMAIN="[@a-zA-Z0-9._*-]" # detect if called by ddns-lucihelper.sh script, disable retrys (empty variable == false) LUCI_HELPER=$(printf %s "$MYPROG" | grep -i "luci")