[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Sat Jun 18 12:28:41 MDT 2011


The branch, master has been updated
       via  e2c1e48 Set NO_SYMLINK_USER_XATTRS on linux. Fixes bug 7109.
      from  4591bb2 Only skip deletions on IOERR_GENERAL.  Fixes bug 7809.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e2c1e482e004b8f992156bf436d4bf34cee1ee1d
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Jun 18 10:12:47 2011 -0700

    Set NO_SYMLINK_USER_XATTRS on linux. Fixes bug 7109.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    1 +
 syscall.c    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/configure.ac b/configure.ac
index c261b4a..dfe3101 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1021,6 +1021,7 @@ else
 	AC_MSG_RESULT(Using Linux xattrs)
 	AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
 	AC_DEFINE(SUPPORT_XATTRS, 1)
+	AC_DEFINE(NO_SYMLINK_USER_XATTRS, 1, [True if symlinks do not support user xattrs])
 	;;
     darwin*)
 	AC_MSG_RESULT(Using OS X xattrs)
diff --git a/syscall.c b/syscall.c
index 1ed36f3..eab25a5 100644
--- a/syscall.c
+++ b/syscall.c
@@ -64,7 +64,7 @@ int do_symlink(const char *lnk, const char *fname)
 	if (dry_run) return 0;
 	RETURN_ERROR_IF_RO_OR_LO;
 
-#ifdef NO_SYMLINK_XATTRS
+#if defined NO_SYMLINK_XATTRS || defined NO_SYMLINK_USER_XATTRS
 	/* For --fake-super, we create a normal file with mode 0600
 	 * and write the lnk into it. */
 	if (am_root < 0) {


-- 
The rsync repository.


More information about the rsync-cvs mailing list