From unknown Mon Aug 18 11:33:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#20667: [GNULIB v2 1/2] file-has-acl: Split feature tests again Resent-From: Andreas Gruenbacher Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 26 May 2015 20:55:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20667 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: bug-gnulib@gnu.org, 20667@debbugs.gnu.org X-Debbugs-Original-To: bug-gnulib@gnu.org, bug-coreutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.143267366511469 (code B ref -1); Tue, 26 May 2015 20:55:07 +0000 Received: (at submit) by debbugs.gnu.org; 26 May 2015 20:54:25 +0000 Received: from localhost ([127.0.0.1]:57461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxLrk-0002yu-Fs for submit@debbugs.gnu.org; Tue, 26 May 2015 16:54:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38317) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxLri-0002yV-Aa for submit@debbugs.gnu.org; Tue, 26 May 2015 16:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxLrZ-0000Bb-Af for submit@debbugs.gnu.org; Tue, 26 May 2015 16:54:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxLrZ-0000BX-8U for submit@debbugs.gnu.org; Tue, 26 May 2015 16:54:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxLrY-0003S1-0C for bug-coreutils@gnu.org; Tue, 26 May 2015 16:54:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxLrW-00009k-TL for bug-coreutils@gnu.org; Tue, 26 May 2015 16:54:11 -0400 Received: from mail-wg0-x235.google.com ([2a00:1450:400c:c00::235]:35721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxLrS-00006h-Ii; Tue, 26 May 2015 16:54:06 -0400 Received: by wgme6 with SMTP id e6so39486452wgm.2; Tue, 26 May 2015 13:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=mw/elsDSySg6QSr0hgcQLbWqZfYFPwN/hontIDjV3uU=; b=FR7cWT7mUmkm9F8bMsrFremgU37+XpXCDKRwAAKfoMNDkqMCKU9xeYGu8m9xQlCW5S COaqLsTc+nvHmFy3KbyXzKYiT4DsflZhMrzmijV7NMPst8cI7ksZtgKEhpa4ikqrVNja nORpdz8oeGDsRtpiNu+E8cljqeuudH4p1u5/PSS1Rg+t0VxDwg0igDqC8ZCEGRm9Ib5q HgQ97h7ekJziOE4BQa4M+xmTppI+hjKPtEc7dHPcei8Eb0H1HJi79V5aRA15jy2vchNt HuKFGZxK6gBuSZACt+er2RkTAG0AjpGiPVJPRPrGttRZIDniUi7GHo5XfYuNuRjxBvT1 mQzw== X-Received: by 10.194.222.230 with SMTP id qp6mr53157708wjc.70.1432673645849; Tue, 26 May 2015 13:54:05 -0700 (PDT) Received: from nuc.lan (80-110-112-232.cgn.dynamic.surfer.at. [80.110.112.232]) by mx.google.com with ESMTPSA id g14sm23488545wjs.47.2015.05.26.13.54.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 13:54:05 -0700 (PDT) From: Andreas Gruenbacher Date: Tue, 26 May 2015 22:53:56 +0200 Message-Id: <1432673637-19777-2-git-send-email-andreas.gruenbacher@gmail.com> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1432673637-19777-1-git-send-email-andreas.gruenbacher@gmail.com> References: <1432673637-19777-1-git-send-email-andreas.gruenbacher@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * lib/file-has-acl.c: Instead of testing for XATTR_NAME_POSIX_ACL_ACCESS and XATTR_NAME_POSIX_ACL_DEFAULT, define them when needed. * m4/acl.m4 (gl_FILE_HAS_ACL): With that, Paul's GETXATTR_WITH_POSIX_ACLS change shouldn't be needed anymore. --- ChangeLog | 9 +++++++++ lib/file-has-acl.c | 15 +++++++++++++-- m4/acl.m4 | 24 +++++------------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 960eec3..c5100ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-04-28 Andreas Gruenbacher + + file-has-acl: Split feature tests again + * lib/file-has-acl.c: Instead of testing for + XATTR_NAME_POSIX_ACL_ACCESS and XATTR_NAME_POSIX_ACL_DEFAULT, + define them when needed. + * m4/acl.m4 (gl_FILE_HAS_ACL): With that, Paul's + GETXATTR_WITH_POSIX_ACLS change shouldn't be needed anymore. + 2015-05-07 Glenn Morris gitlog-to-changelog: parse "Tiny-change" diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index 7e26c53..e187117 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -29,8 +29,11 @@ #include "acl-internal.h" -#if GETXATTR_WITH_POSIX_ACLS +#if HAVE_SYS_XATTR_H # include +#endif + +#if HAVE_LINUX_XATTR_H # include #endif @@ -48,7 +51,15 @@ file_has_acl (char const *name, struct stat const *sb) if (! S_ISLNK (sb->st_mode)) { -# if GETXATTR_WITH_POSIX_ACLS +# if HAVE_GETXATTR + +# ifndef XATTR_NAME_POSIX_ACL_ACCESS +# define XATTR_NAME_POSIX_ACL_ACCESS "system.posix_acl_access" +# endif + +# ifndef XATTR_NAME_POSIX_ACL_DEFAULT +# define XATTR_NAME_POSIX_ACL_DEFAULT "system.posix_acl_default" +# endif ssize_t ret; diff --git a/m4/acl.m4 b/m4/acl.m4 index b8f4660..bf2e30b 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,5 +1,5 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 19 +# serial 20 # Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -181,26 +181,12 @@ AC_DEFUN([gl_FILE_HAS_ACL], [ AC_REQUIRE([gl_FUNC_ACL_ARG]) if test "$enable_acl" != no; then - AC_CACHE_CHECK([for getxattr with XATTR_NAME_POSIX_ACL macros], - [gl_cv_getxattr_with_posix_acls], - [gl_cv_getxattr_with_posix_acls=no - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #include - #include - ]], - [[ssize_t a = getxattr (".", XATTR_NAME_POSIX_ACL_ACCESS, 0, 0); - ssize_t b = getxattr (".", XATTR_NAME_POSIX_ACL_DEFAULT, 0, 0); - return a < 0 || b < 0; - ]])], - [gl_cv_getxattr_with_posix_acls=yes])]) + AC_CHECK_HEADERS([linux/xattr.h]) + AC_CHECK_HEADERS([sys/xattr.h], + [AC_CHECK_FUNCS_ONCE([getxattr])]) fi - if test "$gl_cv_getxattr_with_posix_acls" = yes; then + if test "$ac_cv_header_sys_xattr_h,$ac_cv_func_getxattr" = yes,yes; then LIB_HAS_ACL= - AC_DEFINE([GETXATTR_WITH_POSIX_ACLS], 1, - [Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS - and XATTR_NAME_POSIX_ACL_DEFAULT.]) else dnl Set gl_need_lib_has_acl to a nonempty value, so that any dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL. -- 2.4.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 26 17:05:20 2015 Received: (at control) by debbugs.gnu.org; 26 May 2015 21:05:20 +0000 Received: from localhost ([127.0.0.1]:57476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxM2J-0003Ji-HB for submit@debbugs.gnu.org; Tue, 26 May 2015 17:05:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48900) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxM2H-0003JY-MQ for control@debbugs.gnu.org; Tue, 26 May 2015 17:05:18 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id B41248E4ED for ; Tue, 26 May 2015 21:05:15 +0000 (UTC) Received: from [10.3.113.99] (ovpn-113-99.phx2.redhat.com [10.3.113.99]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4QL5FGk012744 for ; Tue, 26 May 2015 17:05:15 -0400 Message-ID: <5564E00A.1080602@redhat.com> Date: Tue, 26 May 2015 15:05:14 -0600 From: Eric Blake Organization: Red Hat, Inc. User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: GNU bug control Subject: Re: bug#20667: [GNULIB v2 1/2] file-has-acl: Split feature tests again References: <1432673637-19777-1-git-send-email-andreas.gruenbacher@gmail.com> <1432673637-19777-2-git-send-email-andreas.gruenbacher@gmail.com> In-Reply-To: <1432673637-19777-2-git-send-email-andreas.gruenbacher@gmail.com> OpenPGP: url=http://people.redhat.com/eblake/eblake.gpg Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mI13cwwK6umEEFUTK75pDbKBCNAiqjbP4" X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --mI13cwwK6umEEFUTK75pDbKBCNAiqjbP4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable merge 20666 20667 thanks --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --mI13cwwK6umEEFUTK75pDbKBCNAiqjbP4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJVZOALAAoJEKeha0olJ0NqsK8H/jmkXAsshZR2pAr/yScaNt2l +kMWY7+Va90rSGRfvodZuh1T/t6CoApOr1GbHy+CTdD7PhlaW7DLee/kO13Wb9J4 bf4mjBRrjnUT9zOysUiD3PO/5sziTMLtNC15hLBXD6AGdn0RYYp3ereVDEagkM3W K4FWQyWDM9pTOD0TaOAv3r3etR/CKagFeMq7SBl/iZQCruRb8q/yh97LNRd33Ypn 9cFn/VNjQB10N+mCgbxuzKBlHca8yG/zLHH4OjPnG9RHNHVPVsq7Kq3+3ewiCbbZ ninAc2GfOld2+IZ7n5lKtAdx4jynTauFzo9HRvlNV0LrcOZWFReX0rahN3rYUAg= =ZTdC -----END PGP SIGNATURE----- --mI13cwwK6umEEFUTK75pDbKBCNAiqjbP4-- From unknown Mon Aug 18 11:33:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#20667: [GNULIB v2 1/2] file-has-acl: Split feature tests again Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Wed, 27 May 2015 18:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20667 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: andreas.gruenbacher@gmail.com, bug-gnulib@gnu.org, 20667@debbugs.gnu.org X-Debbugs-Original-To: Andreas Gruenbacher , bug-gnulib@gnu.org, bug-coreutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.143275051525899 (code B ref -1); Wed, 27 May 2015 18:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2015 18:15:15 +0000 Received: from localhost ([127.0.0.1]:58596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxfrG-0006jf-Ql for submit@debbugs.gnu.org; Wed, 27 May 2015 14:15:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47647) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YxfrD-0006jH-Rq for submit@debbugs.gnu.org; Wed, 27 May 2015 14:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxfr7-0000ac-Qw for submit@debbugs.gnu.org; Wed, 27 May 2015 14:15:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:41612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxfr7-0000aS-Oe for submit@debbugs.gnu.org; Wed, 27 May 2015 14:15:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxfr6-0002rP-Tc for bug-coreutils@gnu.org; Wed, 27 May 2015 14:15:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxfr2-0000O8-QC for bug-coreutils@gnu.org; Wed, 27 May 2015 14:15:04 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:40524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxfr2-0000O4-Kh; Wed, 27 May 2015 14:15:00 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 04593A60014; Wed, 27 May 2015 11:14:59 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4nsUQ9pmXzfh; Wed, 27 May 2015 11:14:58 -0700 (PDT) Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 66B26A60010; Wed, 27 May 2015 11:14:58 -0700 (PDT) Message-ID: <556609A2.6020609@cs.ucla.edu> Date: Wed, 27 May 2015 11:14:58 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 References: <1432673637-19777-1-git-send-email-andreas.gruenbacher@gmail.com> <1432673637-19777-2-git-send-email-andreas.gruenbacher@gmail.com> In-Reply-To: <1432673637-19777-2-git-send-email-andreas.gruenbacher@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) I found one nit: > + AC_CHECK_HEADERS([linux/xattr.h]) > + AC_CHECK_HEADERS([sys/xattr.h], > + [AC_CHECK_FUNCS_ONCE([getxattr])]) This is missing _ONCE and non-ONCE calls, which doesn't work as expected. Simplest fix is to replace AC_CHECK_FUNCS_ONCE with AC_CHECK_FUNCS. From debbugs-submit-bounces@debbugs.gnu.org Sat May 30 20:30:12 2015 Received: (at control) by debbugs.gnu.org; 31 May 2015 00:30:13 +0000 Received: from localhost ([127.0.0.1]:33835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yyr8k-00074N-W2 for submit@debbugs.gnu.org; Sat, 30 May 2015 20:30:11 -0400 Received: from mail2.vodafone.ie ([213.233.128.44]:24323) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yyr8e-00073L-8H for control@debbugs.gnu.org; Sat, 30 May 2015 20:30:06 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: At4iALlUalVtT7M5/2dsb2JhbABcgxAjb4FcgWKJNrZzgwCBAUwBAQEBAQGBC0EBAwGDfAoqVA0CBSECEQI6BgICCA0IAQGILQGiBI9fhWuddYEhkVwMLxKBMwWmKo8kI4FHAQEIAgGCJT2CeAIBAg Received: from unknown (HELO localhost.localdomain) ([109.79.179.57]) by mail2.vodafone.ie with ESMTP; 31 May 2015 01:29:57 +0100 Message-ID: <556A5605.60604@draigBrady.com> Date: Sun, 31 May 2015 01:29:57 +0100 From: =?UTF-8?B?UMOhZHJhaWcgQnJhZHk=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: GNU bug tracker automated control server Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: forcemerge 20310 20311 20312 20666 20667 20696 close 20310 [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [213.233.128.44 listed in list.dnswl.org] 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: forcemerge 20310 20311 20312 20666 20667 20696 close 20310 [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [213.233.128.44 listed in list.dnswl.org] 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject forcemerge 20310 20311 20312 20666 20667 20696 close 20310