Fixed a failing hunk.
authorWayne Davison <wayned@samba.org>
Thu, 23 Feb 2006 20:31:44 +0000 (20:31 +0000)
committerWayne Davison <wayned@samba.org>
Thu, 23 Feb 2006 20:31:44 +0000 (20:31 +0000)
acls.diff

index d3a3be0..9a7b57e 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1404,10 +1404,10 @@ ACLs to a non-ACL-supporting disk should complain.
  
  /* Acts on the_file_list->file's ndx'th item, whose name is fname.  If a dir,
   * make sure it exists, and has the right permissions/timestamp info.  For
-@@ -847,6 +848,10 @@ static void recv_generator(char *fname, 
+@@ -845,6 +846,10 @@ static void recv_generator(char *fname, 
                        }
                        if (fuzzy_basis)
-                               fuzzy_dirlist = need_dirlist;
+                               need_fuzzy_dirlist = 1;
 +#ifdef SUPPORT_ACLS
 +                      if (!preserve_perms)
 +                              dflt_perms = default_perms_for_dir(dn);