From: Wayne Davison <wayned@samba.org>
Date: Sat, 12 Apr 2008 04:57:17 +0000 (-0700)
Subject: If the daemon test is run as root, use a --config option.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/09ad90537ded518be41e2a35da6ee0ce2325eceb

If the daemon test is run as root, use a --config option.
---

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