Merge from openresolv 3.4.4 in the vendor branch.

Approved by:	re (kib)

1 files changed, 14 insertions, 12 deletions

diff --git a/contrib/openresolv/dnsmasq.in b/contrib/openresolv/dnsmasq.in
index 1678866..178f4dd 100644
--- a/contrib/openresolv/dnsmasq.in
+++ b/contrib/openresolv/dnsmasq.in
@@ -30,12 +30,14 @@
 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
 [ -z "$dnsmasq_conf" -a -z "$dnsmasq_resolv" ] && exit 0
 [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
 
 : ${dnsmasq_pid:=/var/run/dnsmasq.pid}
 [ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
 : ${dnsmasq_service:=dnsmasq}
 : ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
-newconf="# Generated by resolvconf\n"
+newconf="# Generated by resolvconf$NL"
 newresolv="$newconf"
 
 # Using dbus means that we never have to restart the daemon
@@ -56,14 +58,14 @@ if [ -s "$dbus_pid" -a -s "$dnsmasq_pid" ]; then
 			kill -0 $(cat "$dnsmasq_pid") 2>/dev/null
 		then
 			dbus=true
-			newconf="$newconf\n# Domain specific servers will"
-			newconf="$newconf be sent over dbus\nenable-dbus\n"
+			newconf="$newconf$NL# Domain specific servers will"
+			newconf="$newconf be sent over dbus${NL}enable-dbus$NL"
 		fi
 	fi
 fi
 
 for n in $NAMESERVERS; do
-	newresolv="${newresolv}nameserver $n\n"
+	newresolv="${newresolv}nameserver $n$NL"
 done
 
 dbusdest=
@@ -75,16 +77,16 @@ for d in $DOMAINS; do
 			SIFS=${IFS-y} OIFS=$IFS
 			IFS=.
 			set -- ${ns%%,*}
-			num="0x$(printf "%02x" $1 $2 $3 $4)"
+			num="0x$(printf %02x $1 $2 $3 $4)"
 			if [ "$SIFS" = yi ]; then
 				unset IFS
 			else
 				IFS=$OIFS
 			fi
-			dbusdest="$dbusdest uint32:$(printf "%u" $num)"
+			dbusdest="$dbusdest uint32:$(printf %u $num)"
 			dbusdest="$dbusdest string:$dn"
 		else
-			newconf="${newconf}server=/$dn/${ns%%,*}\n"
+			newconf="${newconf}server=/$dn/${ns%%,*}$NL"
 		fi
 		[ "$ns" = "${ns#*,}" ] && break
 		ns="${ns#*,}"
@@ -94,22 +96,22 @@ done
 changed=false
 if [ -n "$dnsmasq_conf" ]; then
 	if [ ! -f "$dnsmasq_conf" ] || \
-		[ "$(cat "$dnsmasq_conf")" != "$(printf "$newconf")" ]
+		[ "$(cat "$dnsmasq_conf")" != "$(printf %s "$newconf")" ]
 	then
 		changed=true
-		printf "$newconf" >"$dnsmasq_conf"
+		printf %s "$newconf" >"$dnsmasq_conf"
 	fi
 fi
 if [ -n "$dnsmasq_resolv" ]; then
 	if [ -f "$dnsmasq_resolv" ]; then
-		if [ "$(cat "$dnsmasq_resolv")" != "$(printf "$newresolv")" ]
+		if [ "$(cat "$dnsmasq_resolv")" != "$(printf %s "$newresolv")" ]
 		then
 			changed=true
-			printf "$newresolv" >"$dnsmasq_resolv"
+			printf %s "$newresolv" >"$dnsmasq_resolv"
 		fi
 	else
 		# dnsmasq polls this file so no need to set changed=true
-		printf "$newresolv" >"$dnsmasq_resolv"
+		printf %s "$newresolv" >"$dnsmasq_resolv"
 	fi
 fi