Browse Source

ddns-scripts: no longer break using nslookup and option force_ipversion=1

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
lilik-openwrt-22.03
Christian Schoenebeck 8 years ago
parent
commit
f0b96d9109
3 changed files with 9 additions and 7 deletions
  1. +2
    -2
      net/ddns-scripts/Makefile
  2. +4
    -2
      net/ddns-scripts/files/dynamic_dns_functions.sh
  3. +3
    -3
      net/ddns-scripts/files/update_nsupdate.sh

+ 2
- 2
net/ddns-scripts/Makefile View File

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


+ 4
- 2
net/ddns-scripts/files/dynamic_dns_functions.sh View File

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


+ 3
- 3
net/ddns-scripts/files/update_nsupdate.sh View File

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


Loading…
Cancel
Save