up to 2.85 (fixes CVE-2021-3448)

[packages/dnsmasq.git] / dnsmasq.init

diff --git a/dnsmasq.init b/dnsmasq.init
index 00a4122988d43e0a5cd2eb5163bce1ffbbdb17ab..2d3a60a173825c4f191f6708b9d66ddf5afb5ab0 100644 (file)
--- a/dnsmasq.init
+++ b/dnsmasq.init
@@ -21,7 +21,7 @@ CMD=$SERVICE
 
 # Check that networking is up
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down $MSG
                exit 1
        fi
@@ -31,8 +31,8 @@ fi
 
 MAILHOSTNAME=""
 RESOLV_CONF=""
-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
-DOMAIN_SUFFIX=`dnsdomainname`
+DHCP_LEASE=""
+DOMAIN_SUFFIX=`dnsdomainname 2>/dev/null`
 OPTIONS=""
 
 # Get service config
@@ -43,6 +43,7 @@ OPTIONS=""
 [ -n "$RESOLV_CONF" ] && OPTIONS="$OPTIONS -r $RESOLV_CONF"
 [ -n "$DHCP_LEASE" ] && OPTIONS="$OPTIONS -l $DHCP_LEASE"
 [ -n "$DOMAIN_SUFFIX" ] && OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX"
+[ -n "$INTERFACE" ] && OPTIONS="$OPTIONS -i $INTERFACE"
 
 RETVAL=0
 # See how we were called.