Chown the $TO and $FROM directories to $RSYNCD_UID:$RSYNCD_GID (if we

can, and don't fail if we can't).

diff --git a/testsuite/daemon-gzip-download.test b/testsuite/daemon-gzip-download.test
index b716a99..31a94f5 100644 (file)
--- a/testsuite/daemon-gzip-download.test
+++ b/testsuite/daemon-gzip-download.test
@@ -27,5 +27,12 @@ RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
 export RSYNC_CONNECT_PROG
 
 hands_setup
 export RSYNC_CONNECT_PROG
 
 hands_setup

+
+# If we are root, we must allow the rsyncd process (which runs under
+# a different uid/gid) to write to the destination directory. Source
+# directory must be chown'ed as well so that UIDs & GIDs match when 
+# the source & destination are compared after copying.
+chown -R $RSYNCD_UID:$RSYNCD_GID "$FROM" "$TO" 2>/dev/null || true
+

 checkit "$RSYNC -avvz localhost::test-from/ \"$TO/\"" "$FROM" "$TO"
 
 checkit "$RSYNC -avvz localhost::test-from/ \"$TO/\"" "$FROM" "$TO"