From 43cb18876beb3b7ea19537f9db314f4bc0d4ab1b Mon Sep 17 00:00:00 2001
From: Othmar Gsenger <otti@anytun.org>
Date: Fri, 11 Apr 2008 19:49:54 +0000
Subject: working version with crypto

---
 etc/anytun/server/config | 14 +++++---------
 etc/init.d/anytun        |  6 +++---
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'etc')

diff --git a/etc/anytun/server/config b/etc/anytun/server/config
index df6169a..2706b97 100644
--- a/etc/anytun/server/config
+++ b/etc/anytun/server/config
@@ -18,21 +18,17 @@ dev anytun0
 # device type tun = ip/ipv6, tap = ethernet
 type tun
 ## payload encryption algorithm
-#cipher aes-ctr
-cipher null
-## key derivation pseudo random function
-#kd-prf aes-ctr
-# kd-prf null
+cipher aes-ctr
+#cipher null
 ## message authentication algorithm
-#auth-algo sha1
-auth-algo null
+auth-algo sha1
+#auth-algo null
 ## Automaticaly configure the interface an set a route
 ## 1st argument the local address for the tun/tap device
 ## 2nd argument is either the remote address(tun) or netmask(tap)
 #ifconfig <local> <remote|netmask>
 ## Controll Host for multi client support
-#control-host 127.0.0.1:4445
-
+control-host 127.0.0.1:4445
 ### Connection Parameters (for clients without config server)
 ## remote host
 #remote-host <hostname|ip>
diff --git a/etc/init.d/anytun b/etc/init.d/anytun
index 90d7670..64a3186 100644
--- a/etc/init.d/anytun
+++ b/etc/init.d/anytun
@@ -15,7 +15,7 @@ DAEMON=/usr/sbin/anytun
 ANYTUNCONFIG=/usr/bin/anytun-config
 CONTROLDAEMON=/usr/bin/anytun-controld
 CHROOTDIR='/var/run/anytun'
-DAEMONOPTS="--chroot --username nobody --chroot-dir $CHROOTDIR"
+# DAEMONOPTS="--chroot --username nobody --chroot-dir $CHROOTDIR"
 NAME=anytun
 DESC=anytun
 CONFIG_DIR=/etc/anytun
@@ -59,9 +59,9 @@ start_configd () {
 				$ANYTUNCONFIG $DAEMONARG >> $VARCONFIG_DIR/$NAME
 			done
 			CONTROLHOST=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed  's/^/ --/'`
-			$CONTROLDAEMON -f $VARCONFIG_DIR/$NAME  $CONTROLHOST \
+			$CONTROLDAEMON -f $VARCONFIG_DIR/$NAME $DAEMONOPTS $CONTROLHOST \
 				--write-pid $VARCONFIG_DIR/$NAME.pid
-			rm -f $VARCONFIG_DIR/$NAME
+			# rm -f $VARCONFIG_DIR/$NAME
 		fi
 }
 stop_configd () {
-- 
cgit v1.2.3