From rsync-cvs at lists.samba.org Thu Jun 14 22:23:21 2018 From: rsync-cvs at lists.samba.org (Rsync CVS commit messages) Date: Fri, 15 Jun 2018 00:23:21 +0200 (CEST) Subject: [SCM] The rsync repository. - branch master updated Message-ID: The branch, master has been updated via 1eb7a70 Need to mark xattr rules in get_rule_prefix(). from eec6ab7 Avoid a compiler error/warning about shifting a negative value. Fixes bug #13268. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1eb7a7061af2f91149233937f3db066d303c7684 Author: Wayne Davison Date: Thu Jun 14 15:19:34 2018 -0700 Need to mark xattr rules in get_rule_prefix(). This fixes the bug of xattr filters getting sent as a normal filter rule (since the 'x' was dropped in the prefix). ----------------------------------------------------------------------- Summary of changes: NEWS | 2 ++ exclude.c | 2 ++ 2 files changed, 4 insertions(+) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 792df23..1bcdba7 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ Changes since 3.1.3: BUG FIXES: + - Fix xattr filter rules losing an 'x' attribute in a non-local transfer. + - Fix a compiler error/warning about shifting a negative value (in the zlib code). diff --git a/exclude.c b/exclude.c index 7989fb3..a0090b2 100644 --- a/exclude.c +++ b/exclude.c @@ -1286,6 +1286,8 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer, } if (rule->rflags & FILTRULE_EXCLUDE_SELF) *op++ = 'e'; + if (rule->rflags & FILTRULE_XATTR) + *op++ = 'x'; if (rule->rflags & FILTRULE_SENDER_SIDE && (!for_xfer || protocol_version >= 29)) *op++ = 's'; -- The rsync repository.