[Astlinux-commits] SF.net SVN: astlinux:[7284] branches/1.0/package/dnsmasq/dnsmasq.init

[<abe...@us...>]

Revision: 7284
          http://sourceforge.net/p/astlinux/code/7284
Author:   abelbeck
Date:     2015-10-22 18:17:19 +0000 (Thu, 22 Oct 2015)
Log Message:
-----------
dnsmasq, fix special case where an interface is DNS-only but IPv6 autoconfig is enabled.  Thanks to Ian for the pointer.

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2015-10-20 18:12:26 UTC (rev 7283)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2015-10-22 18:17:19 UTC (rev 7284)
@@ -121,6 +121,10 @@
   # args: IF, tag
   local interface="$1" tag="$2" prefix="" iname IFS
 
+  if [ "$IPV6" != "yes" ]; then
+    return 2
+  fi
+
   unset IFS
   for iname in $IPV6_AUTOCONF; do
     case $iname in
@@ -154,7 +158,10 @@
   if [ -n "$prefix" ]; then
     echo "
 dhcp-range=$tag,$prefix,ra-only,64,24h"
+    return 0
   fi
+
+  return 1
 }
 
 addDNSMASQnet()
@@ -178,11 +185,11 @@
       ipend=$(($ipbase + $dend))
       trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend)
 
-      if [ "$IPV6" = "yes" ]; then
-        addIPV6net $1 $4
+      addIPV6net $1 $4
+    else
+      if ! addIPV6net $1 $4; then
+        falseDNSMASQnet $1
       fi
-    else
-      falseDNSMASQnet $1
     fi
   fi
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.