From: Wayne Davison <wayned@samba.org>
Date: Sat, 18 Jun 2011 20:42:30 +0000 (-0700)
Subject: Fix reading side of fake-symlink bug 7109.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/a59a7b242393699fedeb4f66911e3fc9b4fadd73

Fix reading side of fake-symlink bug 7109.
---

diff --git a/rsync.h b/rsync.h
index f55e2f79..57e3d79d 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 eab25a55..c6c571a6 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. */