[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  a59a7b2 Fix reading side of fake-symlink bug 7109.
      from  5bfe006 Make daemon-exclude errors more error-like. Fixes bug 7765.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a59a7b242393699fedeb4f66911e3fc9b4fadd73
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Jun 18 13:42:30 2011 -0700

    Fix reading side of fake-symlink bug 7109.

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

Summary of changes:
 rsync.h   |    2 +-
 syscall.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/rsync.h b/rsync.h
index f55e2f7..57e3d79 100644
--- a/rsync.h
+++ b/rsync.h
@@ -1044,7 +1044,7 @@ extern int errno;
 
 #ifdef HAVE_READLINK
 #define SUPPORT_LINKS 1
-#ifndef NO_SYMLINK_XATTRS
+#if !defined NO_SYMLINK_XATTRS && !defined NO_SYMLINK_USER_XATTRS
 #define do_readlink(path, buf, bufsiz) readlink(path, buf, bufsiz)
 #endif
 #endif
diff --git a/syscall.c b/syscall.c
index eab25a5..c6c571a 100644
--- a/syscall.c
+++ b/syscall.c
@@ -82,7 +82,7 @@ int do_symlink(const char *lnk, const char *fname)
 	return symlink(lnk, fname);
 }
 
-#ifdef NO_SYMLINK_XATTRS
+#if defined NO_SYMLINK_XATTRS || defined NO_SYMLINK_USER_XATTRS
 ssize_t do_readlink(const char *path, char *buf, size_t bufsiz)
 {
 	/* For --fake-super, we read the link from the file. */


-- 
The rsync repository.