From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 11 Nov 2024 18:55:19 +0000 (+0000)
Subject: ls: fix security context indication in --long mode
X-Git-Tag: v9.6~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00c45be7875e159b35ab6cd9fcfb2733fde95d41;p=thirdparty%2Fcoreutils.git

ls: fix security context indication in --long mode

* src/ls.c (gobble_file): Always get the security context with -l
so that we can indicate a context with '.' if present.
---

diff --git a/src/ls.c b/src/ls.c
index 6ff0f410f2..6422022d26 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -3501,8 +3501,9 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
   if ((format == long_format) | print_scontext | check_capability)
     {
       struct aclinfo ai;
+      bool get_scontext = (format == long_format) | print_scontext;
       int aclinfo_flags = ((do_deref ? ACL_SYMLINK_FOLLOW : 0)
-                           | (print_scontext ? ACL_GET_SCONTEXT : 0)
+                           | (get_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;