Fixed failing hunks.

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

diff --git a/acls.diff b/acls.diff
index 1038d73..071b63e 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -292,7 +292,7 @@ To use this patch, run these commands for a successful build:
 +              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));
 +}
@@ -314,7 +314,7 @@ To use this patch, run these commands for a successful build:
        if (S_ISDIR(file->mode))
 --- old/compat.c
 +++ new/compat.c
-@@ -148,13 +148,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -163,13 +163,6 @@ void setup_protocol(int f_out,int f_in)
        if (protocol_version < 30) {
                if (append_mode == 1)
                        append_mode = 2;