From: Bruno Haible Date: Thu, 6 Jun 2024 05:01:00 +0000 (+0200) Subject: acl-permissions: Fix test-file-has-acl-2.sh failure on Cygwin. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=644fe1b3ef136edfb7e701bddc2fa73714cd9762;p=gnulib.git acl-permissions: Fix test-file-has-acl-2.sh failure on Cygwin. * lib/acl-internal.c (acl_access_nontrivial): On Cygwin, ignore also group:Users:* entries. --- diff --git a/ChangeLog b/ChangeLog index 3c932f4f73..d100238dbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-06-06 Bruno Haible + + acl-permissions: Fix test-file-has-acl-2.sh failure on Cygwin. + * lib/acl-internal.c (acl_access_nontrivial): On Cygwin, ignore also + group:Users:* entries. + 2024-06-05 Collin Funk gnulib-tool.py: Don't perform unnecessary configure.ac scanning. diff --git a/lib/acl-internal.c b/lib/acl-internal.c index 9ebb6e544b..ae5398306a 100644 --- a/lib/acl-internal.c +++ b/lib/acl-internal.c @@ -89,6 +89,14 @@ acl_access_nontrivial (acl_t acl) group:Administrators:rwx mask::r-x other::r-x + or + user::rwx + group::r-x + group:SYSTEM:rwx + group:Administrators:rwx + group:Users:rwx + mask::rwx + other::r-x */ case ACL_GROUP: { @@ -105,9 +113,12 @@ acl_access_nontrivial (acl_t acl) /* Ignore the ace if the group_sid is one of - S-1-5-18 (group "SYSTEM") - S-1-5-32-544 (group "Administrators") - Cf. */ + - S-1-5-32-545 (group "Users") + Cf. + and look at the output of the 'mkgroup' command. */ ignorable = (strcmp (group_sid, "S-1-5-18") == 0 - || strcmp (group_sid, "S-1-5-32-544") == 0); + || strcmp (group_sid, "S-1-5-32-544") == 0 + || strcmp (group_sid, "S-1-5-32-545") == 0); } } if (!ignorable)