Harden the locking mechanism
[openresolv] / named.in
index 6448961285076ce1c20276296e0f0300a7938b8f..3301896416bb215f5a8356e44ae6ee4eefac425b 100644 (file)
--- a/named.in
+++ b/named.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2007-2009 Roy Marples
+# Copyright (c) 2007-2020 Roy Marples
 # All rights reserved
 
 # named subscriber for resolvconf
 
 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
-[ -z "$named_zones" -a -z "$named_options" ] && exit 0
-[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+[ -z "${named_zones}${named_options}" ] && exit 0
+[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
+NL="
+"
 
 # Platform specific kludges
-if [ -z "$named_service" -a -z "$named_restart" -a \
-       -d "@RCDIR@" -a ! -x "@RCDIR@"/named ]
+if [ -z "${named_service}${named_restart}" ] &&
+   [ -d "$RCDIR" ] && ! [ -x "$RCDIR"/named ]
 then
-       if [ -x "@RCDIR@"/bind9 ]; then
+       if [ -x "$RCDIR"/bind9 ]; then
                # Debian and derivatives
                named_service=bind9
+       elif [ -x "$RCDIR"/rc.bind ]; then
+               # Slackware
+               named_service=rc.bind
        fi
 fi
 : ${named_service:=named}
-: ${named_restart:=@RESTARTCMD ${named_service}@}
-newoptions="# Generated by resolvconf\n"
+
+: ${named_pid:=/var/run/$named_service.pid}
+[ -s "$named_pid" ] || named_pid=/var/run/$named_service/$named_service.pid
+[ -s "$named_pid" ] || unset named_pid
+
+newoptions="# Generated by resolvconf$NL"
 newzones="$newoptions"
 
 forward=
 for n in $NAMESERVERS; do
        case "$forward" in
-       *"\n\t$n;"*);;
-       *) forward="$forward\n\t$n;";;
+       *"$NL   $n;"*);;
+       *) forward="$forward$NL $n;";;
        esac
 done
 if [ -n "$forward" ]; then
-       newoptions="${newoptions}forward first;\nforwarders {$forward\n};\n"
+       newoptions="${newoptions}forward first;${NL}forwarders {$forward${NL}};$NL"
 fi
 
 for d in $DOMAINS; do
-       newzones="${newzones}zone \"${d%%:*}\" {\n"
-       newzones="$newzones\ttype forward;\n"
-       newzones="$newzones\tforward first;\n\tforwarders {\n"
+       newzones="${newzones}zone \"${d%%:*}\" {$NL"
+       newzones="$newzones     type forward;$NL"
+       newzones="$newzones     forward first;$NL       forwarders {$NL"
        ns="${d#*:}"
        while [ -n "$ns" ]; do
-               newzones="$newzones\t\t${ns%%,*};\n"
+               newzones="$newzones             ${ns%%,*};$NL"
                [ "$ns" = "${ns#*,}" ] && break
                ns="${ns#*,}"
        done
-       newzones="$newzones\t};\n};\n"
+       newzones="$newzones     };$NL};$NL"
 done
 
+# Try to ensure that config dirs exist
+if type config_mkdirs >/dev/null 2>&1; then
+       config_mkdirs "$named_options" "$named_zones"
+else
+       @SBINDIR@/resolvconf -D "$named_options" "$named_zones"
+fi
+
 # No point in changing files or reloading bind if the end result has not
 # changed
 changed=false
 if [ -n "$named_options" ]; then
        if [ ! -f "$named_options" ] || \
-               [ "$(cat "$named_options")" != "$(printf "$newoptions")" ]
+               [ "$(cat "$named_options")" != "$(printf %s "$newoptions")" ]
        then
-               printf "$newoptions" >"$named_options"
+               printf %s "$newoptions" >"$named_options"
                changed=true
        fi
 fi
 if [ -n "$named_zones" ]; then
        if [ ! -f "$named_zones" ] || \
-               [ "$(cat "$named_zones")" != "$(printf "$newzones")" ]
+               [ "$(cat "$named_zones")" != "$(printf %s "$newzones")" ]
        then
-               printf "$newzones" >"$named_zones"
+               printf %s "$newzones" >"$named_zones"
                changed=true
        fi
 fi
 
+# named does not seem to work with SIGHUP which is a same
 if $changed; then
-       eval $named_restart
+       if [ -n "$named_restart" ]; then
+               eval $named_restart
+       elif [ -n "$RESTARTCMD" ]; then
+               set -- ${named_service}
+               eval "$RESTARTCMD"
+       else
+               @SBINDIR@/resolvconf -r ${named_service}
+       fi
 fi