Deleted Added
full compact
acl_valid.c (75185) acl_valid.c (75928)
1/*-
2 * Copyright (c) 1999, 2000, 20001 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, 2000, 20001 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 75185 2001-04-04 18:00:52Z tmm $
26 * $FreeBSD: head/lib/libc/posix1e/acl_valid.c 75928 2001-04-24 22:45:41Z jedgar $
27 */
28/*
29 * acl_valid -- POSIX.1e ACL check routine
30 */
31
32#include <sys/types.h>
33#include "namespace.h"
34#include <sys/acl.h>

--- 38 unchanged lines hidden (view full) ---

73 if (_posix1e_acl(acl, type)) {
74 error = _posix1e_acl_sort(acl);
75 if (error) {
76 errno = error;
77 return (-1);
78 }
79 }
80
27 */
28/*
29 * acl_valid -- POSIX.1e ACL check routine
30 */
31
32#include <sys/types.h>
33#include "namespace.h"
34#include <sys/acl.h>

--- 38 unchanged lines hidden (view full) ---

73 if (_posix1e_acl(acl, type)) {
74 error = _posix1e_acl_sort(acl);
75 if (error) {
76 errno = error;
77 return (-1);
78 }
79 }
80
81 return (__acl_aclcheck_file(pathp, type, acl));
81 return (__acl_aclcheck_file(pathp, type, &acl->ats_acl));
82}
83
84
85int
86acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
87{
88 int error;
89
90 if (_posix1e_acl(acl, type)) {
91 error = _posix1e_acl_sort(acl);
92 if (error) {
93 errno = error;
94 return (-1);
95 }
96 }
97
82}
83
84
85int
86acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
87{
88 int error;
89
90 if (_posix1e_acl(acl, type)) {
91 error = _posix1e_acl_sort(acl);
92 if (error) {
93 errno = error;
94 return (-1);
95 }
96 }
97
98 return (___acl_aclcheck_fd(fd, type, acl));
98 acl->ats_cur_entry = 0;
99
100
101 return (___acl_aclcheck_fd(fd, type, &acl->ats_acl));
99}
102}