From: J.W. Schultz <jw@samba.org>
Date: Wed, 26 Mar 2003 20:26:06 +0000 (+0000)
Subject: Make link-dest aware of --perms, --owner and --group.
X-Git-Tag: v2.5.7~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb24028f51bac18097e688c1459924f648bc407e;p=thirdparty%2Frsync.git

Make link-dest aware of --perms, --owner and --group.
				---- Chris Darroch
---

diff --git a/generator.c b/generator.c
index 3552887e..84264dcc 100644
--- a/generator.c
+++ b/generator.c
@@ -52,12 +52,19 @@ static int skip_file(char *fname,
 		return 0;
 	}
 	if (link_dest) {
-		if((st->st_mode & ~_S_IFMT) !=  (file->mode & ~_S_IFMT)) {
+		extern int preserve_perms;
+		extern int preserve_uid;
+		extern int preserve_gid;
+
+		if((preserve_perms
+		    && st->st_mode & ~_S_IFMT) !=  (file->mode & ~_S_IFMT))
 			return 0;
-		}
-		if (st->st_uid != file->uid || st->st_gid != file->gid) {
+
+		if (preserve_uid && st->st_uid != file->uid)
+			return 0;
+
+		if (preserve_gid && st->st_gid != file->gid)
 			return 0;
-		}
 	}
 
 	/* if always checksum is set then we use the checksum instead