X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e484f0cc04d7ae5a92f3737d7dbebb40e70f74ff..997d9ea67fea5bc3e0fb8d8ca8d742a0ae95b47e:/rsync.c

diff --git a/rsync.c b/rsync.c
index 47b49a6f..1b28c35e 100644
--- a/rsync.c
+++ b/rsync.c
@@ -161,6 +161,11 @@ 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 = preserve_gid && file->gid != GID_NONE
 		&& st->st_gid != file->gid;
+#if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK
+	if (S_ISLNK(st->st_mode))
+		;
+	else
+#endif
 	if (change_uid || change_gid) {
 		if (verbose > 2) {
 			if (change_uid) {
@@ -235,7 +240,7 @@ void sig_int(void)
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
-		     int ok_to_set_time)
+		     int ok_to_set_time, int overwriting_basis)
 {
 	int ret;
 
@@ -245,7 +250,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 		goto do_set_perms;
 	}
 
-	if (make_backups && !make_backup(fname))
+	if (make_backups && overwriting_basis && !make_backup(fname))
 		return;
 
 	/* Change permissions before putting the file into place. */