Deleted Added
sdiff udiff text old ( 92986 ) new ( 108410 )
full compact
acl_set.c (92986) acl_set.c (108410)
1/*-
1/*-
2 * Copyright (c) 1999, 2000, 2001 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_set_file -- set a file/directory ACL by name
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_set_file -- set a file/directory ACL by name
30 */
31
32#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/lib/libc/posix1e/acl_set.c 92986 2002-03-22 21:53:29Z obrien $");
33__FBSDID("$FreeBSD: head/lib/libc/posix1e/acl_set.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
38#include <errno.h>
39#include <stdlib.h>

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

65 }
66
67 acl->ats_cur_entry = 0;
68
69 return (__acl_set_file(path_p, type, &acl->ats_acl));
70}
71
72int
34
35#include <sys/types.h>
36#include "namespace.h"
37#include <sys/acl.h>
38#include "un-namespace.h"
39
40#include <errno.h>
41#include <stdlib.h>

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

67 }
68
69 acl->ats_cur_entry = 0;
70
71 return (__acl_set_file(path_p, type, &acl->ats_acl));
72}
73
74int
75acl_set_link_np(const char *path_p, acl_type_t type, acl_t acl)
76{
77 int error;
78
79 if (acl == NULL || path_p == NULL) {
80 errno = EINVAL;
81 return (-1);
82 }
83 if (_posix1e_acl(acl, type)) {
84 error = _posix1e_acl_sort(acl);
85 if (error) {
86 errno = error;
87 return (-1);
88 }
89 }
90
91 acl->ats_cur_entry = 0;
92
93 return (__acl_set_link(path_p, type, &acl->ats_acl));
94}
95
96int
73acl_set_fd(int fd, acl_t acl)
74{
75 int error;
76
77 error = _posix1e_acl_sort(acl);
78 if (error) {
79 errno = error;
80 return(-1);

--- 95 unchanged lines hidden --- 		97acl_set_fd(int fd, acl_t acl)
98{
99 int error;
100
101 error = _posix1e_acl_sort(acl);
102 if (error) {
103 errno = error;
104 return(-1);

--- 95 unchanged lines hidden ---