The ACL support has arrived! This version has a brand new protocol

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index ed1f2a2..66438c4 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -28,6 +28,7 @@ int inc_recurse = 0;
 extern int verbose;
 extern int am_server;
 extern int am_sender;
+extern int local_server;
 extern int inplace;
 extern int recurse;
 extern int fuzzy_basis;
@@ -40,6 +41,7 @@ extern int prune_empty_dirs;
 extern int protocol_version;
 extern int preserve_uid;
 extern int preserve_gid;
+extern int preserve_acls;
 extern int preserve_hard_links;
 extern int need_messages_from_generator;
 extern int delete_mode, delete_before, delete_during, delete_after;
@@ -60,6 +62,8 @@ void setup_protocol(int f_out,int f_in)
                preserve_uid = ++file_extra_cnt;
        if (preserve_gid)
                preserve_gid = ++file_extra_cnt;
+       if (preserve_acls && !am_sender)
+               preserve_acls = ++file_extra_cnt;
 
        if (remote_protocol == 0) {
                if (!read_batch)
@@ -107,6 +111,13 @@ void setup_protocol(int f_out,int f_in)
                            protocol_version);
                        exit_cleanup(RERR_PROTOCOL);
                }
+               if (preserve_acls) {
+                       rprintf(FERROR,
+                           "--acls requires protocol 30 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
        }
 
        if (delete_mode && !(delete_before+delete_during+delete_after)) {
@@ -155,17 +166,7 @@ void setup_protocol(int f_out,int f_in)
                need_messages_from_generator = 1;
        }
 
-       if (make_backups && !backup_dir && delete_mode && !delete_excluded
-        && !am_server) {
-               char *rule;
-               if (asprintf(&rule, "P%s *%s",
-                           !am_sender || protocol_version >= 30 ? "p" : "",
-                           backup_suffix) < 0)
-                       out_of_memory("setup_protocol");
-               parse_rule(&filter_list, rule, 0, 0);
-               free(rule);
-       }
-       if (partial_dir && *partial_dir != '/' && !am_server) {
+       if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
                int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
                if (!am_sender || protocol_version >= 30)
                        flags |= MATCHFLG_PERISHABLE;