Fix reading side of fake-symlink bug 7109.

diff --git a/rsync.h b/rsync.h
index f55e2f79deefc3ef9d59576edba166424d15a03e..57e3d79d046f6860a22435008cb2178a4da9a075 100644 (file)
--- 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 eab25a552a4f9cc86dbef4f6c54b90c58397d336..c6c571a6adce78ecfa1db5e3f2eea8ba7c657331 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);
 }
 
-#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. */