From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 19 Apr 2009 16:06:57 +0000 (+0000)
Subject: [PATCH] ahcpd: fix ticket 3550
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=e242637f784ec2436fc972471c8340058b23723c;p=packages.git

[PATCH] ahcpd: fix ticket 3550
Signed-off-by: Gabriel Kerneis <kerneis@pps.jussieu.fr>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15266 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile
index a983d32ee..870d8bab8 100644
--- a/ipv6/ahcpd/Makefile
+++ b/ipv6/ahcpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ahcpd
 PKG_VERSION:=0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
diff --git a/ipv6/ahcpd/files/ahcpd.config b/ipv6/ahcpd/files/ahcpd.config
index 4aca86971..58db58bc5 100755
--- a/ipv6/ahcpd/files/ahcpd.config
+++ b/ipv6/ahcpd/files/ahcpd.config
@@ -1,5 +1,4 @@
 config ahcpd
 	option interfaces "wl0"
-	# Comment out to actually disable, see ticket 3550
 	option no_dns false
 	option no_ipv4 true
diff --git a/ipv6/ahcpd/files/ahcpd.init b/ipv6/ahcpd/files/ahcpd.init
index a885c5477..efd80d3c4 100644
--- a/ipv6/ahcpd/files/ahcpd.init
+++ b/ipv6/ahcpd/files/ahcpd.init
@@ -7,8 +7,8 @@ pidfile=/var/run/ahcpd.pid
 ahcpd_config() {
 	local cfg="$1"
 	config_get interfaces "$cfg" interfaces
-	config_get no_ipv4 "$cfg" no_ipv4
-	config_get no_dns "$cfg" no_dns
+	config_get_bool no_ipv4 "$cfg" no_ipv4 0
+	config_get_bool no_dns "$cfg" no_dns 0
 }
 
 start() {
@@ -16,6 +16,12 @@ start() {
 	config_foreach ahcpd_config ahcpd
 	mkdir -p /var/lib
 	[ -r /usr/lib/ahcp/ahcp.dat ] && authority="-a /usr/lib/ahcp/ahcp.dat"
+	if [ "$no_ipv4" -eq 0 ]; then
+		unset no_ipv4
+	fi
+	if [ "$no_dns" -eq 0 ]; then
+		unset no_dns
+	fi
 	if [ -e $pidfile ] ; then
 		echo "$pidfile exists -- not starting ahcpd." >&2
 	else