From: Steven Barth <steven@midlink.org>
Date: Tue, 17 Jun 2014 13:05:24 +0000 (+0000)
Subject: odhcpd: don't enable relaying by default anymore
X-Git-Tag: v14.07~715
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=6dca6d5903dd73e6a6dd9acb7fbea8f2fba4af6f;p=openwrt-github%2F.git

odhcpd: don't enable relaying by default anymore

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

diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults
index 4d360454a9..d079ec0f80 100644
--- a/package/network/services/odhcpd/files/odhcpd.defaults
+++ b/package/network/services/odhcpd/files/odhcpd.defaults
@@ -7,13 +7,7 @@ set dhcp.odhcpd=odhcpd
 set dhcp.odhcpd.maindhcp=0
 set dhcp.odhcpd.leasefile=/tmp/hosts/odhcpd
 set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
-set dhcp.lan.dhcpv6=hybrid
-set dhcp.lan.ra=hybrid
-set dhcp.lan.ndp=hybrid
-set dhcp.wan6=dhcp
-set dhcp.wan6.dhcpv6=hybrid
-set dhcp.wan6.ra=hybrid
-set dhcp.wan6.ndp=hybrid
-set dhcp.wan6.master=1
+set dhcp.lan.dhcpv6=server
+set dhcp.lan.ra=server
 commit dhcp
 EOF