Deleted Added
sdiff udiff text old ( 75185 ) new ( 75928 )
full compact
acl_delete_entry.c (75185) acl_delete_entry.c (75928)
1/*
2 * Copyright (c) 2001 Chris D. Faulhaber
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) 2001 Chris D. Faulhaber
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_delete_entry.c 75185 2001-04-04 18:00:52Z tmm $
26 * $FreeBSD: head/lib/libc/posix1e/acl_delete_entry.c 75928 2001-04-24 22:45:41Z jedgar $
27 */
28
27 */
28
29/* acl_delete_entry() - delete an ACL entry from an ACL */
30
31#include <sys/types.h>
32#include "namespace.h"
33#include <sys/acl.h>
34#include "un-namespace.h"
35#include <errno.h>
36#include <string.h>
37
29#include <sys/types.h>
30#include "namespace.h"
31#include <sys/acl.h>
32#include "un-namespace.h"
33#include <errno.h>
34#include <string.h>
35
36/*
37 * acl_delete_entry() (23.4.9): remove the ACL entry indicated by entry_d
38 * from acl.
39 */
38int
39acl_delete_entry(acl_t acl, acl_entry_t entry_d)
40{
40int
41acl_delete_entry(acl_t acl, acl_entry_t entry_d)
42{
43 struct acl *acl_int;
41 int i;
42
44 int i;
45
43 if (!acl || !entry_d || (acl->acl_cnt < 1) ||
44 (acl->acl_cnt > ACL_MAX_ENTRIES)) {
46 if (!acl || !entry_d) {
45 errno = EINVAL;
46 return -1;
47 }
47 errno = EINVAL;
48 return -1;
49 }
48 for (i = 0; i < acl->acl_cnt; i++) {
50
51 acl_int = &acl->ats_acl;
52
53 if ((acl->ats_acl.acl_cnt < 1) ||
54 (acl->ats_acl.acl_cnt > ACL_MAX_ENTRIES)) {
55 errno = EINVAL;
56 return -1;
57 }
58 for (i = 0; i < acl->ats_acl.acl_cnt; i++) {
49 /* if this is our entry... */
59 /* if this is our entry... */
50 if ((acl->acl_entry[i].ae_tag == entry_d->ae_tag) &&
51 (acl->acl_entry[i].ae_id == entry_d->ae_id)) {
60 if ((acl->ats_acl.acl_entry[i].ae_tag == entry_d->ae_tag) &&
61 (acl->ats_acl.acl_entry[i].ae_id == entry_d->ae_id)) {
52 /* ...shift the remaining entries... */
62 /* ...shift the remaining entries... */
53 while (i < acl->acl_cnt - 1)
54 acl->acl_entry[i] = acl->acl_entry[++i];
63 while (i < acl->ats_acl.acl_cnt - 1)
64 acl->ats_acl.acl_entry[i] =
65 acl->ats_acl.acl_entry[++i];
55 /* ...drop the count and zero the unused entry... */
66 /* ...drop the count and zero the unused entry... */
56 acl->acl_cnt--;
57 bzero(&acl->acl_entry[i], sizeof(struct acl_entry));
67 acl->ats_acl.acl_cnt--;
68 bzero(&acl->ats_acl.acl_entry[i],
69 sizeof(struct acl_entry));
70 acl->ats_cur_entry = 0;
58 return 0;
59 }
60 }
61
62
63 errno = EINVAL;
64 return -1;
65}
71 return 0;
72 }
73 }
74
75
76 errno = EINVAL;
77 return -1;
78}