ddns-scripts: Fix for wildcard subdomain

Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
(cherry picked from commit 93344aafa0)
This commit is contained in:
Wenli Looi 2021-05-18 23:08:52 -07:00 committed by Florian Eckert
parent 5fa605a1fa
commit 12cd693294
3 changed files with 5 additions and 2 deletions

View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2 PKG_VERSION:=2.8.2
PKG_RELEASE:=7 PKG_RELEASE:=8
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

View file

@ -73,6 +73,9 @@ SHELL_ESCAPE="[\"\'\`\$\!();><{}?|\[\]\*\\\\]"
# dns character set # dns character set
DNS_CHARSET="[@a-zA-Z0-9._-]" DNS_CHARSET="[@a-zA-Z0-9._-]"
# domains can have * for wildcard
DNS_CHARSET_DOMAIN="[@a-zA-Z0-9._-*]"
# detect if called by ddns-lucihelper.sh script, disable retrys (empty variable == false) # detect if called by ddns-lucihelper.sh script, disable retrys (empty variable == false)
LUCI_HELPER=$(printf %s "$MYPROG" | grep -i "luci") LUCI_HELPER=$(printf %s "$MYPROG" | grep -i "luci")

View file

@ -257,7 +257,7 @@ esac
# verify validity of variables # verify validity of variables
[ -n "$lookup_host" ] && sanitize_variable lookup_host "$DNS_CHARSET" "" [ -n "$lookup_host" ] && sanitize_variable lookup_host "$DNS_CHARSET" ""
[ -n "$dns_server" ] && sanitize_variable dns_server "$DNS_CHARSET" "" [ -n "$dns_server" ] && sanitize_variable dns_server "$DNS_CHARSET" ""
[ -n "$domain" ] && sanitize_variable domain "$DNS_CHARSET" "" [ -n "$domain" ] && sanitize_variable domain "$DNS_CHARSET_DOMAIN" ""
# Filter shell escape characters, if these are required in the URL, they # Filter shell escape characters, if these are required in the URL, they
# can still be passed url encoded # can still be passed url encoded