popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -0,0 +1,1120 @@
+@@ -0,0 +1,1093 @@
+/*
+ * Handle passing Access Control Lists between systems.
+ *
+ {NULL, 0}, {NULL, 0}, NO_ENTRY, NO_ENTRY, NO_ENTRY, NO_ENTRY
+};
+
-+/* === List functions === */
-+
-+#define EMPTY_LIST {NULL, 0, 0}
-+
-+typedef struct {
-+ void *items;
-+ size_t count;
-+ size_t malloced;
-+} item_list;
-+
-+static item_list access_acl_list = EMPTY_LIST;
-+static item_list default_acl_list = EMPTY_LIST;
-+
-+#define EXPAND_ITEM_LIST(lp, type, fast) (type*)expand_item_list(lp, sizeof (type), #type, fast)
-+
-+static void *expand_item_list(item_list *lp, size_t item_size, const char *desc, int fast)
-+{
-+ /* First time through, 0 <= 0, so list is expanded. */
-+ if (lp->malloced <= lp->count) {
-+ void *new_ptr;
-+ size_t new_size = lp->malloced;
-+ if (fast) {
-+ if (new_size < 1000)
-+ new_size += 1000;
-+ else
-+ new_size *= 2;
-+ } else
-+ new_size += 10;
-+ new_ptr = realloc_array(lp->items, char, new_size * item_size);
-+ if (verbose >= 4) {
-+ rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
-+ who_am_i(), desc, (double)new_size * item_size,
-+ new_ptr == lp->items ? " not" : "");
-+ }
-+ if (!new_ptr)
-+ out_of_memory("expand_item_list");
-+
-+ lp->items = new_ptr;
-+ lp->malloced = new_size;
-+ }
-+ return (char*)lp->items + (lp->count++ * item_size);
-+}
++static item_list access_acl_list = EMPTY_ITEM_LIST;
++static item_list default_acl_list = EMPTY_ITEM_LIST;
+
+/* === Calculations on ACL types === */
+
+{
+ racl->user_obj = (mode >> 6) & 7;
+ racl->group_obj = (mode >> 3) & 7;
-+#ifdef ACLS_NEED_MASK
-+ racl->mask = (mode >> 3) & 7;
-+#endif
+ racl->other = mode & 7;
+}
+
+ return True;
+}
+
-+static BOOL rsync_acls_equal(const rsync_acl *racl1, const rsync_acl *racl2)
++static BOOL rsync_acl_equal(const rsync_acl *racl1, const rsync_acl *racl2)
+{
-+ return (racl1->user_obj == racl2->user_obj
-+ && racl1->group_obj == racl2->group_obj
-+ && racl1->mask == racl2->mask
-+ && racl1->other == racl2->other
-+ && ida_entries_equal(&racl1->users, &racl2->users)
-+ && ida_entries_equal(&racl1->groups, &racl2->groups));
++ return racl1->user_obj == racl2->user_obj
++ && racl1->group_obj == racl2->group_obj
++ && racl1->mask == racl2->mask
++ && racl1->other == racl2->other
++ && ida_entries_equal(&racl1->users, &racl2->users)
++ && ida_entries_equal(&racl1->groups, &racl2->groups);
+}
+
+/* Are the extended (non-permission-bit) entries equal? If so, the rest of
+ * the ACL will be handled by the normal mode-preservation code. This is
+ * only meaningful for access ACLs! Note: the 1st arg is a fully-populated
+ * rsync_acl, but the 2nd parameter can be a condensed rsync_acl, which means
-+ * that it might have several of its perm objects set to NO_ENTRY. */
-+static BOOL rsync_acls_equal_enough(const rsync_acl *racl1,
-+ const rsync_acl *racl2, mode_t m)
++ * that it might have several of its permission objects set to NO_ENTRY. */
++static BOOL rsync_acl_equal_enough(const rsync_acl *racl1,
++ const rsync_acl *racl2, mode_t m)
+{
+ if ((racl1->mask ^ racl2->mask) & NO_ENTRY)
+ return False; /* One has a mask and the other doesn't */
+ *racl = empty_rsync_acl;
+}
+
-+void free_acls(statx *sxp)
++void free_acl(statx *sxp)
+{
+ if (sxp->acc_acl) {
+ rsync_acl_free(sxp->acc_acl);
+
+/* === System ACLs === */
+
-+/* Unpack system acl -> rsync acl verbatim. Return whether we succeeded. */
++/* Unpack system ACL -> rsync ACL verbatim. Return whether we succeeded. */
+static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
+{
-+ static item_list temp_ida_list = EMPTY_LIST;
++ static item_list temp_ida_list = EMPTY_ITEM_LIST;
+ SMB_ACL_TAG_T prior_list_type = 0;
+ SMB_ACL_ENTRY_T entry;
+ const char *errfun;
+ save_idas(&temp_ida_list, racl, prior_list_type);
+ prior_list_type = tag_type;
+ }
-+ ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, 0);
++ ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
+ ida->id = *((id_t *)qualifier);
+ ida->access = access;
+ sys_acl_free_qualifier(qualifier, tag_type);
+ return -1;
+}
+
-+/* Pack rsync acl -> system acl verbatim. Return whether we succeeded. */
++/* Pack rsync ACL -> system ACL verbatim. Return whether we succeeded. */
+static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
+{
+#ifdef ACLS_NEED_MASK
+ *match = racl_list->count - 1;
+ while (count--) {
+ rsync_acl *base = racl_list->items;
-+ if (rsync_acls_equal(base + *match, racl))
++ if (rsync_acl_equal(base + *match, racl))
+ return *match;
+ if (!(*match)--)
+ *match = racl_list->count - 1;
+ return *match;
+}
+
-+/* Turn the ACL data in statx into cached ACL data, setting the index
-+ * values in the file struct. */
-+void cache_acls(struct file_struct *file, statx *sxp)
-+{
-+ SMB_ACL_TYPE_T type;
-+ rsync_acl *racl;
-+ item_list *racl_list;
-+ char *ndx_ptr;
-+
-+ if (!sxp->acc_acl)
-+ return;
-+
-+ type = SMB_ACL_TYPE_ACCESS;
-+ racl = sxp->acc_acl;
-+ racl_list = &access_acl_list;
-+ ndx_ptr = (char*)file + file_struct_len;
-+ do {
-+ int ndx = find_matching_rsync_acl(type, racl_list, racl);
-+ if (ndx == -1) {
-+ acl_duo *new_duo;
-+ ndx = racl_list->count;
-+ new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1);
-+ new_duo->racl = *racl;
-+ new_duo->sacl = NULL;
-+ *racl = empty_rsync_acl;
-+ } else
-+ rsync_acl_free(racl);
-+ SIVAL(ndx_ptr, 0, ndx);
-+ racl = sxp->def_acl;
-+ racl_list = &default_acl_list;
-+ ndx_ptr += 4;
-+ } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
-+}
-+
-+/* Return the ACL(s) for the given filename. */
-+int get_acls(const char *fname, statx *sxp)
++/* Return the Access Control List for the given filename. */
++int get_acl(const char *fname, statx *sxp)
+{
+ SMB_ACL_TYPE_T type;
+
+ rsync_acl *racl = new(rsync_acl);
+
+ if (!racl)
-+ out_of_memory("get_acls");
++ out_of_memory("get_acl");
+ if (type == SMB_ACL_TYPE_ACCESS)
+ sxp->acc_acl = racl;
+ else
+
+ sys_acl_free_acl(sacl);
+ if (!ok) {
-+ free_acls(sxp);
++ free_acl(sxp);
+ return -1;
+ }
+ } else if (errno == ENOTSUP) {
+ if (type == SMB_ACL_TYPE_ACCESS)
+ rsync_acl_fake_perms(racl, sxp->st.st_mode);
+ } else {
-+ rsyserr(FERROR, errno, "get_acls: sys_acl_get_file(%s, %s)",
++ rsyserr(FERROR, errno, "get_acl: sys_acl_get_file(%s, %s)",
+ fname, str_acl_type(type));
-+ free_acls(sxp);
++ free_acl(sxp);
+ return -1;
+ }
+ } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
+
+/* The general strategy with the tag_type <-> character mapping is that
+ * lowercase implies that no qualifier follows, where uppercase does.
-+ * A similar idiom for the acl type (access or default) itself, but
++ * A similar idiom for the ACL type (access or default) itself, but
+ * lowercase in this instance means there's no ACL following, so the
+ * ACL is a repeat, so the receiver should reuse the last of the same
+ * type ACL. */
+ }
+}
+
-+/* Send an rsync acl over the file descriptor. */
++/* Send an rsync ACL over the file descriptor. */
+static void send_rsync_acl(int f, const rsync_acl *racl)
+{
+ size_t count = count_racl_entries(racl);
+ }
+}
+
-+/* Send the ACLs from the statx structure down the indicated file descriptor.
++/* Send the ACL from the statx structure down the indicated file descriptor.
+ * This also frees the ACL data. */
-+void send_acls(statx *sxp, int f)
++void send_acl(statx *sxp, int f)
+{
+ SMB_ACL_TYPE_T type;
+ rsync_acl *racl, *new_racl;
+ item_list *racl_list;
++ int ndx;
+
+ if (S_ISLNK(sxp->st.st_mode))
+ return;
+ racl = sxp->acc_acl;
+ racl_list = &access_acl_list;
+ do {
-+ int ndx;
++ if (!racl) {
++ racl = new(rsync_acl);
++ if (!racl)
++ out_of_memory("send_acl");
++ *racl = empty_rsync_acl;
++ if (type == SMB_ACL_TYPE_ACCESS) {
++ rsync_acl_fake_perms(racl, sxp->st.st_mode);
++ sxp->acc_acl = racl;
++ } else
++ sxp->def_acl = racl;
++ }
+
-+ /* Discard a superfluous mask. */
-+ if (racl->mask != NO_ENTRY && !racl->users.count && !racl->groups.count)
-+ racl->mask = NO_ENTRY;
+ /* Avoid sending values that can be inferred from other data,
+ * but only when preserve_acls == 1 (it is 2 when we must be
+ * backward compatible with older acls.diff versions). */
+ if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
+ write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
+ write_int(f, ndx);
-+ rsync_acl_free(racl);
+ } else {
-+ new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1);
++ new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1000);
+ write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
+ send_rsync_acl(f, racl);
+ *new_racl = *racl;
+ racl_list = &default_acl_list;
+ } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
+
-+ free_acls(sxp);
++ free_acl(sxp);
+}
+
+/* === Receive functions === */
+
+static void receive_rsync_acl(rsync_acl *racl, int f, SMB_ACL_TYPE_T type)
+{
-+ static item_list temp_ida_list = EMPTY_LIST;
++ static item_list temp_ida_list = EMPTY_ITEM_LIST;
+ SMB_ACL_TAG_T tag_type = 0, prior_list_type = 0;
+ uchar computed_mask_bits = 0;
+ id_access *ida;
+ save_idas(&temp_ida_list, racl, prior_list_type);
+ prior_list_type = tag_type;
+ }
-+ ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, 0);
++ ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
+ ida->access = access;
+ ida->id = read_int(f);
+ computed_mask_bits |= access;
+ if (tag == 'A' || tag == 'D') {
+ acl_duo *duo_item;
+ ndx = racl_list->count;
-+ duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1);
++ duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
+ receive_rsync_acl(&duo_item->racl, f, type);
+ duo_item->sacl = NULL;
+ } else {
+ ndx = read_int(f);
-+ if ((size_t)ndx >= racl_list->count) {
++ if (ndx < 0 || (size_t)ndx >= racl_list->count) {
+ rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
+ f_name(file, NULL), str_acl_type(type), ndx);
+ exit_cleanup(RERR_STREAMIO);
+ } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
+}
+
++/* Turn the ACL data in statx into cached ACL data, setting the index
++ * values in the file struct. */
++void cache_acl(struct file_struct *file, statx *sxp)
++{
++ SMB_ACL_TYPE_T type;
++ rsync_acl *racl;
++ item_list *racl_list;
++ char *ndx_ptr;
++ int ndx;
++
++ if (S_ISLNK(file->mode))
++ return;
++
++ type = SMB_ACL_TYPE_ACCESS;
++ racl = sxp->acc_acl;
++ racl_list = &access_acl_list;
++ ndx_ptr = (char*)file + file_struct_len;
++ do {
++ if (!racl)
++ ndx = -1;
++ else if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) == -1) {
++ acl_duo *new_duo;
++ ndx = racl_list->count;
++ new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
++ new_duo->racl = *racl;
++ new_duo->sacl = NULL;
++ *racl = empty_rsync_acl;
++ }
++ SIVAL(ndx_ptr, 0, ndx);
++ racl = sxp->def_acl;
++ racl_list = &default_acl_list;
++ ndx_ptr += 4;
++ } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
++
++ free_acl(sxp);
++}
++
+static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode, mode_t mode)
+{
+ SMB_ACL_ENTRY_T entry;
+
+ if (S_ISDIR(mode)) {
+ /* If the sticky bit is going on, it's not safe to allow all
-+ * the new ACLs to go into effect before it gets set. */
++ * the new ACL to go into effect before it gets set. */
+#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
+ if (mode & S_ISVTX)
+ mode &= ~0077;
+ mode &= ~0077;
+ } else {
+ /* If setuid or setgid is going off, it's not safe to allow all
-+ * the new ACLs to go into effect before they get cleared. */
++ * the new ACL to go into effect before they get cleared. */
+ if ((old_mode & S_ISUID && !(mode & S_ISUID))
+ || (old_mode & S_ISGID && !(mode & S_ISGID)))
+ mode &= ~0077;
+
+/* Set ACL on indicated filename.
+ *
-+ * This sets extended access ACL entries and default ACLs. If convenient,
-+ * it sets permission bits along with the access ACLs and signals having
++ * This sets extended access ACL entries and default ACL. If convenient,
++ * it sets permission bits along with the access ACL and signals having
+ * done so by modifying sxp->st.st_mode.
+ *
+ * Returns 1 for unchanged, 0 for changed, -1 for failed. Call this
-+ * with fname set to NULL to just check if the ACLs are unchanged. */
-+int set_acls(const char *fname, const struct file_struct *file, statx *sxp)
++ * with fname set to NULL to just check if the ACL is unchanged. */
++int set_acl(const char *fname, const struct file_struct *file, statx *sxp)
+{
+ int unchanged = 1;
+ SMB_ACL_TYPE_T type;
+ do {
+ acl_duo *duo_item;
+ BOOL eq;
-+ int ndx = IVAL(ndx_ptr, 0);
++ int32 ndx = IVAL(ndx_ptr, 0);
+
+ ndx_ptr += 4;
+
+ if (type == SMB_ACL_TYPE_ACCESS) {
++ if (ndx < 0 || (size_t)ndx >= access_acl_list.count)
++ continue;
+ duo_item = access_acl_list.items;
+ duo_item += ndx;
-+ eq = rsync_acls_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
++ eq = sxp->acc_acl
++ && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
+ } else {
++ if (ndx < 0 || (size_t)ndx >= default_acl_list.count)
++ continue;
+ duo_item = default_acl_list.items;
+ duo_item += ndx;
-+ eq = rsync_acls_equal(sxp->def_acl, &duo_item->racl);
++ eq = sxp->def_acl
++ && rsync_acl_equal(sxp->def_acl, &duo_item->racl);
+ }
+ if (eq)
+ continue;
+static int enum_ida_index = 0;
+static size_t enum_racl_index = 0;
+
-+/* This returns the next tag_type id from the given acl for the next entry,
++/* This returns the next tag_type id from the given ACL for the next entry,
+ * or it returns 0 if there are no more tag_type ids in the acl. */
+static id_t *next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
+{
+ continue;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls) {
-+ get_acls(rel, &sx);
-+ cache_acls(file, &sx);
++ get_acl(rel, &sx);
++ cache_acl(file, &sx);
+ }
+#endif
+ set_file_attrs(fullpath, file, NULL, 0);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls) {
-+ get_acls(fname, &sx);
-+ cache_acls(file, &sx);
++ get_acl(fname, &sx);
++ cache_acl(file, &sx);
+ }
+#endif
+
--- old/flist.c
+++ new/flist.c
-@@ -40,6 +40,7 @@ extern int filesfrom_fd;
+@@ -41,6 +41,7 @@ extern int curr_dir_depth;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
-@@ -133,6 +134,8 @@ static void list_file_entry(struct file_
+@@ -134,6 +135,8 @@ static void list_file_entry(struct file_
permstring(permbuf, f->mode);
-+ /* TODO: indicate '+' if the entry has ACLs. */
++ /* TODO: indicate '+' if the entry has an ACL. */
+
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -499,6 +502,9 @@ static struct file_struct *receive_file_
+@@ -492,6 +495,9 @@ static struct file_struct *receive_file_
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+#ifdef SUPPORT_ACLS
-+ int acl_len;
++ int xtra_len;
+#endif
OFF_T file_length;
char *basename, *dirname, *bp;
struct file_struct *file;
-@@ -602,13 +608,27 @@ static struct file_struct *receive_file_
+@@ -595,13 +601,27 @@ static struct file_struct *receive_file_
sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+#ifdef SUPPORT_ACLS
+ /* We need one or two index int32s when we're preserving ACLs. */
+ if (preserve_acls)
-+ acl_len = (S_ISDIR(mode) ? 2 : 1) * sizeof (int32);
++ xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4;
+ else
-+ acl_len = 0;
++ xtra_len = 0;
+#endif
+
alloc_len = file_struct_len + dirname_len + basename_len
+#ifdef SUPPORT_ACLS
-+ + acl_len
++ + xtra_len
+#endif
+ linkname_len + sum_len;
bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
memset(bp, 0, file_struct_len);
bp += file_struct_len;
+#ifdef SUPPORT_ACLS
-+ bp += acl_len;
++ bp += xtra_len;
+#endif
file->modtime = modtime;
file->length = file_length;
-@@ -703,6 +723,11 @@ static struct file_struct *receive_file_
+@@ -694,6 +714,11 @@ static struct file_struct *receive_file_
read_buf(f, sum, checksum_len);
}
return file;
}
-@@ -733,6 +758,9 @@ struct file_struct *make_file(char *fnam
- char thisname[MAXPATHLEN];
- char linkname[MAXPATHLEN];
- int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
-+#ifdef SUPPORT_ACLS
-+ int acl_len;
-+#endif
- char *basename, *dirname, *bp;
-
- if (!flist || !flist->count) /* Ignore lastdir when invalid. */
-@@ -848,8 +876,19 @@ struct file_struct *make_file(char *fnam
- sum_len = always_checksum && am_sender && S_ISREG(st.st_mode)
- ? MD4_SUM_LENGTH : 0;
-
-+#ifdef SUPPORT_ACLS
-+ /* We need one or two index int32s when we're preserving ACLs. */
-+ if (preserve_acls)
-+ acl_len = (S_ISDIR(st.st_mode) ? 2 : 1) * sizeof (int32);
-+ else
-+ acl_len = 0;
-+#endif
-+
- alloc_len = file_struct_len + dirname_len + basename_len
-- + linkname_len + sum_len;
-+#ifdef SUPPORT_ACLS
-+ + acl_len
-+#endif
-+ + linkname_len + sum_len;
- if (flist)
- bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
- else {
-@@ -860,6 +899,9 @@ struct file_struct *make_file(char *fnam
- file = (struct file_struct *)bp;
- memset(bp, 0, file_struct_len);
- bp += file_struct_len;
-+#ifdef SUPPORT_ACLS
-+ bp += acl_len;
-+#endif
-
- file->flags = flags;
- file->modtime = st.st_mtime;
-@@ -952,6 +994,9 @@ static struct file_struct *send_file_nam
+@@ -943,6 +968,9 @@ static struct file_struct *send_file_nam
unsigned short flags)
{
struct file_struct *file;
file = make_file(fname, flist, stp, flags,
f == -2 ? SERVER_FILTERS : ALL_FILTERS);
-@@ -961,6 +1006,15 @@ static struct file_struct *send_file_nam
+@@ -952,6 +980,15 @@ static struct file_struct *send_file_nam
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
+ if (preserve_acls) {
+ sx.st.st_mode = file->mode;
+ sx.acc_acl = sx.def_acl = NULL;
-+ if (get_acls(fname, &sx) < 0)
++ if (get_acl(fname, &sx) < 0)
+ return NULL;
+ }
+#endif
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
-@@ -968,6 +1022,15 @@ static struct file_struct *send_file_nam
+@@ -959,6 +996,15 @@ static struct file_struct *send_file_nam
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ send_acls(&sx, f);
++ send_acl(&sx, f);
+#endif
+ } else {
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ free_acls(&sx);
++ free_acl(&sx);
+#endif
}
return file;
return 0;
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && set_acls(NULL, file, sxp) == 0)
++ if (preserve_acls && set_acl(NULL, file, sxp) == 0)
+ return 0;
+#endif
+
+ && sxp->st.st_gid != file->gid)
iflags |= ITEM_REPORT_GROUP;
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && set_acls(NULL, file, sxp) == 0)
++ if (preserve_acls && set_acl(NULL, file, sxp) == 0)
+ iflags |= ITEM_REPORT_ACL;
+#endif
} else
+ char *cmpbuf, statx *sxp, int itemizing,
int maybe_ATTRS_REPORT, enum logcode code)
{
- int best_match = -1;
-@@ -612,7 +623,7 @@ static int try_dests_reg(struct file_str
+ int save_ignore_times = ignore_times;
+@@ -618,7 +629,7 @@ static int try_dests_reg(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
continue;
switch (match_level) {
case 0:
-@@ -620,16 +631,20 @@ static int try_dests_reg(struct file_str
+@@ -626,16 +637,20 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
- if (!unchanged_attrs(file, stp))
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ get_acls(cmpbuf, sxp);
++ get_acl(cmpbuf, sxp);
+#endif
+ if (!unchanged_attrs(file, sxp))
continue;
- if ((always_checksum || ignore_times)
+ if (always_checksum
- && cmp_time(stp->st_mtime, file->modtime))
+ && cmp_time(sxp->st.st_mtime, file->modtime))
continue;
best_match = j;
match_level = 3;
-@@ -644,22 +659,27 @@ static int try_dests_reg(struct file_str
+@@ -653,22 +668,27 @@ static int try_dests_reg(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ } else if (itemizing) {
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !ACL_READY(*sxp))
-+ get_acls(fname, sxp);
++ get_acl(fname, sxp);
+#endif
+ itemize(file, ndx, 0, sxp, 0, 0, NULL);
+ }
if (verbose > 1 && maybe_ATTRS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
-@@ -678,8 +698,13 @@ static int try_dests_reg(struct file_str
+@@ -687,8 +707,13 @@ static int try_dests_reg(struct file_str
}
return -1;
}
+ if (itemizing) {
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !ACL_READY(*sxp))
-+ get_acls(fname, sxp);
++ get_acl(fname, sxp);
+#endif
+ itemize(file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
+ }
set_file_attrs(fname, file, NULL, 0);
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
-@@ -704,13 +729,18 @@ static int try_dests_non(struct file_str
+@@ -713,13 +738,18 @@ static int try_dests_non(struct file_str
enum logcode code)
{
char fnamebuf[MAXPATHLEN];
+ continue;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ get_acls(fnamebuf, &sx);
++ get_acl(fnamebuf, &sx);
+#endif
+ if (!unchanged_attrs(file, &sx))
continue;
if (S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
-@@ -723,10 +753,10 @@ static int try_dests_non(struct file_str
+@@ -732,10 +762,10 @@ static int try_dests_non(struct file_str
#endif
continue;
} else if (IS_SPECIAL(file->mode)) {
continue;
} else {
rprintf(FERROR,
-@@ -755,7 +785,15 @@ static int try_dests_non(struct file_str
+@@ -764,7 +794,15 @@ static int try_dests_non(struct file_str
int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ (link_dest ? ITEM_XNAME_FOLLOWS : 0);
char *lp = link_dest ? "" : NULL;
- itemize(file, ndx, 0, &st, changes, 0, lp);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ get_acls(fname, &sx);
++ get_acl(fname, &sx);
+#endif
+ itemize(file, ndx, 0, &sx, changes, 0, lp);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ free_acls(&sx);
++ free_acl(&sx);
+#endif
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
code = daemon_log_format_has_i || dry_run
-@@ -769,6 +807,7 @@ static int try_dests_non(struct file_str
+@@ -778,6 +816,7 @@ static int try_dests_non(struct file_str
}
static int phase = 0;
/* 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
-@@ -790,7 +829,8 @@ static void recv_generator(char *fname,
+@@ -799,7 +838,8 @@ static void recv_generator(char *fname,
static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
struct file_struct *back_file = NULL;
int statret, real_ret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
-@@ -841,6 +881,9 @@ static void recv_generator(char *fname,
+@@ -850,6 +890,9 @@ static void recv_generator(char *fname,
dry_run--;
missing_below = -1;
}
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
-@@ -848,7 +891,7 @@ static void recv_generator(char *fname,
+@@ -857,7 +900,7 @@ static void recv_generator(char *fname,
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
-- && do_stat(dn, &st) < 0
-+ && do_stat(dn, &sx.st) < 0
+- && safe_stat(dn, &st) < 0
++ && safe_stat(dn, &sx.st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
-@@ -860,6 +903,10 @@ static void recv_generator(char *fname,
+@@ -869,6 +912,10 @@ static void recv_generator(char *fname,
}
if (fuzzy_basis)
need_fuzzy_dirlist = 1;
}
parent_dirname = dn;
-@@ -868,7 +915,7 @@ static void recv_generator(char *fname,
+@@ -877,7 +924,7 @@ static void recv_generator(char *fname,
need_fuzzy_dirlist = 0;
}
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
}
-@@ -886,8 +933,9 @@ static void recv_generator(char *fname,
+@@ -895,8 +942,9 @@ static void recv_generator(char *fname,
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = statret == 0
}
if (S_ISDIR(file->mode)) {
-@@ -896,8 +944,8 @@ static void recv_generator(char *fname,
+@@ -905,8 +953,8 @@ static void recv_generator(char *fname,
* file of that name and it is *not* a directory, then
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
return;
statret = -1;
}
-@@ -906,7 +954,11 @@ static void recv_generator(char *fname,
+@@ -915,7 +963,11 @@ static void recv_generator(char *fname,
dry_run++;
}
if (itemizing && f_out != -1) {
- itemize(file, ndx, statret, &st,
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && statret == 0)
-+ get_acls(fname, &sx);
++ get_acl(fname, &sx);
+#endif
+ itemize(file, ndx, statret, &sx,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -918,19 +970,19 @@ static void recv_generator(char *fname,
+@@ -927,19 +979,19 @@ static void recv_generator(char *fname,
full_fname(fname));
}
}
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
-@@ -948,7 +1000,7 @@ static void recv_generator(char *fname,
+@@ -957,7 +1009,7 @@ static void recv_generator(char *fname,
char lnk[MAXPATHLEN];
int len;
&& (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
lnk[len] = 0;
/* A link already pointing to the
-@@ -956,10 +1008,10 @@ static void recv_generator(char *fname,
+@@ -965,10 +1017,10 @@ static void recv_generator(char *fname,
* required. */
if (strcmp(lnk, file->u.link) == 0) {
if (itemizing) {
maybe_ATTRS_REPORT);
if (preserve_hard_links
&& file->link_u.links) {
-@@ -972,9 +1024,9 @@ static void recv_generator(char *fname,
+@@ -981,9 +1033,9 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
statret = -1;
} else if (basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
-@@ -990,7 +1042,7 @@ static void recv_generator(char *fname,
+@@ -999,7 +1051,7 @@ static void recv_generator(char *fname,
}
}
if (preserve_hard_links && file->link_u.links
itemizing, code, HL_SKIP))
return;
if (do_symlink(file->u.link,fname) != 0) {
-@@ -999,7 +1051,7 @@ static void recv_generator(char *fname,
+@@ -1008,7 +1060,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
-@@ -1033,18 +1085,22 @@ static void recv_generator(char *fname,
+@@ -1042,18 +1094,22 @@ static void recv_generator(char *fname,
itemizing = code = 0;
}
}
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && statret == 0)
-+ get_acls(fname, &sx);
++ get_acl(fname, &sx);
+#endif
if (statret != 0
- || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-@@ -1057,7 +1113,7 @@ static void recv_generator(char *fname,
+@@ -1066,7 +1122,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose)
-@@ -1069,12 +1125,12 @@ static void recv_generator(char *fname,
+@@ -1078,12 +1134,12 @@ static void recv_generator(char *fname,
}
} else {
if (itemizing)
}
if (!S_ISREG(file->mode)) {
-@@ -1108,7 +1164,7 @@ static void recv_generator(char *fname,
+@@ -1117,7 +1173,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
-@@ -1117,18 +1173,18 @@ static void recv_generator(char *fname,
+@@ -1126,18 +1182,18 @@ static void recv_generator(char *fname,
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
if (j != -1) {
fnamecmp = fnamecmpbuf;
fnamecmp_type = j;
-@@ -1137,7 +1193,7 @@ static void recv_generator(char *fname,
+@@ -1146,7 +1202,7 @@ static void recv_generator(char *fname,
}
real_ret = statret;
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
-@@ -1156,7 +1212,7 @@ static void recv_generator(char *fname,
+@@ -1165,7 +1221,7 @@ static void recv_generator(char *fname,
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
-@@ -1165,7 +1221,7 @@ static void recv_generator(char *fname,
+@@ -1174,7 +1230,7 @@ static void recv_generator(char *fname,
if (statret != 0) {
if (preserve_hard_links && file->link_u.links
itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
-@@ -1175,31 +1231,44 @@ static void recv_generator(char *fname,
+@@ -1184,31 +1240,44 @@ static void recv_generator(char *fname,
return;
}
- itemize(file, ndx, real_ret, &real_st,
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && real_ret == 0)
-+ get_acls(fname, &real_sx);
++ get_acl(fname, &real_sx);
+#endif
+ itemize(file, ndx, real_ret, &real_sx,
0, 0, NULL);
+ sx.acc_acl = real_sx.acc_acl;
+ sx.def_acl = real_sx.def_acl;
+ } else
-+ free_acls(&real_sx);
++ free_acl(&real_sx);
+ }
+#endif
}
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -1223,17 +1292,21 @@ static void recv_generator(char *fname,
+@@ -1232,17 +1301,21 @@ static void recv_generator(char *fname,
pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && file->link_u.links
statret = real_ret = -1;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && ACL_READY(sx))
-+ free_acls(&sx);
++ free_acl(&sx);
+#endif
goto notify_others;
}
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -1244,7 +1317,7 @@ static void recv_generator(char *fname,
+@@ -1253,7 +1326,7 @@ static void recv_generator(char *fname,
full_fname(backupptr));
free(back_file);
close(fd);
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -1252,14 +1325,14 @@ static void recv_generator(char *fname,
+@@ -1261,14 +1334,14 @@ static void recv_generator(char *fname,
full_fname(backupptr));
free(back_file);
close(fd);
}
if (verbose > 2)
-@@ -1277,24 +1350,32 @@ static void recv_generator(char *fname,
+@@ -1286,24 +1359,32 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
- itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && real_ret == 0)
-+ get_acls(fname, &real_sx);
++ get_acl(fname, &real_sx);
+#endif
+ itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
fuzzy_file ? fuzzy_file->basename : NULL);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ free_acls(&real_sx);
++ free_acl(&real_sx);
+#endif
}
if (f_copy >= 0) {
close(f_copy);
-@@ -1307,6 +1388,13 @@ static void recv_generator(char *fname,
+@@ -1316,6 +1397,13 @@ static void recv_generator(char *fname,
}
close(fd);
+ cleanup:
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ free_acls(&sx);
++ free_acl(&sx);
+#endif
+ return;
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1366,6 +1454,8 @@ void generate_files(int f_out, struct fi
+@@ -1375,6 +1463,8 @@ void generate_files(int f_out, struct fi
* notice that and let us know via the redo pipe (or its closing). */
ignore_timeout = 1;
- itemize(file, ndx, statret, st,
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !ACL_READY(*sxp))
-+ get_acls(fname, sxp);
++ get_acl(fname, sxp);
+#endif
+ itemize(file, ndx, statret, sxp,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+ sxp->st = st3;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ get_acls(cmpbuf, sxp);
++ get_acl(cmpbuf, sxp);
+#endif
+ if (unchanged_attrs(file, sxp))
break;
- itemize(file, ndx, statret, st,
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
-+ get_acls(fname, sxp);
++ get_acl(fname, sxp);
+#endif
+ itemize(file, ndx, statret, sxp,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
+ hlink1, &st, itemizing, code);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ free_acls(&sx);
++ free_acl(&sx);
+#endif
file->F_HLINDEX = FINISHED_LINK;
} while (!(file->flags & FLAG_HLINK_EOL));
+}
--- old/lib/sysacls.h
+++ new/lib/sysacls.h
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,33 @@
++#if defined SUPPORT_ACLS && defined HAVE_SYS_ACL_H
++#include <sys/acl.h>
++#endif
++#include "smb_acls.h"
++
+#define SMB_MALLOC(cnt) new_array(char, cnt)
+#define SMB_MALLOC_P(obj) new_array(obj, 1)
+#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
--- old/log.c
+++ new/log.c
-@@ -603,8 +603,10 @@ static void log_formatted(enum logcode c
+@@ -600,8 +600,10 @@ static void log_formatted(enum logcode c
n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
- if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !ACL_READY(*sxp))
-+ get_acls(fname, sxp);
++ get_acl(fname, sxp);
+#endif
+
+ if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
}
+#ifdef SUPPORT_ACLS
-+ /* It's OK to call set_acls() now, even for a dir, as the generator
++ /* It's OK to call set_acl() now, even for a dir, as the generator
+ * will enable owner-writability using chmod, if necessary.
+ *
-+ * If set_acl changes permission bits in the process of setting
++ * If set_acl() changes permission bits in the process of setting
+ * an access ACL, it changes sxp->st.st_mode so we know whether we
-+ * need to chmod. */
-+ if (preserve_acls && set_acls(fname, file, sxp) == 0)
++ * need to chmod(). */
++ if (preserve_acls && set_acl(fname, file, sxp) == 0)
+ updated = 1;
+#endif
+
+ cleanup:
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && sxp == &sx2)
-+ free_acls(&sx2);
++ free_acl(&sx2);
+#endif
return updated;
}
#define GID_NONE ((gid_t)-1)
#define HL_CHECK_MASTER 0
-@@ -660,6 +669,21 @@ struct chmod_mode_struct;
+@@ -645,6 +654,17 @@ struct stats {
- #define UNUSED(x) x __attribute__((__unused__))
+ struct chmod_mode_struct;
-+#if defined SUPPORT_ACLS && defined HAVE_SYS_ACL_H
-+#include <sys/acl.h>
-+#endif
-+#include "smb_acls.h"
++#define EMPTY_ITEM_LIST {NULL, 0, 0}
+
++typedef struct {
++ void *items;
++ size_t count;
++ size_t malloced;
++} item_list;
++
++#define EXPAND_ITEM_LIST(lp, type, incr) \
++ (type*)expand_item_list(lp, sizeof (type), #type, incr)
++
+ #include "byteorder.h"
+ #include "lib/mdfour.h"
+ #include "lib/wildmatch.h"
+@@ -660,6 +680,16 @@ struct chmod_mode_struct;
+
+ #define UNUSED(x) x __attribute__((__unused__))
+
+typedef struct {
+ STRUCT_STAT st;
+#ifdef SUPPORT_ACLS
+
+#endif /* No ACLs. */
+#endif /* _SMB_ACLS_H */
+--- old/t_stub.c
++++ new/t_stub.c
+@@ -79,3 +79,7 @@ struct filter_list_struct server_filter_
+ return NULL;
+ }
+
++ const char *who_am_i(void)
++{
++ return "test";
++}
--- old/testsuite/acls.test
+++ new/testsuite/acls.test
@@ -0,0 +1,34 @@
/* Now convert all the uids/gids from sender values to our values. */
if (am_root && preserve_uid && !numeric_ids) {
for (i = 0; i < flist->count; i++)
+--- old/util.c
++++ new/util.c
+@@ -1515,3 +1515,31 @@ int bitbag_next_bit(struct bitbag *bb, i
+
+ return -1;
+ }
++
++void *expand_item_list(item_list *lp, size_t item_size,
++ const char *desc, int incr)
++{
++ /* First time through, 0 <= 0, so list is expanded. */
++ if (lp->malloced <= lp->count) {
++ void *new_ptr;
++ size_t new_size = lp->malloced;
++ if (incr < 0)
++ new_size -= incr; /* increase slowly */
++ else if (new_size < (size_t)incr)
++ new_size += incr;
++ else
++ new_size *= 2;
++ new_ptr = realloc_array(lp->items, char, new_size * item_size);
++ if (verbose >= 4) {
++ rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
++ who_am_i(), desc, (double)new_size * item_size,
++ new_ptr == lp->items ? " not" : "");
++ }
++ if (!new_ptr)
++ out_of_memory("expand_item_list");
++
++ lp->items = new_ptr;
++ lp->malloced = new_size;
++ }
++ return (char*)lp->items + (lp->count++ * item_size);
++}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff