change the order of chmod and chown calls so that setuid bits don't

get removed by chown calls.

rsync.c

@@ -291,18 +291,6 @@ static 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 = 1;
-    if (do_chmod(fname,file->mode) != 0) {
-      rprintf(FERROR,"failed to set permissions on %s : %s\n",
-	      fname,strerror(errno));
-      return 0;
-    }
-  }
-#endif
-
 	if ((am_root || !am_daemon) &&
 	    ((am_root && preserve_uid && st->st_uid != file->uid) || 
 	     (preserve_gid && st->st_gid != file->gid))) {
@@ -311,14 +299,27 @@ static int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 			      preserve_gid?file->gid:-1) != 0) {
 			if (preserve_uid && st->st_uid != file->uid)
 				updated = 1;
-		  if (verbose>1 || preserve_uid)
+			if (verbose>1 || preserve_uid) {
 				rprintf(FERROR,"chown %s : %s\n",
 					fname,strerror(errno));
-		  return updated;
+				return 0;
+			}
 		}
 		updated = 1;
 	}
 
+#ifdef HAVE_CHMOD
+	if (preserve_perms && !S_ISLNK(st->st_mode) &&
+	    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
+    
 	if (verbose > 1 && report) {
 		if (updated)
 			rprintf(FINFO,"%s\n",fname);