| acl_valid.c (56274) | acl_valid.c (56625) |
|---|---|
| 1/*- 2 * Copyright (c) 1999 Robert N. M. Watson 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 1999 Robert N. M. Watson 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/lib/libc/posix1e/acl_valid.c 56274 2000-01-19 06:13:59Z rwatson $ | 26 * $FreeBSD: head/lib/libc/posix1e/acl_valid.c 56625 2000-01-26 04:19:38Z rwatson $ |
| 27 */ 28/* 29 * acl_valid -- POSIX.1e ACL check routine 30 */ 31 32#include <sys/types.h> 33#include <sys/acl.h> 34#include <sys/errno.h> --- 29 unchanged lines hidden (view full) --- 64} 65 66 67int 68acl_valid_file(const char *pathp, acl_type_t type, acl_t acl) 69{ 70 int error; 71 | 27 */ 28/* 29 * acl_valid -- POSIX.1e ACL check routine 30 */ 31 32#include <sys/types.h> 33#include <sys/acl.h> 34#include <sys/errno.h> --- 29 unchanged lines hidden (view full) --- 64} 65 66 67int 68acl_valid_file(const char *pathp, acl_type_t type, acl_t acl) 69{ 70 int error; 71 |
| 72 if (acl_posix1e(acl)) { | 72 if (acl_posix1e(acl, type)) { |
| 73 error = acl_sort(acl); 74 if (error) { 75 errno = error; 76 return (-1); 77 } 78 } 79 80 return (__acl_aclcheck_file(pathp, type, acl)); 81} 82 83 84int 85acl_valid_fd(int fd, acl_type_t type, acl_t acl) 86{ 87 int error; 88 | 73 error = acl_sort(acl); 74 if (error) { 75 errno = error; 76 return (-1); 77 } 78 } 79 80 return (__acl_aclcheck_file(pathp, type, acl)); 81} 82 83 84int 85acl_valid_fd(int fd, acl_type_t type, acl_t acl) 86{ 87 int error; 88 |
| 89 if (acl_posix1e(acl)) { | 89 if (acl_posix1e(acl, type)) { |
| 90 error = acl_sort(acl); 91 if (error) { 92 errno = error; 93 return (-1); 94 } 95 } 96 97 return (__acl_aclcheck_fd(fd, type, acl)); 98} | 90 error = acl_sort(acl); 91 if (error) { 92 errno = error; 93 return (-1); 94 } 95 } 96 97 return (__acl_aclcheck_fd(fd, type, acl)); 98} |