X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/af7eb67accc33f120054901cc7608bf4666c0c54..21158bc6b52ad39e5fb0e7ff29d463ff8a9ce737:/acls.diff diff --git a/acls.diff b/acls.diff index d9e1fef..dc1ab65 100644 --- a/acls.diff +++ b/acls.diff @@ -1317,7 +1317,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. --- 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; @@ -1325,7 +1325,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. 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); @@ -1334,7 +1334,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. #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; @@ -1344,7 +1344,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. 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; @@ -1372,7 +1372,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. file->modtime = modtime; file->length = file_length; -@@ -701,6 +721,11 @@ static struct file_struct *receive_file_ +@@ -694,6 +714,11 @@ static struct file_struct *receive_file_ read_buf(f, sum, checksum_len); } @@ -1384,7 +1384,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. return file; } -@@ -950,6 +975,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; @@ -1394,7 +1394,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. file = make_file(fname, flist, stp, flags, f == -2 ? SERVER_FILTERS : ALL_FILTERS); -@@ -959,6 +987,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); @@ -1410,7 +1410,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. maybe_emit_filelist_progress(flist->count + flist_count_offset); flist_expand(flist); -@@ -966,6 +1003,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); @@ -1436,7 +1436,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern int preserve_links; extern int preserve_devices; extern int preserve_specials; -@@ -87,6 +88,7 @@ extern long block_size; /* "long" becaus +@@ -85,6 +86,7 @@ extern long block_size; /* "long" becaus extern int max_delete; extern int force_delete; extern int one_file_system; @@ -1444,7 +1444,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern struct stats stats; extern dev_t filesystem_dev; extern char *backup_dir; -@@ -319,22 +321,27 @@ static void do_delete_pass(struct file_l +@@ -317,22 +319,27 @@ static void do_delete_pass(struct file_l rprintf(FINFO, " \r"); } @@ -1477,7 +1477,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. int32 iflags, uchar fnamecmp_type, char *xname) { if (statret >= 0) { /* A from-dest-dir statret can == 1! */ -@@ -342,19 +349,23 @@ void itemize(struct file_struct *file, i +@@ -340,19 +347,23 @@ void itemize(struct file_struct *file, i : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode); @@ -1506,7 +1506,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } else iflags |= ITEM_IS_NEW; -@@ -605,7 +616,7 @@ void check_for_finished_hlinks(int itemi +@@ -603,7 +614,7 @@ void check_for_finished_hlinks(int itemi * handling the file, -1 if no dest-linking occurred, or a non-negative * value if we found an alternate basis file. */ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, @@ -1515,7 +1515,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. int maybe_ATTRS_REPORT, enum logcode code) { int save_ignore_times = ignore_times; -@@ -620,7 +631,7 @@ static int try_dests_reg(struct file_str +@@ -618,7 +629,7 @@ static int try_dests_reg(struct file_str do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); @@ -1524,7 +1524,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; switch (match_level) { case 0: -@@ -628,16 +639,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: @@ -1548,7 +1548,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; best_match = j; match_level = 3; -@@ -655,22 +670,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); @@ -1580,7 +1580,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (verbose > 1 && maybe_ATTRS_REPORT) { code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; -@@ -689,8 +709,13 @@ static int try_dests_reg(struct file_str +@@ -687,8 +707,13 @@ static int try_dests_reg(struct file_str } return -1; } @@ -1596,7 +1596,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. set_file_attrs(fname, file, NULL, 0); if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) -@@ -715,13 +740,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]; @@ -1618,7 +1618,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; if (S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS -@@ -734,10 +764,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)) { @@ -1631,7 +1631,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; } else { rprintf(FERROR, -@@ -766,7 +796,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; @@ -1648,7 +1648,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (verbose > 1 && maybe_ATTRS_REPORT) { code = daemon_log_format_has_i || dry_run -@@ -780,6 +818,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; @@ -1656,7 +1656,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. /* 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 -@@ -801,7 +840,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; @@ -1666,7 +1666,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. struct file_struct *back_file = NULL; int statret, real_ret, stat_errno; char *fnamecmp, *partialptr, *backupptr = NULL; -@@ -852,6 +892,9 @@ static void recv_generator(char *fname, +@@ -850,6 +890,9 @@ static void recv_generator(char *fname, dry_run--; missing_below = -1; } @@ -1676,16 +1676,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (dry_run > 1) { statret = -1; stat_errno = ENOENT; -@@ -859,7 +902,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", -@@ -871,6 +914,10 @@ static void recv_generator(char *fname, +@@ -869,6 +912,10 @@ static void recv_generator(char *fname, } if (fuzzy_basis) need_fuzzy_dirlist = 1; @@ -1696,7 +1696,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } parent_dirname = dn; -@@ -879,7 +926,7 @@ static void recv_generator(char *fname, +@@ -877,7 +924,7 @@ static void recv_generator(char *fname, need_fuzzy_dirlist = 0; } @@ -1705,7 +1705,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. keep_dirlinks && S_ISDIR(file->mode)); stat_errno = errno; } -@@ -897,8 +944,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 @@ -1717,7 +1717,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (S_ISDIR(file->mode)) { -@@ -907,8 +955,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. */ @@ -1728,7 +1728,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. return; statret = -1; } -@@ -917,7 +965,11 @@ static void recv_generator(char *fname, +@@ -915,7 +963,11 @@ static void recv_generator(char *fname, dry_run++; } if (itemizing && f_out != -1) { @@ -1741,7 +1741,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { -@@ -929,19 +981,19 @@ static void recv_generator(char *fname, +@@ -927,19 +979,19 @@ static void recv_generator(char *fname, full_fname(fname)); } } @@ -1766,7 +1766,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (preserve_links && S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS -@@ -963,7 +1015,7 @@ static void recv_generator(char *fname, +@@ -957,7 +1009,7 @@ static void recv_generator(char *fname, char lnk[MAXPATHLEN]; int len; @@ -1775,7 +1775,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) { lnk[len] = 0; /* A link already pointing to the -@@ -971,10 +1023,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) { @@ -1788,7 +1788,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) { -@@ -987,9 +1039,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. */ @@ -1800,7 +1800,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret = -1; } else if (basis_dir[0] != NULL) { if (try_dests_non(file, fname, ndx, itemizing, -@@ -1005,7 +1057,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 @@ -1809,7 +1809,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. itemizing, code, HL_SKIP)) return; if (do_symlink(file->u.link,fname) != 0) { -@@ -1014,7 +1066,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) { @@ -1818,7 +1818,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) { -@@ -1048,18 +1100,22 @@ static void recv_generator(char *fname, +@@ -1042,18 +1094,22 @@ static void recv_generator(char *fname, itemizing = code = 0; } } @@ -1849,7 +1849,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret = -1; if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", -@@ -1072,7 +1128,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) { @@ -1858,7 +1858,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) -@@ -1084,12 +1140,12 @@ static void recv_generator(char *fname, +@@ -1078,12 +1134,12 @@ static void recv_generator(char *fname, } } else { if (itemizing) @@ -1874,7 +1874,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (!S_ISREG(file->mode)) { -@@ -1123,7 +1179,7 @@ static void recv_generator(char *fname, +@@ -1117,7 +1173,7 @@ static void recv_generator(char *fname, } if (update_only && statret == 0 @@ -1883,7 +1883,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (verbose > 1) rprintf(FINFO, "%s is newer\n", fname); return; -@@ -1132,18 +1188,18 @@ static void recv_generator(char *fname, +@@ -1126,18 +1182,18 @@ static void recv_generator(char *fname, fnamecmp = fname; fnamecmp_type = FNAMECMP_FNAME; @@ -1906,7 +1906,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (j != -1) { fnamecmp = fnamecmpbuf; fnamecmp_type = j; -@@ -1152,7 +1208,7 @@ static void recv_generator(char *fname, +@@ -1146,7 +1202,7 @@ static void recv_generator(char *fname, } real_ret = statret; @@ -1915,7 +1915,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL && link_stat(partialptr, &partial_st, 0) == 0 -@@ -1171,7 +1227,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); } @@ -1924,7 +1924,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret = 0; fnamecmp = fnamecmpbuf; fnamecmp_type = FNAMECMP_FUZZY; -@@ -1180,7 +1236,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 @@ -1933,7 +1933,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. itemizing, code, HL_SKIP)) return; if (stat_errno == ENOENT) -@@ -1190,31 +1246,44 @@ static void recv_generator(char *fname, +@@ -1184,31 +1240,44 @@ static void recv_generator(char *fname, return; } @@ -1984,7 +1984,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. fnamecmp = partialptr; fnamecmp_type = FNAMECMP_PARTIAL_DIR; statret = 0; -@@ -1238,17 +1307,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 @@ -2009,7 +2009,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) { close(fd); -@@ -1259,7 +1332,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); @@ -2018,7 +2018,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { -@@ -1267,14 +1340,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); @@ -2035,7 +2035,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (verbose > 2) -@@ -1292,24 +1365,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; @@ -2073,7 +2073,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (f_copy >= 0) { close(f_copy); -@@ -1322,6 +1403,13 @@ static void recv_generator(char *fname, +@@ -1316,6 +1397,13 @@ static void recv_generator(char *fname, } close(fd); @@ -2087,7 +2087,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } void generate_files(int f_out, struct file_list *flist, char *local_name) -@@ -1381,6 +1469,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; @@ -5510,7 +5510,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. +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'; @@ -6262,7 +6262,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. +#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; } @@ -6706,7 +6706,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. 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 +@@ -1515,3 +1515,31 @@ int bitbag_next_bit(struct bitbag *bb, i return -1; }