From: David Dykstra <dwd@samba.org>
Date: Wed, 29 Dec 1999 20:50:48 +0000 (+0000)
Subject: When writing to a daemon with read only = false and uid = root and -g,
X-Git-Tag: v2.4.0~49
X-Git-Url: http://git.samba.org/samba.git/?p=rsync.git;a=commitdiff_plain;h=128cf58433592234d105f2b29865d0f739629cb3

When writing to a daemon with read only = false and uid = root and -g,
was not preserving group permisions.  Bug was introduced March 1 in
version 1.100 of rsync.c with an error in re-ordering of the boolean
expressions.  In order to completely preserve the earlier semantics,
change_gid should depend on "(am_root || !am_daemon)", but I don't see why
group ownership should behave differently in a non-root daemon.
---

diff --git a/rsync.c b/rsync.c
index 680fc0bf..a65f01ff 100644
--- a/rsync.c
+++ b/rsync.c
@@ -179,7 +179,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	}
 
 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-	change_gid = !am_daemon && preserve_gid && file->gid != (gid_t) -1 && \
+	change_gid = preserve_gid && file->gid != (gid_t) -1 && \
 				st->st_gid != file->gid;
 	if (change_gid && !am_root) {
 		/* enforce bsd-style group semantics: non-root can only