Fix reading side of fake-symlink bug 7109.

diff --git a/rsync.h b/rsync.h
index f55e2f7..57e3d79 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -1044,7 +1044,7 @@ extern int errno;
 
 #ifdef HAVE_READLINK
 #define SUPPORT_LINKS 1
 
 #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
 #define do_readlink(path, buf, bufsiz) readlink(path, buf, bufsiz)
 #endif
 #endif

diff --git a/syscall.c b/syscall.c
index eab25a5..c6c571a 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -82,7 +82,7 @@ int do_symlink(const char *lnk, const char *fname)
        return symlink(lnk, 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. */
 ssize_t do_readlink(const char *path, char *buf, size_t bufsiz)
 {
        /* For --fake-super, we read the link from the file. */