Fixed failing hunks.

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

diff --git a/acls.diff b/acls.diff
index 1cbe85e..21aa7fa 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -299,39 +299,13 @@ To use this patch, run these commands for a successful build:
                            protocol_version);
                        exit_cleanup(RERR_PROTOCOL);
                }
--              if (preserve_acls) {
+-              if (preserve_acls && !local_server) {
 -                      rprintf(FERROR,
 -                          "--acls requires protocol 30 or higher"
 -                          " (negotiated %d).\n",
 -                          protocol_version);
 -                      exit_cleanup(RERR_PROTOCOL);
 -              }
-               if (preserve_xattrs) {
+               if (preserve_xattrs && !local_server) {
                        rprintf(FERROR,
                            "--xattrs requires protocol 30 or higher"
---- old/testsuite/acls.test
-+++ new/testsuite/acls.test
-@@ -9,10 +9,6 @@
- 
- $RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
- 
--case "$RSYNC" in
--*protocol=29*) test_skipped "ACL support requires protocol 30" ;;
--esac
--
- case "$setfacl_nodef" in
- true) test_skipped "I don't know how to use your setfacl command" ;;
- esac
---- old/testsuite/default-acls.test
-+++ new/testsuite/default-acls.test
-@@ -9,10 +9,6 @@
- 
- $RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
- 
--case "$RSYNC" in
--*protocol=29*) test_skipped "ACLs require protocol 30" ;;
--esac
--
- case "$setfacl_nodef" in
- true) test_skipped "I don't know how to use your setfacl command" ;;
- *-k*) opts='-dm u::7,g::5,o:5' ;;