diff options
| author | Wayne Davison <wayned@samba.org> | 2008-04-11 21:57:17 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2008-04-11 21:57:17 -0700 |
| commit | 09ad90537ded518be41e2a35da6ee0ce2325eceb (patch) | |
| tree | a35614045213d8a69f5a1bda10593f87b5cababd /testsuite | |
| parent | da9aefa6b42cba4ef540ec03ebd9ce0c466264fb (diff) | |
| download | rsync-09ad90537ded518be41e2a35da6ee0ce2325eceb.tar.gz rsync-09ad90537ded518be41e2a35da6ee0ce2325eceb.tar.bz2 rsync-09ad90537ded518be41e2a35da6ee0ce2325eceb.zip | |
If the daemon test is run as root, use a --config option.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/daemon.test | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/testsuite/daemon.test b/testsuite/daemon.test index 439b8835..77178439 100644 --- a/testsuite/daemon.test +++ b/testsuite/daemon.test @@ -45,7 +45,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 |