Fixed failing hunks.

diff --git a/acls.diff b/acls.diff
index 1cbe85e..ca57212 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -299,29 +299,16 @@ 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 @@

diff --git a/xattrs.diff b/xattrs.diff
index ac26057..d760bb6 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
                            protocol_version);
                        exit_cleanup(RERR_PROTOCOL);
                }
--              if (preserve_xattrs) {
+-              if (preserve_xattrs && !local_server) {
 -                      rprintf(FERROR,
 -                          "--xattrs requires protocol 30 or higher"
 -                          " (negotiated %d).\n",
@@ -26,19 +26,6 @@ To use this patch, run these commands for a successful build:
        }
  
        if (delete_mode && !(delete_before+delete_during+delete_after)) {
---- old/testsuite/xattrs.test
-+++ new/testsuite/xattrs.test
-@@ -9,10 +9,6 @@
- 
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync is configured without xattr support"
- 
--case "$RSYNC" in
--*protocol=29*) test_skipped "xattr support requires protocol 30" ;;
--esac
--
- case "`xattr 2>&1`" in
- *--list:*)
-     xset() {
 --- old/xattrs.c
 +++ new/xattrs.c
 @@ -20,6 +20,7 @@