On 2024-11-11 07:58, Paul Eggert wrote:
For the Cygwin issue, I am easily confused
by "else" immediately followed by "#endif" or "#else" or "#elif", and so
installed the attached further patch which is merely a refactoring.
Come to think of it, we also should use acl_get_link_np later in that
same code segment too, so I installed the attached further patch.From a1615477559c4b93939b073b33f6d900d2fbed0c Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Mon, 11 Nov 2024 10:57:35 -0800
Subject: [PATCH] file-has-acl: another nofollow fix for FreeBSD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* lib/file-has-acl.c (file_has_aclinfo): On FreeBSD, NetBSD >= 10,
if we don’t follow symlinks the first time, also don’t follow
them the second time, when it is typically a directory - so it
doesn’t matter whether symlinks are followed - but it might not be.
---
ChangeLog | 6 ++++++
lib/file-has-acl.c | 23 +++++++++++------------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4a7b8a7c14..abeae1e6b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2024-11-11 Paul Eggert <egg...@cs.ucla.edu>
+ file-has-acl: another nofollow fix for FreeBSD
+ * lib/file-has-acl.c (file_has_aclinfo): On FreeBSD, NetBSD >= 10,
+ if we don’t follow symlinks the first time, also don’t follow
+ them the second time, when it is typically a directory - so it
+ doesn’t matter whether symlinks are followed - but it might not be.
+
file-has-acl: minor refactor of acl_get_link_np fix
* lib/file-has-acl.c (file_has_aclinfo): Redo to avoid ‘else #endif’.
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index 3cfff7ec75..7c29f20158 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -331,12 +331,11 @@ acl_nfs4_nontrivial (uint32_t *xattr, ssize_t nbytes)
Set *AI to ACL info regardless of return value.
FLAGS should be a <dirent.h> d_type value, optionally ORed with
- _GL_DT_NOTDIR if it is known that NAME is not a directory,
- - ACL_GET_SCONTEXT to retrieve extended attributes,
- - ACL_SYMLINK_FOLLOW to follow the link if NAME is a symbolic link.
+ - ACL_GET_SCONTEXT to retrieve security context and return 1 if present,
+ - ACL_SYMLINK_FOLLOW to follow the link if NAME is a symbolic link;
+ otherwise do not follow them if possible.
If the d_type value is not known, use DT_UNKNOWN though this may be less
- efficient.
- If FLAGS & ACL_SYMLINK_FOLLOW, follow symlinks when retrieving ACL info;
- otherwise do not follow them if possible. */
+ efficient. */
int
file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
struct aclinfo *restrict ai, int flags)
@@ -429,13 +428,13 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
else
ret = -1;
# else /* FreeBSD, NetBSD >= 10, IRIX, Tru64, Cygwin >= 2.5 */
-# if !HAVE_ACL_GET_LINK_NP /* IRIX, Tru64, Cygwin >= 2.5 */
-# define acl_get_link_np acl_get_file
+ acl_t (*acl_get_file_or_link) (char const *, acl_type_t) = acl_get_file;
+# if HAVE_ACL_GET_LINK_NP /* FreeBSD, NetBSD >= 10 */
+ if (! (flags & ACL_SYMLINK_FOLLOW))
+ acl_get_file_or_link = acl_get_link_np;
# endif
- acl_t acl = ((flags & AC_SYMLINK_FOLLOW
- ? acl_get_file
- : acl_get_link_np)
- (name, ACL_TYPE_ACCESS));
+
+ acl_t acl = acl_get_file_or_link (name, ACL_TYPE_ACCESS);
if (acl)
{
ret = acl_access_nontrivial (acl);
@@ -457,7 +456,7 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name,
&& (d_type == DT_DIR
|| (d_type == DT_UNKNOWN && !(flags & _GL_DT_NOTDIR))))
{
- acl = acl_get_file (name, ACL_TYPE_DEFAULT);
+ acl = acl_get_file_or_link (name, ACL_TYPE_DEFAULT);
if (acl)
{
# ifdef __CYGWIN__ /* Cygwin >= 2.5 */
--
2.43.0
