X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d1c06c2180f337deaa059fc408fcca4f4770a585..f1ca7c4429f2a8e9de72f91d95218bb324df6a9e:/testsuite/daemon.test

diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 439b8835..994a9944 100644
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -24,20 +24,7 @@
 
 . "$suitedir/rsync.fns"
 
-SSH="$scratchdir/pretend-ssh"
-
-cat >"$SSH" <<'EOT'
-while : ; do
-    case "$1" in
-    -*) shift ;;
-    localhost) shift; break ;;
-    *) exit 1 ;;
-    esac
-done
-
-eval "${@}"
-EOT
-chmod +x "$SSH"
+SSH="src/support/lsh --no-cd"
 
 build_rsyncd_conf
 
@@ -45,7 +32,16 @@ cd "$scratchdir"
 
 ln -s test-rsyncd.conf rsyncd.conf
 
-$RSYNC -ve $SSH --rsync-path="$RSYNC" localhost::
+confopt=''
+case `id -u` in
+0)
+    # Root needs to specify the config file, or it uses /etc/rsyncd.conf.
+    echo "Forcing --config=$conf"
+    confopt=" --config=$conf"
+    ;;
+esac
+
+$RSYNC -ve "$SSH" --rsync-path="$RSYNC$confopt" localhost::
 
 RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
 export RSYNC_CONNECT_PROG