From 7f8e973e9f056eccd959bbea801ed7ceca68f145 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 13 Oct 2006 06:53:59 +0000 Subject: [PATCH] Fixed a failing hunk. --- acls.diff | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/acls.diff b/acls.diff index ca83dc4..b7ea4a3 100644 --- a/acls.diff +++ b/acls.diff @@ -5518,7 +5518,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 -@@ -609,8 +609,10 @@ static void log_formatted(enum logcode c +@@ -607,8 +607,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'; @@ -5531,17 +5531,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; ---- old/mkproto.awk -+++ new/mkproto.awk -@@ -58,7 +58,7 @@ BEGIN { - next; - } - --!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ { -+!/^OFF_T|^size_t|^off_t|^pid_t|^id_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ { - next; - } - --- old/options.c +++ new/options.c @@ -47,6 +47,7 @@ int copy_dirlinks = 0; @@ -5612,7 +5601,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. {"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 }, -@@ -1084,6 +1096,24 @@ int parse_arguments(int *argc, const cha +@@ -1082,6 +1094,24 @@ int parse_arguments(int *argc, const cha usage(FINFO); exit_cleanup(0); @@ -5637,7 +5626,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1529,6 +1559,10 @@ void server_options(char **args,int *arg +@@ -1523,6 +1553,10 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -5940,7 +5929,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. -o, --owner preserve owner (super-user only) -g, --group preserve group --devices preserve device files (super-user only) -@@ -747,7 +748,9 @@ quote(itemize( +@@ -745,7 +746,9 @@ quote(itemization( 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 @@ -5951,7 +5940,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. their special permission bits disabled except in the case where a new directory inherits a setgid bit from its parent directory. )) -@@ -778,9 +781,11 @@ The preservation of the destination's se +@@ -776,9 +779,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 @@ -5966,7 +5955,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. dit(bf(-E, --executability)) This option causes rsync to preserve the executability (or non-executability) of regular files when bf(--perms) is -@@ -798,6 +803,15 @@ quote(itemize( +@@ -796,6 +801,15 @@ quote(itemization( If bf(--perms) is enabled, this option is ignored. @@ -5982,7 +5971,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. 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 -@@ -1383,8 +1397,8 @@ if the receiving rsync is at least versi +@@ -1381,8 +1395,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). @@ -5993,7 +5982,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. 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. -@@ -1433,7 +1447,11 @@ quote(itemize( +@@ -1431,7 +1445,11 @@ quote(itemization( 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). @@ -6743,7 +6732,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 -@@ -1550,3 +1550,31 @@ int bitbag_next_bit(struct bitbag *bb, i +@@ -1468,3 +1468,31 @@ int bitbag_next_bit(struct bitbag *bb, i return -1; } -- 2.34.1