From: Wayne Davison <wayned@samba.org>
Date: Fri, 13 Nov 2009 06:05:45 +0000 (-0800)
Subject: Fix the daemon test when running it as root.
X-Git-Tag: v3.1.0pre1~292
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa381148a3b7fcf0772ea587e3d7969bd637dfcc;p=thirdparty%2Frsync.git

Fix the daemon test when running it as root.
---

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 19838776..b58bd0db 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -256,6 +256,17 @@ build_rsyncd_conf() {
     logfile="$scratchdir/rsyncd.log"
     hostname=`uname -n`
 
+    uid_setting='uid = 0'
+    gid_setting='gid = 0'
+    case `id -u` in
+    0) ;;
+    *)
+	# Non-root cannot specify uid & gid settings
+	uid_setting="#$uid_setting"
+	gid_setting="#$gid_setting"
+	;;
+    esac
+
     cat >"$conf" <<EOF
 # rsyncd configuration file autogenerated by $0
 
@@ -268,8 +279,8 @@ log format = %i %h [%a] %m (%u) %l %f%L
 transfer logging = yes
 exclude = ? foobar.baz
 max verbosity = 4
-#uid = 0
-#gid = 0
+$uid_setting
+$gid_setting
 
 [test-from]
 	path = $fromdir