Updated to apply cleanly.

[rsync-patches.git] / acls.diff

diff --git a/acls.diff b/acls.diff
index 801ce08b5e3db6dd1c2312343f707919edd864ae..27d2a5cea5293e175de6b59e83bf2d8b13ebc9e5 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -4597,7 +4597,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c     2005-05-03 16:47:32
+--- orig/options.c     2005-05-10 15:32:58
 +++ options.c  2005-02-14 02:46:05
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -4705,7 +4705,7 @@ ACLs to a non-ACL-supporting disk should complain.
        if (verbose > 1 && flags & PERMS_REPORT) {
                enum logcode code = daemon_log_format_has_i || dry_run
                                  ? FCLIENT : FINFO;
---- orig/rsync.h       2005-04-14 01:53:12
+--- orig/rsync.h       2005-05-03 17:11:01
 +++ rsync.h    2004-07-03 20:11:58
 @@ -638,6 +638,40 @@ struct stats {
  #include "lib/permstring.h"
@@ -4748,9 +4748,9 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo      2005-05-03 16:47:33
+--- orig/rsync.yo      2005-05-10 16:14:33
 +++ rsync.yo   2004-07-03 20:11:58
-@@ -325,6 +325,7 @@ to the detailed description below for a 
+@@ -317,6 +317,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions
@@ -4758,7 +4758,7 @@ ACLs to a non-ACL-supporting disk should complain.
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
-@@ -637,6 +638,11 @@ based on the source file's permissions, 
+@@ -629,6 +630,11 @@ based on the source file's permissions, 
  umask setting
  (which is the same behavior as other file-copy utilities, such as cp).