Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a --no-cd option to support/lsh so that the script can be used by
[rsync/rsync.git]
/
testsuite
/
daemon.test
diff --git
a/testsuite/daemon.test
b/testsuite/daemon.test
index
439b883
..
994a994
100644
(file)
--- a/
testsuite/daemon.test
+++ b/
testsuite/daemon.test
@@
-24,20
+24,7
@@
. "$suitedir/rsync.fns"
. "$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
build_rsyncd_conf
@@
-45,7
+32,16
@@
cd "$scratchdir"
ln -s test-rsyncd.conf rsyncd.conf
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
RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
export RSYNC_CONNECT_PROG