X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8fef0245283dadaa2d6b86096b13c78bfcae0b34..1b8e0e876bcf5c9c07d30bc560f6e2e9f8ade437:/testsuite/daemon.test

diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 8b1cab1a..77178439 100644
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -24,8 +24,39 @@
 
 . "$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"
+
 build_rsyncd_conf
 
-export RSYNC_CONNECT_PROG="$rsync_bin --config=$conf --daemon"
+cd "$scratchdir"
+
+ln -s test-rsyncd.conf rsyncd.conf
+
+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
 
-$rsync_bin -v localhost::
+$RSYNC -v localhost::