d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it possible to actually use NFSv4 permission bits with acl_set_perm(3)

Browse Source 
and acl_delete_perm(3).  It went undetected, because neither setfacl(1)
nor Samba use this routines.  D'oh.

MFC after:	1 week
This commit is contained in:
Edward Tomasz Napierala 2010-05-13 16:42:01 +00:00
parent 4e28b70950
commit 6a3cf4c80b
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/libc/posix1e/acl_perm.c
View File

@ -35,6 +35,20 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <string.h>
static int
_perm_is_invalid(acl_perm_t perm)
{
/* Check if more than a single bit is set. */
if ((perm & -perm) == perm &&
(perm & (ACL_POSIX1E_BITS | ACL_NFS4_PERM_BITS)) == perm)
return (0);
errno = EINVAL;
return (1);
}
/*
* acl_add_perm() (23.4.1): add the permission contained in perm to the
* permission set permset_d
@ -43,18 +57,17 @@ int
acl_add_perm(acl_permset_t permset_d, acl_perm_t perm)
{
if (permset_d) {
switch(perm) {
case ACL_READ:
case ACL_WRITE:
case ACL_EXECUTE:
*permset_d |= perm;
return (0);
}
if (permset_d == NULL) {
errno = EINVAL;
return (-1);
}
errno = EINVAL;
return (-1);
if (_perm_is_invalid(perm))
return (-1);
*permset_d |= perm;
return (0);
}
/*
@ -83,16 +96,15 @@ int
acl_delete_perm(acl_permset_t permset_d, acl_perm_t perm)
{
if (permset_d) {
switch(perm) {
case ACL_READ:
case ACL_WRITE:
case ACL_EXECUTE:
*permset_d &= ~(perm & ACL_PERM_BITS);
return (0);
}
if (permset_d == NULL) {
errno = EINVAL;
return (-1);
}
errno = EINVAL;
return (-1);
if (_perm_is_invalid(perm))
return (-1);
*permset_d &= ~perm;
return (0);
}