From c9ff101472c03ada1952d3e296b4970ef53dc854 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Fri, 23 Feb 2001 15:13:02 +0000
Subject: remove debug code to work with LOCALBASE!=/usr/pkg Pointed out by
 Dieter Baron <dillo@danbala.ifoer.tuwien.ac.at>

---
 net/6to4/files/6to4 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'net/6to4')

diff --git a/net/6to4/files/6to4 b/net/6to4/files/6to4
index 9bf5a02ac3e..8a42c8ecf18 100755
--- a/net/6to4/files/6to4
+++ b/net/6to4/files/6to4
@@ -5,8 +5,8 @@
 # (c) Copyright 2000 Hubert Feyrer <hubert@feyrer.de>
 #
 
-#$etcdir="@PREFIX@/etc";
-$etcdir="/usr/pkg/etc";
+$etcdir="@PREFIX@/etc";
+#$etcdir="/usr/pkg/etc";		# debug
 
 require "$etcdir/6to4.conf";
 
@@ -126,7 +126,11 @@ if ($ARGV[0] eq "rtadvd-start" or $ARGV[0] eq "start-rtadvd" ) {
 	print "rtadvd already running!\n";
     } else {
 	run("sysctl -w net.inet6.ip6.forwarding=1");
+<<<<<<< 6to4
+	run("sysctl -w net.inet6.ip6.accept_rtadvd=1");
+=======
 	run("sysctl -w net.inet6.ip6.accept_rtadv=0");
 	run("rtadvd $in_if");
+>>>>>>> 1.4
     }
 }
-- 
cgit v1.2.3