commit f0b96d9109c710081c2eb123ef23476b77d99fb5
parent 7805abc6c4ddc3af6965b89ac97f29ca00144797
Author: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Date: Sun, 25 Sep 2016 11:11:28 +0200
ddns-scripts: no longer break using nslookup and option force_ipversion=1
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Diffstat:
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts
# Version == major.minor.patch
# increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.7.4
+PKG_VERSION:=2.7.5
# Release == build
# increase on changes of services files or tld_names.dat
-PKG_RELEASE:=4
+PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
diff --git a/net/ddns-scripts/files/dynamic_dns_functions.sh b/net/ddns-scripts/files/dynamic_dns_functions.sh
@@ -1062,10 +1062,12 @@ get_registered_ip() {
__RUNPROG="$__PROG $lookup_host >$DATFILE 2>$ERRFILE"
__PROG="hostip"
elif [ -n "$NSLOOKUP" ]; then # last use BusyBox nslookup
- [ $force_ipversion -ne 0 -o $force_dnstcp -ne 0 ] && \
- write_log 14 "Busybox nslookup - no support to 'force IP Version' or 'DNS over TCP'"
+ [ $force_dnstcp -ne 0 ] && \
+ write_log 14 "Busybox nslookup - no support for 'DNS over TCP'"
[ -n "$NSLOOKUP_MUSL" -a -n "$dns_server" ] && \
write_log 14 "Busybox compiled with musl - nslookup don't support the use of DNS Server"
+ [ $force_ipversion -ne 0 ] && \
+ write_log 5 "Busybox nslookup - no support to 'force IP Version' (ignored)"
__RUNPROG="$NSLOOKUP $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
__PROG="BusyBox nslookup"
diff --git a/net/ddns-scripts/files/update_nsupdate.sh b/net/ddns-scripts/files/update_nsupdate.sh
@@ -15,9 +15,9 @@
#
# variable __IP already defined with the ip-address to use for update
#
-__TTL=600 #.preset DNS TTL (in seconds)
-__RRTYPE __PW __TCP
-__PROG=$(which nsupdate) # BIND nsupdate ?
+local __TTL=600 #.preset DNS TTL (in seconds)
+local __RRTYPE __PW __TCP
+local __PROG=$(which nsupdate) # BIND nsupdate ?
[ -z "$__PROG" ] && __PROG=$(which knsupdate) # Knot nsupdate ?
[ -z "$__PROG" ] && write_log 14 "'nsupdate' or 'knsupdate' not installed !"
