summaryrefslogtreecommitdiffstats
path: root/bin/setfacl/remove.c
diff options
context:
space:
mode:
authorjedgar <jedgar@FreeBSD.org>2001-12-03 01:20:52 +0000
committerjedgar <jedgar@FreeBSD.org>2001-12-03 01:20:52 +0000
commit38cc4cae2f21652f33602bd0b8435f6de13e21ff (patch)
treea0dcb32e4ca7de10c55c8ddcb63dfe12fc66f764 /bin/setfacl/remove.c
parent518bba4cc16c1c16dee2f3eed6cca94a1756705b (diff)
downloadFreeBSD-src-38cc4cae2f21652f33602bd0b8435f6de13e21ff.zip
FreeBSD-src-38cc4cae2f21652f33602bd0b8435f6de13e21ff.tar.gz
Add defines for access and default ACLs (ACCESS_ACL/DEFAULT_ACL)
to enhance readability. Obtained from: TrustedBSD Project
Diffstat (limited to 'bin/setfacl/remove.c')
-rw-r--r--bin/setfacl/remove.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index 0911dd8..e4f2f35 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -50,9 +50,9 @@ remove_acl(acl_t acl, acl_t *prev_acl)
carried_error = 0;
if (acl_type == ACL_TYPE_ACCESS)
- acl_new = acl_dup(prev_acl[0]);
+ acl_new = acl_dup(prev_acl[ACCESS_ACL]);
else
- acl_new = acl_dup(prev_acl[1]);
+ acl_new = acl_dup(prev_acl[DEFAULT_ACL]);
if (acl_new == NULL)
err(1, "acl_dup() failed");
@@ -73,11 +73,11 @@ remove_acl(acl_t acl, acl_t *prev_acl)
}
if (acl_type == ACL_TYPE_ACCESS) {
- acl_free(prev_acl[0]);
- prev_acl[0] = acl_new;
+ acl_free(prev_acl[ACCESS_ACL]);
+ prev_acl[ACCESS_ACL] = acl_new;
} else {
- acl_free(prev_acl[1]);
- prev_acl[1] = acl_new;
+ acl_free(prev_acl[DEFAULT_ACL]);
+ prev_acl[DEFAULT_ACL] = acl_new;
}
if (carried_error)
@@ -118,9 +118,9 @@ remove_ext(acl_t *prev_acl)
int entry_id, have_mask_entry;
if (acl_type == ACL_TYPE_ACCESS)
- acl_old = acl_dup(prev_acl[0]);
+ acl_old = acl_dup(prev_acl[ACCESS_ACL]);
else
- acl_old = acl_dup(prev_acl[1]);
+ acl_old = acl_dup(prev_acl[DEFAULT_ACL]);
if (acl_old == NULL)
err(1, "acl_dup() failed");
@@ -170,10 +170,10 @@ remove_ext(acl_t *prev_acl)
}
if (acl_type == ACL_TYPE_ACCESS) {
- acl_free(prev_acl[0]);
- prev_acl[0] = acl_new;
+ acl_free(prev_acl[ACCESS_ACL]);
+ prev_acl[ACCESS_ACL] = acl_new;
} else {
- acl_free(prev_acl[1]);
- prev_acl[1] = acl_new;
+ acl_free(prev_acl[DEFAULT_ACL]);
+ prev_acl[DEFAULT_ACL] = acl_new;
}
}
OpenPOWER on IntegriCloud