X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/86692050b54b16e5b289ddeacbb59f890455cca7..af21c12fbcff6fc030c737f8079224ebfb99c912:/rsync.c

diff --git a/rsync.c b/rsync.c
index 178dc523..87a8056b 100644
--- a/rsync.c
+++ b/rsync.c
@@ -115,10 +115,10 @@ int delete_file(char *fname)
 
 static int is_in_group(gid_t gid)
 {
-#ifdef HAVE_GETGROUPS
+#ifdef GETGROUPS_T
 	static gid_t last_in = (gid_t) -2, last_out;
 	static int ngroups = -2;
-	static gid_t *gidset;
+	static GETGROUPS_T *gidset;
 	int n;
 
 	if (gid == last_in)
@@ -127,7 +127,7 @@ static int is_in_group(gid_t gid)
 		/* treat failure (-1) as if not member of any group */
 		ngroups = getgroups(0, 0);
 		if (ngroups > 0) {
-			gidset = (gid_t *) malloc(ngroups * sizeof(gid_t));
+			gidset = (GETGROUPS_T *) malloc(ngroups * sizeof(GETGROUPS_T));
 			ngroups = getgroups(ngroups, gidset);
 		}
 	}
@@ -200,14 +200,19 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	}
 
 #ifdef HAVE_CHMOD
-	if (preserve_perms && !S_ISLNK(st->st_mode) &&
-	    (st->st_mode != file->mode || 
-	     (updated && (file->mode & ~ACCESSPERMS)))) {
-		updated = 1;
-		if (do_chmod(fname,file->mode) != 0) {
-			rprintf(FERROR,"failed to set permissions on %s : %s\n",
-				fname,strerror(errno));
-			return 0;
+	if (!S_ISLNK(st->st_mode)) {
+		int file_mode;
+		if (preserve_perms)
+			file_mode = file->mode;
+		else
+			file_mode = file->mode & ACCESSPERMS;
+		if (st->st_mode != file->mode) {
+			updated = 1;
+			if (do_chmod(fname,file_mode) != 0) {
+				rprintf(FERROR,"failed to set permissions on %s : %s\n",
+					fname,strerror(errno));
+				return 0;
+			}
 		}
 	}
 #endif
@@ -260,7 +265,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 		if (errno == EXDEV) {
 			/* rename failed on cross-filesystem link.  
 			   Copy the file instead. */
-			if (copy_file(fnametmp,fname, file->mode & ACCESSPERMS)) {
+			if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
 				rprintf(FERROR,"copy %s -> %s : %s\n",
 					fnametmp,fname,strerror(errno));
 			} else {