From 1b604c09d76dfef26b86840c5d0d961b6e34c0c3 Mon Sep 17 00:00:00 2001
From: Gordon Grant-Stuart <gordon@grant-stuart.com>
Date: Wed, 22 Feb 2023 16:51:55 +0000
Subject: [PATCH] It works!!!!

---
 tunnelkeeper | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tunnelkeeper b/tunnelkeeper
index 3ee9a99..eec7284 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -37,19 +37,16 @@ function dbg () {
 }
 
 function connect () {
-  # ssh -F "${SSHCONF}" $dbgopt -N $1 '#tunnelkeeper' 2>&1 | dbg
-  ssh -F "${SSHCONF}" $dbgopt -o "ControlMaster auto" -S "$BASEDIR/var/$1.tksock" -N $1 '#tunnelkeeper' 2>&1 | dbg
+  ssh -F "${SSHCONF}" $dbgopt -o "ControlMaster auto" -o "UserKnownHostsFile /dev/null" -S "$BASEDIR/var/$1.tksock" -N $1 '#tunnelkeeper' 2>&1 | dbg
 }
 
 
 case "$1" in
   FORKSTART )
-    # echo -n $$ > "$BASEDIR/var/${2}.connected"
     $0 FORKWATCH $2 '#tunnelkeeper' &
     if [[ $(grep -c "^$2" $PWCONF) -gt 0 ]]; then
       pass=$(awk "/^$2/ {print \$2}" ${PWCONF}) # password needed
       screen -d -m -S "tk${2}" $0 FORKSCREEN $2 '#tunnelkeeper'
-      # while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
       while true; do
         sleep 5
         if [[ -f "$BASEDIR/var/${2}.screen" ]]; then
@@ -59,7 +56,6 @@ case "$1" in
         fi
       done
     else # passwordless auth
-      # while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
       while true; do
         connect $2
         sleep 5
@@ -79,7 +75,6 @@ case "$1" in
     exit
   ;;
   FORKSCREEN )
-    # while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
     while true; do
       echo $$ > "$BASEDIR/var/${2}.screen"
       connect $2
@@ -94,7 +89,6 @@ case "$1" in
   ;;
   stop )
     rm -f "$BASEDIR/var/tunnelkeeper.pid"
-    # rm -f "$BASEDIR/var/*.connected"
     pkill -f '#tunnelkeeper' &>/dev/null
   ;;
   restart ) 
@@ -142,7 +136,6 @@ WantedBy=multi-user.target" > /lib/systemd/system/tunnelkeeper.service
   ;;
   list )
     echo "---"
-    # find "$BASEDIR/var/" -name '*.connected' | sed 's/^.*\///g; s/\.connected//g'
     find "$BASEDIR/var/" -name '*.tksock' | sed 's/^.*\///g; s/\.tksock//g'
     echo "---"
   ;;