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

diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 869feab5..994a9944 100644
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -5,10 +5,10 @@
 # This program is distributable under the terms of the GNU GPL (see
 # COPYING)
 
-# This test starts up an rsync daemon on a high-numbered port using a
-# configuration file from the test directory.  I can't think of a good
-# way to choose it dynamically at the moment, so we just use 2612.  If
-# that's in use then you lose.
+# We don't really want to start the server listening, because that
+# might interfere with the security or operation of the test machine.
+# Instead we use the fake-connect feature to dynamically assign a pair
+# of ports.
 
 # Having started the server we try some basic operations against it:
 
@@ -24,7 +24,26 @@
 
 . "$suitedir/rsync.fns"
 
+SSH="src/support/lsh --no-cd"
+
 build_rsyncd_conf
-start_rsyncd
 
+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 -v localhost::