def3aa0156
Avoid triggering unwanted AutoFS mounts (bnc#701659). OBS-URL: https://build.opensuse.org/request/show/77635 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=124
85 lines
3.4 KiB
Diff
85 lines
3.4 KiB
Diff
commit 95f7c57ff4090a5dee062044d2c7b99879077808
|
|
Author: Kamil Dudka <kdudka@redhat.com>
|
|
Date: Fri Jul 22 14:48:42 2011 +0200
|
|
|
|
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.
|
|
This addresses http://bugzilla.redhat.com/692823.
|
|
|
|
Index: coreutils-8.12/lib/acl-internal.h
|
|
===================================================================
|
|
--- coreutils-8.12.orig/lib/acl-internal.h
|
|
+++ coreutils-8.12/lib/acl-internal.h
|
|
@@ -124,6 +124,12 @@ rpl_acl_set_fd (int fd, acl_t acl)
|
|
# 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
|
|
# define acl_from_mode(mode) (NULL)
|
|
Index: coreutils-8.12/lib/file-has-acl.c
|
|
===================================================================
|
|
--- coreutils-8.12.orig/lib/file-has-acl.c
|
|
+++ coreutils-8.12/lib/file-has-acl.c
|
|
@@ -339,12 +339,20 @@ file_has_acl (char const *name, struct s
|
|
/* 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 */
|
|
{
|
|
Index: coreutils-8.12/m4/acl.m4
|
|
===================================================================
|
|
--- coreutils-8.12.orig/m4/acl.m4
|
|
+++ coreutils-8.12/m4/acl.m4
|
|
@@ -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])
|
|
Index: coreutils-8.12/ChangeLog
|
|
===================================================================
|
|
--- coreutils-8.12.orig/ChangeLog
|
|
+++ coreutils-8.12/ChangeLog
|
|
@@ -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-04-26 Jim Meyering <meyering@redhat.com>
|
|
|
|
version 8.12
|