+ if (type == SMB_ACL_TYPE_ACCESS)
+ F_ACL(file) = ndx;
+ else
-+ F_DEF_ACL(file) = ndx;
++ F_DIR_DEFACL(file) = ndx;
+ racl_list = &default_acl_list;
+ } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
+}
if (S_ISDIR(file->mode))
--- old/compat.c
+++ new/compat.c
-@@ -147,13 +147,6 @@ void setup_protocol(int f_out,int f_in)
- protocol_version);
- exit_cleanup(RERR_PROTOCOL);
- }
+@@ -163,13 +163,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"