Deleted Added
sdiff udiff text old ( 92986 ) new ( 108410 )
full compact
acl_valid.c (92986) acl_valid.c (108410)
1/*-
1/*-
2 * Copyright (c) 1999, 2000, 20001 Robert N. M. Watson
2 * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
3 * All rights reserved.
4 *
3 * All rights reserved.
4 *
5 * This software was developed by Robert Watson for the TrustedBSD Project.
6 *
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 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.

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

23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26/*
27 * acl_valid -- POSIX.1e ACL check routine
28 */
29
30#include <sys/cdefs.h>
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.

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

25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28/*
29 * acl_valid -- POSIX.1e ACL check routine
30 */
31
32#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/lib/libc/posix1e/acl_valid.c 92986 2002-03-22 21:53:29Z obrien $");
33__FBSDID("$FreeBSD: head/lib/libc/posix1e/acl_valid.c 108410 2002-12-29 20:47:05Z rwatson $");
32
33#include <sys/types.h>
34#include "namespace.h"
35#include <sys/acl.h>
36#include "un-namespace.h"
37#include <sys/errno.h>
38#include <stdlib.h>
39

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

65 if (error) {
66 errno = error;
67 return (-1);
68 } else {
69 return (0);
70 }
71}
72
34
35#include <sys/types.h>
36#include "namespace.h"
37#include <sys/acl.h>
38#include "un-namespace.h"
39#include <sys/errno.h>
40#include <stdlib.h>
41

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

67 if (error) {
68 errno = error;
69 return (-1);
70 } else {
71 return (0);
72 }
73}
74
73
74int
75acl_valid_file_np(const char *pathp, acl_type_t type, acl_t acl)
76{
77 int error;
78
79 if (pathp == NULL || acl == NULL) {
80 errno = EINVAL;
81 return (-1);

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

86 errno = error;
87 return (-1);
88 }
89 }
90
91 return (__acl_aclcheck_file(pathp, type, &acl->ats_acl));
92}
93
75int
76acl_valid_file_np(const char *pathp, acl_type_t type, acl_t acl)
77{
78 int error;
79
80 if (pathp == NULL || acl == NULL) {
81 errno = EINVAL;
82 return (-1);

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

87 errno = error;
88 return (-1);
89 }
90 }
91
92 return (__acl_aclcheck_file(pathp, type, &acl->ats_acl));
93}
94
95int
96acl_valid_link_np(const char *pathp, acl_type_t type, acl_t acl)
97{
98 int error;
94
99
100 if (pathp == NULL || acl == NULL) {
101 errno = EINVAL;
102 return (-1);
103 }
104 if (_posix1e_acl(acl, type)) {
105 error = _posix1e_acl_sort(acl);
106 if (error) {
107 errno = error;
108 return (-1);
109 }
110 }
111
112 return (__acl_aclcheck_link(pathp, type, &acl->ats_acl));
113}
114
95int
96acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
97{
98 int error;
99
100 if (acl == NULL) {
101 errno = EINVAL;
102 return (-1);

--- 14 unchanged lines hidden --- 		115int
116acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
117{
118 int error;
119
120 if (acl == NULL) {
121 errno = EINVAL;
122 return (-1);

--- 14 unchanged lines hidden ---