upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-04 20:51:33 +00:00
Code Activity

file-has-acl: use acl_extended_file_nofollow if available

Browse Source 
* lib/acl-internal.h (HAVE_ACL_EXTENDED_FILE): New macro.
(acl_extended_file): New macro.
* lib/file-has-acl.c (file_has_acl): Use acl_extended_file_nofollow.
* m4/acl.m4 (gl_FUNC_ACL): Check for acl_extended_file_nofollow.
This addresses http://bugzilla.redhat.com/692823.
This commit is contained in:
Kamil Dudka
2011-07-22 15:16:59 +02:00
committed by Jim Meyering
parent 6195fa324f
commit 95f7c57ff4
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2011-07-22 Kamil Dudka <kdudka@redhat.com>
file-has-acl: use acl_extended_file_nofollow if available
* lib/acl-internal.h (HAVE_ACL_EXTENDED_FILE): New macro.
(acl_extended_file): New macro.
* lib/file-has-acl.c (file_has_acl): Use acl_extended_file_nofollow.
* m4/acl.m4 (gl_FUNC_ACL): Check for acl_extended_file_nofollow.
2011-07-21 Bruno Haible <bruno@clisp.org>
Declare system functions in a way that works with C++.
lib/acl-internal.h
+6
View File
@@ -132,6 +132,12 @@ rpl_acl_set_fd (int fd, acl_t acl)
# define acl_extended_file(name) (-1)
# endif
/* Linux-specific */
# ifndef HAVE_ACL_EXTENDED_FILE_NOFOLLOW
# define HAVE_ACL_EXTENDED_FILE_NOFOLLOW false
# define acl_extended_file_nofollow(name) (-1)
# endif
/* Linux-specific */
# ifndef HAVE_ACL_FROM_MODE
# define HAVE_ACL_FROM_MODE false
lib/file-has-acl.c
+9 -1
View File
@@ -366,12 +366,20 @@ file_has_acl (char const *name, struct stat const *sb)
/* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
int ret;
if (HAVE_ACL_EXTENDED_FILE) /* Linux */
if (HAVE_ACL_EXTENDED_FILE || HAVE_ACL_EXTENDED_FILE_NOFOLLOW) /* Linux */
{
# if HAVE_ACL_EXTENDED_FILE_NOFOLLOW
/* acl_extended_file_nofollow() uses lgetxattr() in order to prevent
unnecessary mounts, but it returns the same result as we already
know that NAME is not a symbolic link at this point (modulo the
TOCTTOU race condition). */
ret = acl_extended_file_nofollow (name);
# else
/* On Linux, acl_extended_file is an optimized function: It only
makes two calls to getxattr(), one for ACL_TYPE_ACCESS, one for
ACL_TYPE_DEFAULT. */
ret = acl_extended_file (name);
# endif
}
else /* FreeBSD, MacOS X, IRIX, Tru64 */
{
m4/acl.m4
+1 -1
View File
@@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_ACL],
AC_CHECK_FUNCS(
[acl_get_file acl_get_fd acl_set_file acl_set_fd \
acl_free acl_from_mode acl_from_text \
acl_delete_def_file acl_extended_file \
acl_delete_def_file acl_extended_file acl_extended_file_nofollow \
acl_delete_fd_np acl_delete_file_np \
acl_copy_ext_native acl_create_entry_np \
acl_to_short_text acl_free_text])