X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/128cf58433592234d105f2b29865d0f739629cb3..66203a982b3d249bafda9b9272c4c103c19e4a9b:/rsync.c

diff --git a/rsync.c b/rsync.c
index a65f01ff..039e1cd5 100644
--- a/rsync.c
+++ b/rsync.c
@@ -152,7 +152,6 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	int updated = 0;
 	STRUCT_STAT st2;
 	int change_uid, change_gid;
-	extern int am_daemon;
 
 	if (dry_run) return 0;
 
@@ -195,6 +194,12 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 			rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
 			return 0;
 		}
+		/* a lchown had been done - we have to re-stat if the
+                   destination had the setuid or setgid bits set due
+                   to the side effect of the chown call */
+		if (st->st_mode & (S_ISUID | S_ISGID)) {
+			link_stat(fname, st);
+		}
 		updated = 1;
 	}
 
@@ -254,6 +259,3 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 		set_perms(fname,file,NULL,0);
 	}
 }
-
-
-