popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -0,0 +1,1080 @@
+@@ -0,0 +1,1093 @@
+/*
+ * Handle passing Access Control Lists between systems.
+ *
+{
+ 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;
+}
+
+
+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. */
++ * 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)
+{
+
+/* === 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_ITEM_LIST;
+ sort_ida_entries(&racl->groups);
+
+#ifdef ACLS_NEED_MASK
-+ if (!racl->users.count && !racl->groups.count) {
++ if (!racl->users.count && !racl->groups.count && racl->mask != NO_ENTRY) {
+ /* Throw away a superfluous mask, but mask off the
+ * group perms with it first. */
+ racl->group_obj &= racl->mask;
+ 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
+ return *match;
+}
+
-+/* 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;
-+
-+ 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, 1000);
-+ 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. */
++/* Return the Access Control List for the given filename. */
+int get_acl(const char *fname, statx *sxp)
+{
+ SMB_ACL_TYPE_T type;
+
+/* 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);
+ 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, 1000);
+ write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
+ 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. */
++ * 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;
+ 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_acl_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_acl_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)
+{
#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_
+@@ -491,6 +494,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;
OFF_T file_length;
char *basename, *dirname, *bp;
struct file_struct *file;
-@@ -602,13 +608,27 @@ static struct file_struct *receive_file_
+@@ -594,13 +600,27 @@ static struct file_struct *receive_file_
sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
file->modtime = modtime;
file->length = file_length;
-@@ -703,6 +723,11 @@ static struct file_struct *receive_file_
+@@ -693,6 +713,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 xtra_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 an ACL. */
-+ if (preserve_acls)
-+ xtra_len = (S_ISDIR(st.st_mode) ? 2 : 1) * 4;
-+ else
-+ xtra_len = 0;
-+#endif
-+
- alloc_len = file_struct_len + dirname_len + basename_len
-- + linkname_len + sum_len;
-+#ifdef SUPPORT_ACLS
-+ + xtra_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 += xtra_len;
-+#endif
-
- file->flags = flags;
- file->modtime = st.st_mtime;
-@@ -952,6 +994,9 @@ static struct file_struct *send_file_nam
+@@ -942,6 +967,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
+@@ -951,6 +979,15 @@ static struct file_struct *send_file_nam
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
-@@ -968,6 +1022,15 @@ static struct file_struct *send_file_nam
+@@ -958,6 +995,15 @@ static struct file_struct *send_file_nam
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f);
+ 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;
+@@ -617,7 +628,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
+@@ -625,16 +636,20 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
+#endif
+ if (!unchanged_attrs(file, sxp))
continue;
- if ((always_checksum || ignore_times)
+ if (always_checksum && preserve_times
- && 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
+@@ -651,14 +666,14 @@ static int try_dests_reg(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
match_level = 0;
}
- #ifdef HAVE_LINK
if (match_level == 3 && !copy_dest) {
+ #ifdef SUPPORT_HARD_LINKS
if (link_dest) {
- if (hard_link_one(file, ndx, fname, 0, stp,
+ if (hard_link_one(file, ndx, fname, 0, sxp,
cmpbuf, 1,
itemizing && verbose > 1,
code) < 0)
- goto try_a_copy;
- if (preserve_hard_links && file->link_u.links)
+@@ -667,8 +682,13 @@ static int try_dests_reg(struct file_str
hard_link_cluster(file, ndx, itemizing, code);
-- } else if (itemizing)
+ } else
+ #endif
+- if (itemizing)
- itemize(file, ndx, 0, stp, 0, 0, NULL);
-+ } else if (itemizing) {
++ if (itemizing) {
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !ACL_READY(*sxp))
+ get_acl(fname, sxp);
+ itemize(file, ndx, 0, sxp, 0, 0, NULL);
+ }
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code = daemon_log_format_has_i || dry_run
+ code = logfile_format_has_i || dry_run
? FCLIENT : FINFO;
-@@ -678,8 +698,13 @@ static int try_dests_reg(struct file_str
+@@ -686,8 +706,13 @@ static int try_dests_reg(struct file_str
}
return -1;
}
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
+@@ -712,13 +737,18 @@ static int try_dests_non(struct file_str
enum logcode code)
{
char fnamebuf[MAXPATHLEN];
continue;
if (S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
-@@ -723,10 +753,10 @@ static int try_dests_non(struct file_str
+@@ -731,10 +761,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
+@@ -765,7 +795,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;
+#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
+ code = logfile_format_has_i || dry_run
+@@ -779,6 +817,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,
+@@ -800,7 +839,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,
+@@ -851,6 +891,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,
+@@ -858,7 +901,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,
+@@ -870,6 +913,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,
+@@ -878,7 +925,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,
+@@ -896,8 +943,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,
+@@ -906,8 +954,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,
+@@ -916,7 +964,11 @@ static void recv_generator(char *fname,
dry_run++;
}
if (itemizing && f_out != -1) {
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,
+@@ -928,19 +980,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,
+@@ -958,7 +1010,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,
+@@ -966,10 +1018,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,
+@@ -982,9 +1034,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,
+@@ -1000,7 +1052,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,
+@@ -1009,7 +1061,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,
+@@ -1043,18 +1095,22 @@ static void recv_generator(char *fname,
itemizing = code = 0;
}
}
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-@@ -1057,7 +1113,7 @@ static void recv_generator(char *fname,
+@@ -1067,7 +1123,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,
+@@ -1079,12 +1135,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,
+@@ -1118,7 +1174,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,
+@@ -1127,18 +1183,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,
+@@ -1147,7 +1203,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,
+@@ -1166,7 +1222,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,
+@@ -1175,7 +1231,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,
+@@ -1185,31 +1241,44 @@ static void recv_generator(char *fname,
return;
}
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -1223,17 +1292,21 @@ static void recv_generator(char *fname,
+@@ -1233,17 +1302,21 @@ static void recv_generator(char *fname,
pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && file->link_u.links
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -1244,7 +1317,7 @@ static void recv_generator(char *fname,
+@@ -1254,7 +1327,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,
+@@ -1262,14 +1335,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,
+@@ -1287,24 +1360,32 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
if (f_copy >= 0) {
close(f_copy);
-@@ -1307,6 +1388,13 @@ static void recv_generator(char *fname,
+@@ -1317,6 +1398,13 @@ static void recv_generator(char *fname,
}
close(fd);
}
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
+@@ -1376,6 +1464,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;
+}
--- 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
+@@ -592,8 +592,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';
int preserve_perms = 0;
int preserve_executability = 0;
int preserve_devices = 0;
-@@ -194,6 +195,7 @@ static void print_rsync_version(enum log
+@@ -198,6 +199,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -210,6 +212,10 @@ static void print_rsync_version(enum log
+@@ -214,6 +216,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -223,9 +229,9 @@ static void print_rsync_version(enum log
+@@ -227,9 +233,9 @@ static void print_rsync_version(enum log
rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -295,6 +301,9 @@ void usage(enum logcode F)
+@@ -299,6 +305,9 @@ void usage(enum logcode F)
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -p, --perms preserve permissions\n");
rprintf(F," -E, --executability preserve the file's executability\n");
rprintf(F," --chmod=CHMOD change destination permissions\n");
rprintf(F," -o, --owner preserve owner (super-user only)\n");
rprintf(F," -g, --group preserve group\n");
-@@ -410,6 +419,9 @@ static struct poptOption long_options[]
+@@ -415,6 +424,9 @@ static struct poptOption long_options[]
{"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
-@@ -1070,6 +1082,24 @@ int parse_arguments(int *argc, const cha
+@@ -1080,6 +1092,24 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1504,6 +1534,10 @@ void server_options(char **args,int *arg
+@@ -1526,6 +1556,10 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_gid)
--- old/receiver.c
+++ new/receiver.c
-@@ -48,6 +48,7 @@ extern int keep_partial;
+@@ -47,6 +47,7 @@ extern int keep_partial;
extern int checksum_seed;
extern int inplace;
extern int delay_updates;
extern struct stats stats;
extern char *log_format;
extern char *tmpdir;
-@@ -346,6 +347,10 @@ int recv_files(int f_in, struct file_lis
- int itemizing = am_daemon ? daemon_log_format_has_i
- : !am_server && log_format_has_i;
+@@ -344,6 +345,10 @@ int recv_files(int f_in, struct file_lis
+ int save_make_backups = make_backups;
+ int itemizing = am_server ? logfile_format_has_i : log_format_has_i;
int max_phase = protocol_version >= 29 ? 2 : 1;
+ int dflt_perms = (ACCESSPERMS & ~orig_umask);
+#ifdef SUPPORT_ACLS
int i, recv_ok;
if (verbose > 2)
-@@ -543,7 +548,16 @@ int recv_files(int f_in, struct file_lis
+@@ -541,7 +546,16 @@ int recv_files(int f_in, struct file_lis
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = fd1 != -1;
@@ -33,6 +33,7 @@
extern int verbose;
extern int dry_run;
- extern int daemon_log_format_has_i;
+ extern int logfile_format_has_i;
+extern int preserve_acls;
extern int preserve_perms;
extern int preserve_executability;
--- old/rsync.h
+++ new/rsync.h
-@@ -485,6 +485,15 @@ struct idev {
+@@ -486,6 +486,15 @@ struct idev {
#define IN_LOOPBACKNET 127
#endif
#define GID_NONE ((gid_t)-1)
#define HL_CHECK_MASTER 0
-@@ -645,6 +654,17 @@ struct stats {
+@@ -646,6 +655,17 @@ struct stats {
struct chmod_mode_struct;
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -660,6 +680,21 @@ struct chmod_mode_struct;
+@@ -661,6 +681,16 @@ struct chmod_mode_struct;
#define UNUSED(x) x __attribute__((__unused__))
-+#if defined SUPPORT_ACLS && defined HAVE_SYS_ACL_H
-+#include <sys/acl.h>
-+#endif
-+#include "smb_acls.h"
-+
+typedef struct {
+ STRUCT_STAT st;
+#ifdef SUPPORT_ACLS
--chmod=CHMOD change destination permissions
-o, --owner preserve owner (super-user only)
-g, --group preserve group
-@@ -742,7 +743,9 @@ quote(itemize(
+@@ -744,7 +745,9 @@ quote(itemize(
permissions, though the bf(--executability) option might change just
the execute permission for the file.
it() New files get their "normal" permission bits set to the source
their special permission bits disabled except in the case where a new
directory inherits a setgid bit from its parent directory.
))
-@@ -773,9 +776,11 @@ The preservation of the destination's se
+@@ -775,9 +778,11 @@ The preservation of the destination's se
directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
versions erroneously preserved the three special permission bits for
newly-created files when bf(--perms) was off, while overriding the
dit(bf(-E, --executability)) This option causes rsync to preserve the
executability (or non-executability) of regular files when bf(--perms) is
-@@ -793,6 +798,15 @@ quote(itemize(
+@@ -795,6 +800,15 @@ quote(itemize(
If bf(--perms) is enabled, this option is ignored.
dit(bf(--chmod)) This option tells rsync to apply one or more
comma-separated "chmod" strings to the permission of the files in the
transfer. The resulting value is treated as though it was the permissions
-@@ -1372,8 +1386,8 @@ if the receiving rsync is at least versi
+@@ -1376,8 +1390,8 @@ if the receiving rsync is at least versi
with older versions of rsync, but that also turns on the output of other
verbose messages).
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1422,7 +1436,11 @@ quote(itemize(
+@@ -1426,7 +1440,11 @@ quote(itemize(
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).
+#endif /* _SMB_ACLS_H */
--- old/t_stub.c
+++ new/t_stub.c
-@@ -78,3 +78,7 @@ struct filter_list_struct server_filter_
+@@ -79,3 +79,7 @@ struct filter_list_struct server_filter_
return NULL;
}
for (i = 0; i < flist->count; i++)
--- old/util.c
+++ new/util.c
-@@ -1446,3 +1446,31 @@ int bitbag_next_bit(struct bitbag *bb, i
+@@ -1555,3 +1555,31 @@ int bitbag_next_bit(struct bitbag *bb, i
return -1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff