]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
build: update gnulib submodule to latest
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Nov 2024 16:52:12 +0000 (08:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Nov 2024 16:59:58 +0000 (08:59 -0800)
This also fixes a problem with ls -Z when configured with
--disable-acl, reported by Pádraig Brady
<https://bugs.gnu.org/73418#52>.
* src/ls.c (gobble_file): Pass ACL_GET_SCONTEXT to
file_has_aclinfo, if -Z is used.

gnulib
src/ls.c

diff --git a/gnulib b/gnulib
index ee0bc695303775da5026091a65e8ec2b764f4a26..6a018d0492239d01c2cc8fd56a1acec4d6fcd44d 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit ee0bc695303775da5026091a65e8ec2b764f4a26
+Subproject commit 6a018d0492239d01c2cc8fd56a1acec4d6fcd44d
index 317a641adcac99e2773c50c1648165c8f302e9e6..6ff0f410f29313f7591ea0ee692f605a719606a3 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -3501,9 +3501,10 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
   if ((format == long_format) | print_scontext | check_capability)
     {
       struct aclinfo ai;
-      int n = file_has_aclinfo_cache (full_name, f, &ai,
-                                      ((do_deref ? ACL_SYMLINK_FOLLOW : 0)
-                                       | filetype_d_type[type]));
+      int aclinfo_flags = ((do_deref ? ACL_SYMLINK_FOLLOW : 0)
+                           | (print_scontext ? ACL_GET_SCONTEXT : 0)
+                           | filetype_d_type[type]);
+      int n = file_has_aclinfo_cache (full_name, f, &ai, aclinfo_flags);
       bool have_acl = 0 < n;
       bool have_scontext = !ai.scontext_err;
       f->acl_type = (!have_scontext && !have_acl