- *p = '/';
-@@ -190,6 +191,7 @@ static int keep_backup(char *fname)
- return 0;
-
- PUSH_KEEP_BACKUP_ACL(file, fname, buf);
-+ PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
-
- /* Check to see if this is a device file, or link */
- if ((am_root && preserve_devices && IS_DEVICE(file->mode))
-@@ -267,6 +269,7 @@ static int keep_backup(char *fname)
- }
- set_file_attrs(buf, file, NULL, 0);
- CLEANUP_KEEP_BACKUP_ACL();
-+ CLEANUP_KEEP_BACKUP_XATTR();
- free(file);
-
- if (verbose > 1) {
---- old/configure.in
-+++ new/configure.in
-@@ -810,6 +810,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
- AC_MSG_RESULT(no)
- )
-
-+AC_CHECK_HEADERS(attr/xattr.h)
-+AC_MSG_CHECKING(whether to support extended attributes)
-+AC_ARG_ENABLE(xattr-support,
-+AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
-+[ case "$enableval" in
-+ yes)
-+ case "$host_os" in
-+ *linux*)
-+ AC_MSG_RESULT(Using Linux xattrs)
-+ AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
-+ ;;
-+ *)
-+ AC_MSG_RESULT(Xattrs requested but not linux. Good luck)
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ AC_DEFINE(HAVE_NA_XATTRS, 1, [True if you don't have extended attributes])
-+ esac ],
-+ AC_MSG_RESULT(no)
-+ AC_DEFINE(HAVE_NO_XATTRL, 1, [True if you don't have extended attributes])
-+)
-+
- AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
- AC_OUTPUT
-
---- old/flist.c
-+++ new/flist.c
-@@ -969,6 +969,8 @@ static struct file_struct *send_file_nam
- return NULL;
- if (MAKE_ACL(file, fname) < 0)
- return NULL;
-+ if (MAKE_XATTR(file, fname) < 0)
-+ return NULL;
-
- if (chmod_modes && !S_ISLNK(file->mode))
- file->mode = tweak_mode(file->mode, chmod_modes);
-@@ -981,9 +983,11 @@ static struct file_struct *send_file_nam
- flist->files[flist->count++] = file;
- send_file_entry(file, f);
- SEND_ACL(file, f);
-+ SEND_XATTR(file, f);
- } else {
- /* Cleanup unsent ACL(s). */
- SEND_ACL(file, -1);
-+ SEND_XATTR(file, -1);
- }
- return file;
- }
-@@ -1373,6 +1377,7 @@ struct file_list *recv_file_list(int f)
- file = receive_file_entry(flist, flags, f);
-
- RECEIVE_ACL(file, f);
-+ RECEIVE_XATTR(file, f );
-
- if (S_ISREG(file->mode))
- stats.total_size += file->length;
-@@ -1397,6 +1402,7 @@ struct file_list *recv_file_list(int f)
- clean_flist(flist, relative_paths, 1);
-
- SORT_FILE_ACL_INDEX_LISTS();
-+ SORT_FILE_XATTR_INDEX_LISTS();
-
- if (f >= 0) {
- recv_uid_list(f, flist);
---- old/generator.c
-+++ new/generator.c
-@@ -908,6 +908,10 @@ static void recv_generator(char *fname,
- if (f_out == -1)
- SET_ACL(fname, file);
- #endif
-+#ifdef SUPPORT_XATTRS
-+ if (f_out == -1)
-+ SET_XATTR(fname, file);
-+#endif
- if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file, &st);
---- old/lib/sysxattr.c
-+++ new/lib/sysxattr.c
-@@ -0,0 +1,41 @@
-+/* Extended attribute support for rsync. */
-+/* This file Copyright (C) 2004 Red Hat, Inc. */
-+/* Written by Jay Fenlason */
-+
-+/* This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#include "rsync.h"
-+
-+#if defined(HAVE_LINUX_XATTRS)
-+
-+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
-+{
-+ return lgetxattr(path, name, value, size);
-+}
-+
-+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
-+{
-+ return lsetxattr(path, name, value, size, flags);
-+}
-+
-+ssize_t sys_llistxattr(const char *path, char *list, size_t size)
-+{
-+ return llistxattr(path, list, size);
-+}
-+
-+#else
-+
-+#endif /* No xattrs */
---- old/lib/sysxattr.h
-+++ new/lib/sysxattr.h
-@@ -0,0 +1,9 @@
-+#if defined(HAVE_LINUX_XATTRS)
-+
-+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
-+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags);
-+ssize_t sys_llistxattr(const char *path, char *list, size_t size);
-+
-+#else
-+
-+#endif /* No xattrs */
---- old/options.c
-+++ new/options.c
-@@ -45,6 +45,7 @@ int copy_links = 0;
- int preserve_links = 0;
- int preserve_hard_links = 0;
- int preserve_acls = 0;
-+int preserve_xattrs = 0;
- int preserve_perms = 0;
- int preserve_executability = 0;
- int preserve_devices = 0;
-@@ -195,6 +196,7 @@ static void print_rsync_version(enum log
- char const *have_inplace = "no ";
- char const *hardlinks = "no ";
- char const *acls = "no ";
-+ char const *xattrs = "no ";
- char const *links = "no ";
- char const *ipv6 = "no ";
- STRUCT_STAT *dumstat;
-@@ -214,7 +216,9 @@ static void print_rsync_version(enum log
- #ifdef SUPPORT_ACLS
- acls = "";
- #endif
--
-+#ifdef SUPPORT_XATTRS
-+ xattrs = "";
-+#endif
- #ifdef SUPPORT_LINKS
- links = "";
- #endif
-@@ -228,9 +232,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, "
-- "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
-+ "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles,\n",
- (int) (sizeof (OFF_T) * 8),
-- got_socketpair, hardlinks, acls, links);
-+ got_socketpair, hardlinks, acls, xattrs, links);
-
- /* Note that this field may not have type ino_t. It depends
- * on the complicated interaction between largefile feature
-@@ -302,6 +306,9 @@ void usage(enum logcode F)
- #ifdef SUPPORT_ACLS
- rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
- #endif
-+#ifdef SUPPORT_XATTRS
-+ rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
-+#endif
- 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");
-@@ -421,6 +428,9 @@ static struct poptOption long_options[]
- {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
- {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
- {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
-+ {"xattrs", 'X', POPT_ARG_NONE, 0, 'X', 0, 0 },
-+ {"no-xattrs", 0, POPT_ARG_VAL, &preserve_xattrs, 0, 0, 0 },
-+ {"no-X", 0, POPT_ARG_VAL, &preserve_xattrs, 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 },
-@@ -1085,6 +1095,17 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
-
-+ case 'X':
-+#ifdef SUPPORT_XATTRS
-+ preserve_xattrs = 1;
-+ preserve_perms = 1;
-+ break;
-+#else
-+ snprintf(err_buf,sizeof(err_buf),
-+ "extended attributes are not supported on this %s\n",
-+ am_server ? "server" : "client");
-+ return 0;
-+#endif /* SUPPORT_XATTRS */
-
- default:
- /* A large opt value means that set_refuse_options()
-@@ -1530,6 +1551,10 @@ void server_options(char **args,int *arg
- if (preserve_acls)
- argstr[x++] = 'A';
- #endif
-+#ifdef SUPPORT_XATTRS
-+ if (preserve_xattrs)
-+ argstr[x++] = 'X';
-+#endif
- if (preserve_uid)
- argstr[x++] = 'o';
- if (preserve_gid)
---- old/rsync.c
-+++ new/rsync.c
-@@ -206,12 +206,15 @@ int set_file_attrs(char *fname, struct f
- }
- #endif
-
-- /* If this is a directory, SET_ACL() will be called on the cleanup
-- * receive_generator() pass (if we called it here, we might clobber
-- * writability on the directory). Everything else is OK to do now. */
-+ /* If this is a directory, SET_ACL() and/or SET_XATTR() will be called
-+ * on the cleanup receive_generator() pass -- if we called it here, we
-+ * might clobber writability on the dir (SELinux security contexts are
-+ * stored in xattrs). Everything else is OK to do now. */
- if (!S_ISDIR(st->st_mode)) {
- if (SET_ACL(fname, file) == 0)
- updated = 1;
-+ if (SET_XATTR(fname, file) == 0)
-+ updated = 1;