Deleted Added
full compact
mask.c (74465) mask.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 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
19 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
20 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
23 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24 * POSSIBILITY OF 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 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
19 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
20 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
23 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24 * POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/bin/setfacl/mask.c 74465 2001-03-19 18:09:25Z rwatson $
26 * $FreeBSD: head/bin/setfacl/mask.c 75928 2001-04-24 22:45:41Z jedgar $
27 */
28
29#include <sys/types.h>
30#include <sys/acl.h>
31#include <sys/stat.h>
32
33#include <err.h>
34#include <errno.h>
35#include <stdio.h>
36#include <stdlib.h>
37#include <sysexits.h>
38
39#include "setfacl.h"
40
41/* set the appropriate mask the given ACL's */
42int
27 */
28
29#include <sys/types.h>
30#include <sys/acl.h>
31#include <sys/stat.h>
32
33#include <err.h>
34#include <errno.h>
35#include <stdio.h>
36#include <stdlib.h>
37#include <sysexits.h>
38
39#include "setfacl.h"
40
41/* set the appropriate mask the given ACL's */
42int
43set_acl_mask(acl_t prev_acl)
43set_acl_mask(acl_t *prev_acl)
44{
44{
45 acl_entry_t entry;
45 acl_t acl;
46 acl_t acl;
46 int i;
47 acl_tag_t tag;
48 int entry_id;
47
49
50 entry = NULL;
51
48 /*
49 * ... if a mask entry is specified, then the permissions of the mask
50 * entry in the resulting ACL shall be set to the permissions in the
51 * specified ACL mask entry.
52 */
53 if (have_mask)
54 return 0;
55
52 /*
53 * ... if a mask entry is specified, then the permissions of the mask
54 * entry in the resulting ACL shall be set to the permissions in the
55 * specified ACL mask entry.
56 */
57 if (have_mask)
58 return 0;
59
56 acl = acl_dup(prev_acl);
60 acl = acl_dup(*prev_acl);
57 if (!acl)
58 err(EX_OSERR, "acl_dup() failed");
59
60 if (!n_flag) {
61 /*
62 * If no mask entry is specified and the -n option is not
63 * specified, then the permissions of the resulting ACL mask
64 * entry shall be set to the union of the permissions

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

71 return -1;
72 }
73 } else {
74 /*
75 * If no mask entry is specified and the -n option is
76 * specified, then the permissions of the resulting ACL
77 * mask entry shall remain unchanged ...
78 */
61 if (!acl)
62 err(EX_OSERR, "acl_dup() failed");
63
64 if (!n_flag) {
65 /*
66 * If no mask entry is specified and the -n option is not
67 * specified, then the permissions of the resulting ACL mask
68 * entry shall be set to the union of the permissions

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

75 return -1;
76 }
77 } else {
78 /*
79 * If no mask entry is specified and the -n option is
80 * specified, then the permissions of the resulting ACL
81 * mask entry shall remain unchanged ...
82 */
79 for (i = 0; i < acl->acl_cnt; i++)
80 if (acl->acl_entry[i].ae_tag == ACL_MASK) {
83
84 entry_id = ACL_FIRST_ENTRY;
85
86 while (acl_get_entry(acl, entry_id, &entry) == 1) {
87 entry_id = ACL_NEXT_ENTRY;
88 if (acl_get_tag_type(entry, &tag) == -1)
89 err(1, "acl_get_tag_type() failed");
90
91 if (tag == ACL_MASK) {
81 acl_free(acl);
82 return 0;
83 }
92 acl_free(acl);
93 return 0;
94 }
95 }
84
85 /*
86 * If no mask entry is specified, the -n option is specified,
87 * and no ACL mask entry exists in the ACL associated with the
88 * file, then write an error message to standard error and
89 * continue with the next file.
90 */
91 warnx("warning: no mask entry");
92 acl_free(acl);
93 return 0;
94 }
95
96
97 /*
98 * If no mask entry is specified, the -n option is specified,
99 * and no ACL mask entry exists in the ACL associated with the
100 * file, then write an error message to standard error and
101 * continue with the next file.
102 */
103 warnx("warning: no mask entry");
104 acl_free(acl);
105 return 0;
106 }
107
96 *prev_acl = *acl;
108 prev_acl = &acl;
97 acl_free(acl);
98
99 return 0;
100}
109 acl_free(acl);
110
111 return 0;
112}