From 6c075e4169201cf788b83d3738dbd225c2e18803 Mon Sep 17 00:00:00 2001
From: fbt <fbt@fleshless.org>
Date: Tue, 24 Dec 2013 19:13:49 +0400
Subject: [PATCH] cjdroute can drop privileges itself, so removing the custom
 user code

---
 init.d/cjdroute | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/init.d/cjdroute b/init.d/cjdroute
index 9864b92..7d494a3 100755
--- a/init.d/cjdroute
+++ b/init.d/cjdroute
@@ -4,24 +4,13 @@ unset reload
 
 service_username='cjdns'
 service_command='/usr/local/sbin/cjdroute'
-service_args='< /etc/cjdns/cjdroute.conf'
 
-cjdroute_tun_interface='cjd0'
-cjdroute_ipv6_addr='fca7:8aef:6571:63c5:b23c:2fbc:8dea:e207/8'
-cjdroute_listen_port='11270'
+cjdroute_config='/etc/cjdroute.conf'
+cjdroute_tun_interface='cjdns0'
+cjdroute_listen_port=''
 
 service_pid=`lsof -i :"$cjdroute_listen_port" | tail -1 | cut -d ' ' -f 2`
 
-cjdroute.create_tun() {
-	ip tuntap add mode tun user "$service_username" group "$service_username" "$cjdroute_tun_interface"
-	ip a add "$cjdroute_ipv6_addr" dev "$cjdroute_tun_interface"
-	ip link set "$cjdroute_tun_interface" up
-}
-
-cjdroute.destroy_tun() {
-	ip tuntap del mode tun "$cjdroute_tun_interface"
-}
-
 cjdroute.check_tun_module() {
 	[[ -e '/dev/net/tun' ]] || {
 		modprobe tun || {
@@ -33,16 +22,5 @@ cjdroute.check_tun_module() {
 
 start() {
 	cjdroute.check_tun_module || { return 1; }
-	
-	[[ "$service_username" ]] && {
-		cjdroute.create_tun || { return 1; }
-	}
-
-	watchman.start
-}
-
-stop() {
-	watchman.stop
-
-	[[ "$service_username" ]] && { cjdroute.destroy_tun; }
+	"$service_command" < "$cjdroute_config"
 }