summaryrefslogtreecommitdiff
path: root/testsuite/daemon.test
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-04-18 07:20:30 -0700
committerWayne Davison <wayned@samba.org>2008-04-18 19:41:57 -0700
commit276cc45571b274349f817a5bbc078f84abb385ce (patch)
tree7627e9233c7d5a97f29f758c3904f323b7937c16 /testsuite/daemon.test
parent311676ed21eb61ec49187b9dd064aef18997d470 (diff)
downloadrsync-276cc45571b274349f817a5bbc078f84abb385ce.tar.gz
Added a --no-cd option to support/lsh so that the script can be used by
the testsuite. Improved the home-directory-changing code and added an error message when "localhost" is not the hostname specified. Use the updated script in the testsuite instead of creating a pretend-ssh script in a couple spots.
Diffstat (limited to 'testsuite/daemon.test')
-rw-r--r--testsuite/daemon.test17
1 files changed, 2 insertions, 15 deletions
diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 77178439..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
@@ -54,7 +41,7 @@ case `id -u` in
;;
esac
-$RSYNC -ve $SSH --rsync-path="$RSYNC$confopt" localhost::
+$RSYNC -ve "$SSH" --rsync-path="$RSYNC$confopt" localhost::
RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
export RSYNC_CONNECT_PROG