From 2c7eb23cfe0a8412f7965d08c526663f8a5075fc Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 4 Apr 2011 17:18:38 +0200 Subject: [PATCH] Minor fixes to the acl_extended_file_nofollow() commit --- exports | 7 ++++++- libacl/__acl_extended_file.c | 7 ++++--- libacl/__acl_extended_file.h | 7 +++---- libacl/acl_extended_file_nofollow.c | 3 +-- man/man3/acl_extended_file.3 | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/exports b/exports index b368c22..7d8e69e 100644 --- a/exports +++ b/exports @@ -82,5 +82,10 @@ ACL_1.1 { # Linux specific extensions perm_copy_fd; perm_copy_file; - acl_extended_file_nofollow; } ACL_1.0; + +ACL_1.2 { + global: + # Linux specific extensions + acl_extended_file_nofollow; +} ACL_1.1; diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c index 629afe9..3e45abd 100644 --- a/libacl/__acl_extended_file.c +++ b/libacl/__acl_extended_file.c @@ -1,5 +1,5 @@ /* - File: acl_extended_file.c + File: __acl_extended_file.c Copyright (C) 2000, 2011 Andreas Gruenbacher, @@ -29,7 +29,9 @@ int -__acl_extended_file(const char *path_p, getxattr_t fun) +__acl_extended_file(const char *path_p, + ssize_t (*fun)(const char *, const char *, + void *, size_t)) { int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry); int retval; @@ -46,4 +48,3 @@ __acl_extended_file(const char *path_p, getxattr_t fun) return 1; return 0; } - diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h index f8881a1..0b0da9e 100644 --- a/libacl/__acl_extended_file.h +++ b/libacl/__acl_extended_file.h @@ -1,4 +1,3 @@ -typedef ssize_t (*getxattr_t)(const char *, const char *, void *value, - size_t size); - -int __acl_extended_file(const char *path_p, getxattr_t fun); +int __acl_extended_file(const char *path_p, + ssize_t (*)(const char *, const char *, + void *, size_t)); diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c index 8f4711f..c253e4d 100644 --- a/libacl/acl_extended_file_nofollow.c +++ b/libacl/acl_extended_file_nofollow.c @@ -1,5 +1,5 @@ /* - File: acl_extended_file.c + File: acl_extended_file_nofollow.c Copyright (C) 2011 Andreas Gruenbacher, @@ -31,4 +31,3 @@ acl_extended_file_nofollow(const char *path_p) { return __acl_extended_file(path_p, lgetxattr); } - diff --git a/man/man3/acl_extended_file.3 b/man/man3/acl_extended_file.3 index 1f04331..fdeef86 100644 --- a/man/man3/acl_extended_file.3 +++ b/man/man3/acl_extended_file.3 @@ -65,7 +65,7 @@ system call can be used to check whether a given type of access to a file object would be granted. .Pp .Fn acl_extended_file_nofollow -is identical to +is identical to .Fn acl_extended_file , except in the case of a symbolic link, where the link itself is interrogated, not the file that it refers to. Since symbolic links have no ACL themselves, -- 1.7.3.1.51.g55410