2000-01-15 19:44:27 +00:00
|
|
|
/*-
|
2008-07-13 16:37:51 +00:00
|
|
|
* Copyright (c) 1999-2001, 2008 Robert N. M. Watson
|
2000-01-15 19:44:27 +00:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* Support functionality for the POSIX.1e ACL interface
|
|
|
|
* These calls are intended only to be called within the library.
|
|
|
|
*/
|
|
|
|
|
2002-03-22 21:53:29 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
#include <sys/types.h>
|
2001-04-04 18:00:52 +00:00
|
|
|
#include "namespace.h"
|
2000-01-15 19:44:27 +00:00
|
|
|
#include <sys/acl.h>
|
2001-04-04 18:00:52 +00:00
|
|
|
#include "un-namespace.h"
|
2000-01-15 19:44:27 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <grp.h>
|
|
|
|
#include <pwd.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
Add NFSv4 ACL support to libc.
This adds the following functions to the acl(3) API: acl_add_flag_np,
acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np,
acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np,
acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np,
acl_strip_np, acl_get_brand_np. Most of them are similar to what Darwin
does. There are no backward-incompatible changes.
Approved by: rwatson@
2009-06-25 12:46:59 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2000-01-15 19:44:27 +00:00
|
|
|
|
|
|
|
#include "acl_support.h"
|
|
|
|
|
|
|
|
#define ACL_STRING_PERM_WRITE 'w'
|
|
|
|
#define ACL_STRING_PERM_READ 'r'
|
|
|
|
#define ACL_STRING_PERM_EXEC 'x'
|
|
|
|
#define ACL_STRING_PERM_NONE '-'
|
|
|
|
|
Add NFSv4 ACL support to libc.
This adds the following functions to the acl(3) API: acl_add_flag_np,
acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np,
acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np,
acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np,
acl_strip_np, acl_get_brand_np. Most of them are similar to what Darwin
does. There are no backward-incompatible changes.
Approved by: rwatson@
2009-06-25 12:46:59 +00:00
|
|
|
/*
|
|
|
|
* Return 0, if both ACLs are identical.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
_acl_differs(const acl_t a, const acl_t b)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct acl_entry *entrya, *entryb;
|
|
|
|
|
|
|
|
assert(_acl_brand(a) == _acl_brand(b));
|
|
|
|
assert(_acl_brand(a) != ACL_BRAND_UNKNOWN);
|
|
|
|
assert(_acl_brand(b) != ACL_BRAND_UNKNOWN);
|
|
|
|
|
|
|
|
if (a->ats_acl.acl_cnt != b->ats_acl.acl_cnt)
|
|
|
|
return (1);
|
|
|
|
|
|
|
|
for (i = 0; i < b->ats_acl.acl_cnt; i++) {
|
|
|
|
entrya = &(a->ats_acl.acl_entry[i]);
|
|
|
|
entryb = &(b->ats_acl.acl_entry[i]);
|
|
|
|
|
|
|
|
if (entrya->ae_tag != entryb->ae_tag ||
|
|
|
|
entrya->ae_id != entryb->ae_id ||
|
|
|
|
entrya->ae_perm != entryb->ae_perm ||
|
|
|
|
entrya->ae_entry_type != entryb->ae_entry_type ||
|
|
|
|
entrya->ae_flags != entryb->ae_flags)
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
/*
|
2001-03-13 02:31:32 +00:00
|
|
|
* _posix1e_acl_entry_compare -- compare two acl_entry structures to
|
|
|
|
* determine the order they should appear in. Used by _posix1e_acl_sort to
|
|
|
|
* sort ACL entries into the kernel-desired order -- i.e., the order useful
|
|
|
|
* for evaluation and O(n) validity checking. Beter to have an O(nlogn) sort
|
|
|
|
* in userland and an O(n) in kernel than to have both in kernel.
|
2000-01-15 19:44:27 +00:00
|
|
|
*/
|
|
|
|
typedef int (*compare)(const void *, const void *);
|
|
|
|
static int
|
2001-03-13 02:31:32 +00:00
|
|
|
_posix1e_acl_entry_compare(struct acl_entry *a, struct acl_entry *b)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
Add NFSv4 ACL support to libc.
This adds the following functions to the acl(3) API: acl_add_flag_np,
acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np,
acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np,
acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np,
acl_strip_np, acl_get_brand_np. Most of them are similar to what Darwin
does. There are no backward-incompatible changes.
Approved by: rwatson@
2009-06-25 12:46:59 +00:00
|
|
|
|
|
|
|
assert(_entry_brand(a) == ACL_BRAND_POSIX);
|
|
|
|
assert(_entry_brand(b) == ACL_BRAND_POSIX);
|
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
/*
|
|
|
|
* First, sort between tags -- conveniently defined in the correct
|
|
|
|
* order for verification.
|
|
|
|
*/
|
|
|
|
if (a->ae_tag < b->ae_tag)
|
|
|
|
return (-1);
|
|
|
|
if (a->ae_tag > b->ae_tag)
|
|
|
|
return (1);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Next compare uids/gids on appropriate types.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (a->ae_tag == ACL_USER || a->ae_tag == ACL_GROUP) {
|
|
|
|
if (a->ae_id < b->ae_id)
|
|
|
|
return (-1);
|
|
|
|
if (a->ae_id > b->ae_id)
|
|
|
|
return (1);
|
|
|
|
|
|
|
|
/* shouldn't be equal, fall through to the invalid case */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't know how to sort multiple entries of the rest--either it's
|
|
|
|
* a bad entry, or there shouldn't be more than one. Ignore and the
|
|
|
|
* validity checker can get it later.
|
|
|
|
*/
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-06-03 14:29:17 +00:00
|
|
|
* _posix1e_acl_sort -- sort ACL entries in POSIX.1e-formatted ACLs.
|
2000-01-15 19:44:27 +00:00
|
|
|
*/
|
2010-06-03 14:29:17 +00:00
|
|
|
void
|
2001-03-13 02:31:32 +00:00
|
|
|
_posix1e_acl_sort(acl_t acl)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
2001-04-24 22:45:41 +00:00
|
|
|
struct acl *acl_int;
|
2000-01-15 19:44:27 +00:00
|
|
|
|
2001-04-24 22:45:41 +00:00
|
|
|
acl_int = &acl->ats_acl;
|
|
|
|
|
|
|
|
qsort(&acl_int->acl_entry[0], acl_int->acl_cnt,
|
|
|
|
sizeof(struct acl_entry), (compare) _posix1e_acl_entry_compare);
|
2000-01-15 19:44:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2000-01-26 04:19:38 +00:00
|
|
|
* acl_posix1e -- in what situations should we acl_sort before submission?
|
|
|
|
* We apply posix1e ACL semantics for any ACL of type ACL_TYPE_ACCESS or
|
|
|
|
* ACL_TYPE_DEFAULT
|
2000-01-15 19:44:27 +00:00
|
|
|
*/
|
|
|
|
int
|
2001-03-13 02:31:32 +00:00
|
|
|
_posix1e_acl(acl_t acl, acl_type_t type)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
|
|
|
|
Add NFSv4 ACL support to libc.
This adds the following functions to the acl(3) API: acl_add_flag_np,
acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np,
acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np,
acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np,
acl_strip_np, acl_get_brand_np. Most of them are similar to what Darwin
does. There are no backward-incompatible changes.
Approved by: rwatson@
2009-06-25 12:46:59 +00:00
|
|
|
if (_acl_brand(acl) != ACL_BRAND_POSIX)
|
|
|
|
return (0);
|
|
|
|
|
2000-01-26 04:19:38 +00:00
|
|
|
return ((type == ACL_TYPE_ACCESS) || (type == ACL_TYPE_DEFAULT));
|
2000-01-15 19:44:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-03-13 02:31:32 +00:00
|
|
|
* _posix1e_acl_check -- given an ACL, check its validity. This is mirrored
|
|
|
|
* from code in sys/kern/kern_acl.c, and if changes are made in one, they
|
|
|
|
* should be made in the other also. This copy of acl_check is made
|
|
|
|
* available * in userland for the benefit of processes wanting to check ACLs
|
2009-08-29 03:17:24 +00:00
|
|
|
* for validity before submitting them to the kernel, or for performing
|
2000-01-15 19:44:27 +00:00
|
|
|
* in userland file system checking. Needless to say, the kernel makes
|
|
|
|
* the real checks on calls to get/setacl.
|
|
|
|
*
|
|
|
|
* See the comments in kernel for explanation -- just briefly, it assumes
|
|
|
|
* an already sorted ACL, and checks based on that assumption. The
|
|
|
|
* POSIX.1e interface, acl_valid(), will perform the sort before calling
|
|
|
|
* this. Returns 0 on success, EINVAL on failure.
|
|
|
|
*/
|
|
|
|
int
|
2001-04-24 22:45:41 +00:00
|
|
|
_posix1e_acl_check(acl_t acl)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
2001-04-24 22:45:41 +00:00
|
|
|
struct acl *acl_int;
|
2000-01-15 19:44:27 +00:00
|
|
|
struct acl_entry *entry; /* current entry */
|
2008-07-13 16:37:51 +00:00
|
|
|
uid_t highest_uid=0, highest_gid=0;
|
2000-01-15 19:44:27 +00:00
|
|
|
int stage = ACL_USER_OBJ;
|
|
|
|
int i = 0;
|
|
|
|
int count_user_obj=0, count_user=0, count_group_obj=0,
|
|
|
|
count_group=0, count_mask=0, count_other=0;
|
|
|
|
|
2001-04-24 22:45:41 +00:00
|
|
|
acl_int = &acl->ats_acl;
|
|
|
|
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: checking acl with %d entries\n",
|
|
|
|
acl->acl_cnt); */
|
2001-04-24 22:45:41 +00:00
|
|
|
while (i < acl_int->acl_cnt) {
|
|
|
|
entry = &acl_int->acl_entry[i];
|
2000-01-15 19:44:27 +00:00
|
|
|
|
|
|
|
if ((entry->ae_perm | ACL_PERM_BITS) != ACL_PERM_BITS)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
switch(entry->ae_tag) {
|
|
|
|
case ACL_USER_OBJ:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: ACL_USER_OBJ\n",
|
|
|
|
i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
if (stage > ACL_USER_OBJ)
|
|
|
|
return (EINVAL);
|
|
|
|
stage = ACL_USER;
|
|
|
|
count_user_obj++;
|
|
|
|
break;
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
case ACL_USER:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: ACL_USER\n", i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
if (stage > ACL_USER)
|
|
|
|
return (EINVAL);
|
|
|
|
stage = ACL_USER;
|
|
|
|
if (count_user && (entry->ae_id <= highest_uid))
|
|
|
|
return (EINVAL);
|
|
|
|
highest_uid = entry->ae_id;
|
|
|
|
count_user++;
|
2009-08-29 03:17:24 +00:00
|
|
|
break;
|
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
case ACL_GROUP_OBJ:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: ACL_GROUP_OBJ\n",
|
|
|
|
i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
if (stage > ACL_GROUP_OBJ)
|
|
|
|
return (EINVAL);
|
|
|
|
stage = ACL_GROUP;
|
|
|
|
count_group_obj++;
|
|
|
|
break;
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
case ACL_GROUP:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: ACL_GROUP\n", i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
if (stage > ACL_GROUP)
|
|
|
|
return (EINVAL);
|
|
|
|
stage = ACL_GROUP;
|
|
|
|
if (count_group && (entry->ae_id <= highest_gid))
|
|
|
|
return (EINVAL);
|
|
|
|
highest_gid = entry->ae_id;
|
|
|
|
count_group++;
|
|
|
|
break;
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
case ACL_MASK:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: ACL_MASK\n", i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
if (stage > ACL_MASK)
|
|
|
|
return (EINVAL);
|
|
|
|
stage = ACL_MASK;
|
|
|
|
count_mask++;
|
|
|
|
break;
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
case ACL_OTHER:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: ACL_OTHER\n", i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
if (stage > ACL_OTHER)
|
|
|
|
return (EINVAL);
|
|
|
|
stage = ACL_OTHER;
|
|
|
|
count_other++;
|
|
|
|
break;
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
default:
|
2001-03-13 02:31:32 +00:00
|
|
|
/* printf("_posix1e_acl_check: %d: INVALID\n", i); */
|
2000-01-15 19:44:27 +00:00
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (count_user_obj != 1)
|
|
|
|
return (EINVAL);
|
2009-08-29 03:17:24 +00:00
|
|
|
|
2000-01-15 19:44:27 +00:00
|
|
|
if (count_group_obj != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
if (count_mask != 0 && count_mask != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
if (count_other != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Given a right-shifted permission (i.e., direct ACL_PERM_* mask), fill
|
|
|
|
* in a string describing the permissions.
|
|
|
|
*/
|
|
|
|
int
|
2001-03-13 02:31:32 +00:00
|
|
|
_posix1e_acl_perm_to_string(acl_perm_t perm, ssize_t buf_len, char *buf)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
|
|
|
|
2001-03-13 02:31:32 +00:00
|
|
|
if (buf_len < _POSIX1E_ACL_STRING_PERM_MAXSIZE + 1) {
|
2000-01-15 19:44:27 +00:00
|
|
|
errno = ENOMEM;
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((perm | ACL_PERM_BITS) != ACL_PERM_BITS) {
|
|
|
|
errno = EINVAL;
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
buf[3] = 0; /* null terminate */
|
|
|
|
|
2001-04-11 02:19:01 +00:00
|
|
|
if (perm & ACL_READ)
|
2000-01-15 19:44:27 +00:00
|
|
|
buf[0] = ACL_STRING_PERM_READ;
|
|
|
|
else
|
|
|
|
buf[0] = ACL_STRING_PERM_NONE;
|
|
|
|
|
2001-04-11 02:19:01 +00:00
|
|
|
if (perm & ACL_WRITE)
|
2000-01-15 19:44:27 +00:00
|
|
|
buf[1] = ACL_STRING_PERM_WRITE;
|
|
|
|
else
|
|
|
|
buf[1] = ACL_STRING_PERM_NONE;
|
|
|
|
|
2001-04-11 02:19:01 +00:00
|
|
|
if (perm & ACL_EXECUTE)
|
2000-01-15 19:44:27 +00:00
|
|
|
buf[2] = ACL_STRING_PERM_EXEC;
|
|
|
|
else
|
|
|
|
buf[2] = ACL_STRING_PERM_NONE;
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* given a string, return a permission describing it
|
|
|
|
*/
|
|
|
|
int
|
2001-03-13 02:31:32 +00:00
|
|
|
_posix1e_acl_string_to_perm(char *string, acl_perm_t *perm)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
|
|
|
acl_perm_t myperm = ACL_PERM_NONE;
|
|
|
|
char *ch;
|
|
|
|
|
|
|
|
ch = string;
|
|
|
|
while (*ch) {
|
|
|
|
switch(*ch) {
|
|
|
|
case ACL_STRING_PERM_READ:
|
2001-04-11 02:19:01 +00:00
|
|
|
myperm |= ACL_READ;
|
2000-01-15 19:44:27 +00:00
|
|
|
break;
|
|
|
|
case ACL_STRING_PERM_WRITE:
|
2001-04-11 02:19:01 +00:00
|
|
|
myperm |= ACL_WRITE;
|
2000-01-15 19:44:27 +00:00
|
|
|
break;
|
|
|
|
case ACL_STRING_PERM_EXEC:
|
2001-04-11 02:19:01 +00:00
|
|
|
myperm |= ACL_EXECUTE;
|
2000-01-15 19:44:27 +00:00
|
|
|
break;
|
|
|
|
case ACL_STRING_PERM_NONE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
ch++;
|
|
|
|
}
|
|
|
|
|
|
|
|
*perm = myperm;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add an ACL entry without doing much checking, et al
|
|
|
|
*/
|
|
|
|
int
|
2001-03-13 02:31:32 +00:00
|
|
|
_posix1e_acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm)
|
2000-01-15 19:44:27 +00:00
|
|
|
{
|
2001-04-24 22:45:41 +00:00
|
|
|
struct acl *acl_int;
|
2000-01-15 19:44:27 +00:00
|
|
|
struct acl_entry *e;
|
|
|
|
|
2001-04-24 22:45:41 +00:00
|
|
|
acl_int = &acl->ats_acl;
|
|
|
|
|
|
|
|
if (acl_int->acl_cnt >= ACL_MAX_ENTRIES) {
|
2000-01-15 19:44:27 +00:00
|
|
|
errno = ENOMEM;
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2001-04-24 22:45:41 +00:00
|
|
|
e = &(acl_int->acl_entry[acl_int->acl_cnt]);
|
2000-01-15 19:44:27 +00:00
|
|
|
e->ae_perm = perm;
|
|
|
|
e->ae_tag = tag;
|
|
|
|
e->ae_id = id;
|
2001-04-24 22:45:41 +00:00
|
|
|
acl_int->acl_cnt++;
|
2000-01-15 19:44:27 +00:00
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
2009-05-22 15:56:43 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new"
|
2016-04-30 01:24:24 +00:00
|
|
|
* counterpart. It's necessary for the old (pre-NFSv4 ACLs) binaries
|
2009-05-22 15:56:43 +00:00
|
|
|
* to work with new libc and kernel. Fixing 'type' for old binaries with
|
|
|
|
* old libc and new kernel is being done by kern/vfs_acl.c:type_unold().
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
_acl_type_unold(acl_type_t type)
|
|
|
|
{
|
Add NFSv4 ACL support to libc.
This adds the following functions to the acl(3) API: acl_add_flag_np,
acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np,
acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np,
acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np,
acl_strip_np, acl_get_brand_np. Most of them are similar to what Darwin
does. There are no backward-incompatible changes.
Approved by: rwatson@
2009-06-25 12:46:59 +00:00
|
|
|
|
2009-05-22 15:56:43 +00:00
|
|
|
switch (type) {
|
|
|
|
case ACL_TYPE_ACCESS_OLD:
|
|
|
|
return (ACL_TYPE_ACCESS);
|
|
|
|
case ACL_TYPE_DEFAULT_OLD:
|
|
|
|
return (ACL_TYPE_DEFAULT);
|
|
|
|
default:
|
|
|
|
return (type);
|
|
|
|
}
|
|
|
|
}
|
Add NFSv4 ACL support to libc.
This adds the following functions to the acl(3) API: acl_add_flag_np,
acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np,
acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np,
acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np,
acl_strip_np, acl_get_brand_np. Most of them are similar to what Darwin
does. There are no backward-incompatible changes.
Approved by: rwatson@
2009-06-25 12:46:59 +00:00
|
|
|
|
|
|
|
char *
|
|
|
|
string_skip_whitespace(char *string)
|
|
|
|
{
|
|
|
|
|
|
|
|
while (*string && ((*string == ' ') || (*string == '\t')))
|
|
|
|
string++;
|
|
|
|
|
|
|
|
return (string);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
string_trim_trailing_whitespace(char *string)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
if (*string == '\0')
|
|
|
|
return;
|
|
|
|
|
|
|
|
end = string + strlen(string) - 1;
|
|
|
|
|
|
|
|
while (end != string) {
|
|
|
|
if ((*end == ' ') || (*end == '\t')) {
|
|
|
|
*end = '\0';
|
|
|
|
end--;
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|