Fixed failing hunks.

[rsync/rsync-patches.git] / xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index fd731ef..6cfc8d0 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -12,11 +12,10 @@ To use this patch, run these commands for a successful build:
 
 --- old/compat.c
 +++ new/compat.c
-@@ -144,16 +144,6 @@ void setup_protocol(int f_out,int f_in)
-               exit_cleanup(RERR_PROTOCOL);
-       }
- 
--      if (protocol_version < 30) {
+@@ -148,13 +148,6 @@ void setup_protocol(int f_out,int f_in)
+       if (protocol_version < 30) {
+               if (append_mode == 1)
+                       append_mode = 2;
 -              if (preserve_xattrs && !local_server) {
 -                      rprintf(FERROR,
 -                          "--xattrs requires protocol 30 or higher"
@@ -24,11 +23,9 @@ To use this patch, run these commands for a successful build:
 -                          protocol_version);
 -                      exit_cleanup(RERR_PROTOCOL);
 -              }
--      }
--
+       }
+ 
        if (delete_mode && !(delete_before+delete_during+delete_after)) {
-               if (protocol_version < 30)
-                       delete_before = 1;
 --- old/xattrs.c
 +++ new/xattrs.c
 @@ -20,6 +20,7 @@