Merging upstream version 20221030.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 33 insertions, 5 deletions

diff --git a/dehydrated/bin/dehydrated-nsupdate b/dehydrated/bin/dehydrated-nsupdate
index 05027ab..c6bf6c5 100755
--- a/dehydrated/bin/dehydrated-nsupdate
+++ b/dehydrated/bin/dehydrated-nsupdate
@@ -45,30 +45,50 @@ esac
 if command -v kdig > /dev/null 2>&1
 then
 	# knot-dnsutils
-	DIG="kdig +noidn"
+	DIG_VARIANT="knot"
 elif command -v dig > /dev/null 2>&1
 then
 	# bind-dnsutils
-	DIG="dig +noidnout"
+	DIG_VARIANT="bind"
 else
 	echo "'${HOOK}': need dig from bind-dnsutils or knot-dnsutils" >&2
 	exit 1
 fi
 
+case "${DIG_VARIANT}" in
+	knot)
+		DIG="kdig +noidn"
+		;;
+
+	bind)
+		DIG="dig +noidnout"
+		;;
+esac
+
 # alternatives handling for nsupdate
 if command -v knsupdate > /dev/null 2>&1
 then
 	# knot-dnsutils
-	NSUPDATE="knsupdate"
+	NSUPDATE_VARIANT="knot"
 elif command -v nsupdate > /dev/null 2>&1
 then
 	# bind-dnsutils
-	NSUPDATE="nsupdate"
+	NSUPDATE_VARIANT="bind"
 else
 	echo "'${HOOK}': need nsupdate from bind-dnsutils or knot-dnsutils" >&2
 	exit 1
 fi
 
+case "${NSUPDATE_VARIANT}" in
+	knot)
+		NSUPDATE="knsupdate"
+		;;
+
+	bind)
+		NSUPDATE="nsupdate"
+		;;
+esac
+
 # config
 for FILE in /etc/default/dehydrated-nsupdate /etc/default/dehydrated-nsupdate.d/*
 do
@@ -168,7 +188,15 @@ do
 
 	if [ -n "${KEY}" ] && [ -n "${TSIG}" ]
 	then
-		NSUPDATE_OPTIONS="-k ${KEY}"
+		case "${NSUPDATE_VARIANT}" in
+			knot)
+				NSUPDATE_OPTIONS="-k ${KEY}"
+				;;
+
+			bind)
+				NSUPDATE_OPTIONS="-y $(cat "${KEY}")"
+				;;
+		esac
 	fi
 
 	echo -n "   + sending '${HOOK_ACTION}' for ${TXT_RECORD} to ${NAMESERVER}..."