lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-14 14:01:48 +03:00
Code Activity

file-has-acl: Split feature tests again (Bug#20667)

Browse Source 
* 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.
This commit is contained in:
Andreas Gruenbacher
2015-04-28 12:01:19 +02:00
parent 70e0e9ed73
commit f1b37e3afb
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2015-05-27 Andreas Gruenbacher <agruenba@redhat.com>
file-has-acl: Split feature tests again (Bug#20667)
* 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-27 Pádraig Brady <P@draigBrady.com> 2015-05-27 Pádraig Brady <P@draigBrady.com>
string: fix build failure on BSD/OSX with FORTIFY_SOURCE string: fix build failure on BSD/OSX with FORTIFY_SOURCE

15
lib/file-has-acl.c
View File

@@ -29,8 +29,11 @@
#include "acl-internal.h" #include "acl-internal.h"
#if GETXATTR_WITH_POSIX_ACLS #if HAVE_SYS_XATTR_H
# include <sys/xattr.h> # include <sys/xattr.h>
#endif
#if HAVE_LINUX_XATTR_H
# include <linux/xattr.h> # include <linux/xattr.h>
#endif #endif
@@ -48,7 +51,15 @@ file_has_acl (char const *name, struct stat const *sb)
if (! S_ISLNK (sb->st_mode)) 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; ssize_t ret;

24
m4/acl.m4
View File

@@ -1,5 +1,5 @@
# acl.m4 - check for access control list (ACL) primitives # acl.m4 - check for access control list (ACL) primitives
# serial 19 # serial 20
# Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc. # Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # 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]) AC_REQUIRE([gl_FUNC_ACL_ARG])
if test "$enable_acl" != no; then if test "$enable_acl" != no; then
AC_CACHE_CHECK([for getxattr with XATTR_NAME_POSIX_ACL macros], AC_CHECK_HEADERS([linux/xattr.h])
[gl_cv_getxattr_with_posix_acls], AC_CHECK_HEADERS([sys/xattr.h],
[gl_cv_getxattr_with_posix_acls=no [AC_CHECK_FUNCS([getxattr])])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>
#include <sys/xattr.h>
#include <linux/xattr.h>
]],
[[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])])
fi 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= 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 else
dnl Set gl_need_lib_has_acl to a nonempty value, so that any 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. dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL.