Allow a local-server copy to use -X and -A even if a --protocol-version

is forced, which makes some testing idioms easier.

diff --git a/compat.c b/compat.c
index 3f4bd45..38618d5 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -115,14 +115,14 @@ void setup_protocol(int f_out,int f_in)
                            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"
                            " (negotiated %d).\n",

diff --git a/testsuite/acls.test b/testsuite/acls.test
index af56007..0e8a1e2 100644 (file)
--- a/testsuite/acls.test
+++ b/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

diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index d8d60d4..4b98de8 100644 (file)
--- a/testsuite/xattrs.test
+++ b/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() {