./configure (optional if already run)
make
---- old/generator.c
-+++ new/generator.c
-@@ -43,6 +43,7 @@ extern int preserve_specials;
- extern int preserve_hard_links;
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -45,6 +45,7 @@ extern int preserve_hard_links;
+ extern int preserve_executability;
extern int preserve_perms;
extern int preserve_times;
+extern int omit_dir_changes;
extern int uid_ndx;
extern int gid_ndx;
extern int delete_mode;
-@@ -554,6 +555,7 @@ void itemize(const char *fnamecmp, struc
- int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? preserve_times > 1
- : !S_ISLNK(file->mode);
+@@ -605,6 +606,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ (receiver_symlink_times && !(file->flags & FLAG_TIME_FAILED)) ||
+ #endif
+ !S_ISLNK(file->mode);
+ int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
iflags |= ITEM_REPORT_SIZE;
-@@ -569,10 +571,11 @@ void itemize(const char *fnamecmp, struc
- #endif
- if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+@@ -621,10 +623,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ if ((preserve_perms || preserve_executability)
+ && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
+ if (uid_ndx && am_root && !omit_changes
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1288,7 +1291,7 @@ static void recv_generator(char *fname,
+@@ -1366,7 +1369,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
real_sx = sx;
if (file->flags & FLAG_DIR_CREATED)
statret = -1;
file->mode = dest_mode(file->mode, sx.st.st_mode,
dflt_perms, statret == 0);
}
---- old/options.c
-+++ new/options.c
-@@ -57,6 +57,7 @@ int preserve_specials = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -58,6 +58,7 @@ int preserve_specials = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -346,6 +347,7 @@ void usage(enum logcode F)
+@@ -352,6 +353,7 @@ void usage(enum logcode F)
rprintf(F," -D same as --devices --specials\n");
rprintf(F," -t, --times preserve modification times\n");
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
rprintf(F," --super receiver attempts super-user activities\n");
#ifdef SUPPORT_XATTRS
rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
-@@ -483,6 +485,7 @@ static struct poptOption long_options[]
+@@ -490,6 +492,7 @@ static struct poptOption long_options[] = {
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
{"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
-@@ -1451,6 +1454,8 @@ int parse_arguments(int *argc_p, const c
+@@ -1483,6 +1486,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
if (preserve_times > 1)
-@@ -1687,6 +1692,8 @@ void server_options(char **args, int *ar
+@@ -1721,6 +1726,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'm';
if (omit_dir_times)
argstr[x++] = 'O';
} else {
if (copy_links)
argstr[x++] = 'L';
---- old/rsync.c
-+++ new/rsync.c
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
@@ -34,6 +34,7 @@ extern int preserve_xattrs;
extern int preserve_perms;
extern int preserve_executability;
extern int am_root;
extern int am_server;
extern int am_sender;
-@@ -397,9 +398,11 @@ int set_file_attrs(const char *fname, st
- updated = 1;
+@@ -404,9 +405,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ file->flags |= FLAG_TIME_FAILED;
}
- change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(sxp->st.st_mode)) {
;
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -349,6 +349,7 @@ to the detailed description below for a
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -349,6 +349,7 @@ to the detailed description below for a complete description. verb(
-D same as --devices --specials
-t, --times preserve modification times
-O, --omit-dir-times omit directories from --times
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
-@@ -965,6 +966,10 @@ it is preserving modification times (see
+@@ -987,6 +988,10 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).