+--- orig/generator.c 2006-01-31 18:59:39
++++ generator.c 2006-01-31 19:36:04
+@@ -42,6 +42,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int preserve_executability;
++extern int preserve_acls;
+ extern int preserve_uid;
+ extern int preserve_gid;
+ extern int preserve_times;
+@@ -756,6 +757,7 @@ static int try_dests_non(struct file_str
+ }
+
+ static int phase = 0;
++static int dflt_perms;
+
+ /* 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
+@@ -772,7 +774,7 @@ static void recv_generator(char *fname,
+ enum logcode code, int f_out)
+ {
+ static int missing_below = -1, excluded_below = -1;
+- static char *fuzzy_dirname = "";
++ static char *parent_dirname = "";
+ static struct file_list *fuzzy_dirlist = NULL;
+ struct file_struct *fuzzy_file = NULL;
+ int fd = -1, f_copy = -1;
+@@ -791,12 +793,12 @@ static void recv_generator(char *fname,
+ if (fuzzy_dirlist) {
+ flist_free(fuzzy_dirlist);
+ fuzzy_dirlist = NULL;
+- fuzzy_dirname = "";
+ }
+ if (missing_below >= 0) {
+ dry_run--;
+ missing_below = -1;
+ }
++ parent_dirname = "";
+ return;
+ }
+
+@@ -831,15 +833,20 @@ static void recv_generator(char *fname,
+ statret = -1;
+ stat_errno = ENOENT;
+ } else {
+- if (fuzzy_basis && S_ISREG(file->mode)) {
++ if ((fuzzy_basis || preserve_acls) && S_ISREG(file->mode)) {
+ char *dn = file->dirname ? file->dirname : ".";
+- if (fuzzy_dirname != dn
+- && strcmp(fuzzy_dirname, dn) != 0) {
++ if (parent_dirname != dn
++ && strcmp(parent_dirname, dn) != 0) {
+ if (fuzzy_dirlist)
+ flist_free(fuzzy_dirlist);
+- fuzzy_dirlist = get_dirlist(dn, -1, 1);
++ if (fuzzy_basis)
++ fuzzy_dirlist = get_dirlist(dn, -1, 1);
++#ifdef SUPPORT_ACLS
++ if (preserve_acls)
++ dflt_perms = default_perms_for_dir(dn);
++#endif
+ }
+- fuzzy_dirname = dn;
++ parent_dirname = dn;
+ }
+
+ statret = link_stat(fname, &st,
+@@ -861,7 +868,8 @@ static void recv_generator(char *fname,