Fixed failing hunks.

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

diff --git a/acls.diff b/acls.diff
index eb4cc59..1038d73 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -314,10 +314,10 @@ To use this patch, run these commands for a successful build:
        if (S_ISDIR(file->mode))
 --- old/compat.c
 +++ new/compat.c
-@@ -145,13 +145,6 @@ void setup_protocol(int f_out,int f_in)
-       }
- 
+@@ -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_acls && !local_server) {
 -                      rprintf(FERROR,
 -                          "--acls requires protocol 30 or higher"