Fix c194955 - somehow I managed all the new files, tripling their

contents.
author: trasz <trasz@FreeBSD.org> 2009-06-25 13:08:02 +0000
committer: trasz <trasz@FreeBSD.org> 2009-06-25 13:08:02 +0000
commit: 28121c52ac4c22fa1d8539c179f2f4e34f7b35df (patch)
tree: c1c321031cbf9fc94e282288248cee188cdfe955 /lib/libc/posix1e/acl_strip.c
parent: 860d8cee97fd50ca72f3ef61800fb95d989ed515 (diff)
download: FreeBSD-src-28121c52ac4c22fa1d8539c179f2f4e34f7b35df.zip
FreeBSD-src-28121c52ac4c22fa1d8539c179f2f4e34f7b35df.tar.gz
1 files changed, 0 insertions, 400 deletions
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
index 0cb68e2..1dcdfcd 100644
--- a/lib/libc/posix1e/acl_strip.c
+++ b/lib/libc/posix1e/acl_strip.c
@@ -198,403 +198,3 @@ acl_is_trivial_np(const acl_t aclp, int *trivialp)
 		return (-1);
 	}
 }
-/*-
- * Copyright (c) 2001 Chris D. Faulhaber
- * 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 THE VOICES IN HIS HEAD 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <errno.h>
-#include <stdio.h>
-#include <assert.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-/*
- * These two routines from sys/kern/subr_acl_nfs4.c are used by both kernel
- * and libc.
- */
-void	acl_nfs4_sync_acl_from_mode(struct acl *aclp, mode_t mode,
-	    int file_owner_id);
-void	acl_nfs4_sync_mode_from_acl(mode_t *_mode, const struct acl *aclp);
-
-static acl_t
-_nfs4_acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	acl_t newacl;
-	mode_t mode;
-
-	newacl = acl_init(ACL_MAX_ENTRIES);
-	if (newacl == NULL) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-
-	_acl_brand_as(newacl, ACL_BRAND_NFS4);
-
-	acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl));
-	acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1);
-
-	return (newacl);
-}
-
-static acl_t
-_posix1e_acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	acl_t acl_new, acl_old;
-	acl_entry_t entry, entry_new;
-	acl_permset_t perm;
-	acl_tag_t tag;
-	int entry_id, have_mask_entry;
-
-	assert(_acl_brand(aclp) == ACL_BRAND_POSIX);
-
-	acl_old = acl_dup(aclp);
-	if (acl_old == NULL)
-		return (NULL);
-
-	assert(_acl_brand(acl_old) == ACL_BRAND_POSIX);
-
-	have_mask_entry = 0;
-	acl_new = acl_init(ACL_MAX_ENTRIES);
-	if (acl_new == NULL)
-		return (NULL);
-	tag = ACL_UNDEFINED_TAG;
-
-	/* only save the default user/group/other entries */
-	entry_id = ACL_FIRST_ENTRY;
-	while (acl_get_entry(acl_old, entry_id, &entry) == 1) {
-		entry_id = ACL_NEXT_ENTRY;
-
-		assert(_entry_brand(entry) == ACL_BRAND_POSIX);
-
-		if (acl_get_tag_type(entry, &tag) == -1)
-			return (NULL);
-
-		switch(tag) {
-		case ACL_USER_OBJ:
-		case ACL_GROUP_OBJ:
-		case ACL_OTHER:
-			if (acl_get_tag_type(entry, &tag) == -1)
-				return (NULL);
-			if (acl_get_permset(entry, &perm) == -1)
-				return (NULL);
-			if (acl_create_entry(&acl_new, &entry_new) == -1)
-				return (NULL);
-			if (acl_set_tag_type(entry_new, tag) == -1)
-				return (NULL);
-			if (acl_set_permset(entry_new, perm) == -1)
-				return (NULL);
-			if (acl_copy_entry(entry_new, entry) == -1)
-				return (NULL);
-			assert(_entry_brand(entry_new) == ACL_BRAND_POSIX);
-			break;
-		case ACL_MASK:
-			have_mask_entry = 1;
-			break;
-		default:
-			break;
-		}
-	}
-
-	assert(_acl_brand(acl_new) == ACL_BRAND_POSIX);
-
-	if (have_mask_entry && recalculate_mask) {
-		if (acl_calc_mask(&acl_new) == -1)
-			return (NULL);
-	}
-
-	return (acl_new);
-}
-
-acl_t
-acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_strip_np(aclp, recalculate_mask));
-
-	case ACL_BRAND_POSIX:
-		return (_posix1e_acl_strip_np(aclp, recalculate_mask));
-
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-}
-
-/*
- * Return 1, if ACL is trivial, 0 otherwise.
- *
- * ACL is trivial, iff its meaning could be fully expressed using just file
- * mode.  In other words, ACL is trivial iff it doesn't have "+" to the right
- * of the mode bits in "ls -l" output ;-)
- */
-int
-acl_is_trivial_np(const acl_t aclp, int *trivialp)
-{
-	acl_t tmpacl;
-	int differs;
-
-	if (aclp == NULL || trivialp == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_POSIX:
-		if (aclp->ats_acl.acl_cnt == 3)
-			*trivialp = 1;
-		else
-			*trivialp = 0;
-
-		return (0);
-
-	case ACL_BRAND_NFS4:
-		/*
-		 * Calculate trivial ACL - using acl_strip_np - and compare
-		 * with the original.
-		 */
-		tmpacl = acl_strip_np(aclp, 0);
-		if (tmpacl == NULL)
-			return (-1);
-
-		differs = _acl_differs(aclp, tmpacl);
-		acl_free(tmpacl);
-
-		if (differs)
-			*trivialp = 0;
-		else
-			*trivialp = 1;
-
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-/*-
- * Copyright (c) 2001 Chris D. Faulhaber
- * 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 THE VOICES IN HIS HEAD 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <errno.h>
-#include <stdio.h>
-#include <assert.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-/*
- * These two routines from sys/kern/subr_acl_nfs4.c are used by both kernel
- * and libc.
- */
-void	acl_nfs4_sync_acl_from_mode(struct acl *aclp, mode_t mode,
-	    int file_owner_id);
-void	acl_nfs4_sync_mode_from_acl(mode_t *_mode, const struct acl *aclp);
-
-static acl_t
-_nfs4_acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	acl_t newacl;
-	mode_t mode;
-
-	newacl = acl_init(ACL_MAX_ENTRIES);
-	if (newacl == NULL) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-
-	_acl_brand_as(newacl, ACL_BRAND_NFS4);
-
-	acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl));
-	acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1);
-
-	return (newacl);
-}
-
-static acl_t
-_posix1e_acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	acl_t acl_new, acl_old;
-	acl_entry_t entry, entry_new;
-	acl_permset_t perm;
-	acl_tag_t tag;
-	int entry_id, have_mask_entry;
-
-	assert(_acl_brand(aclp) == ACL_BRAND_POSIX);
-
-	acl_old = acl_dup(aclp);
-	if (acl_old == NULL)
-		return (NULL);
-
-	assert(_acl_brand(acl_old) == ACL_BRAND_POSIX);
-
-	have_mask_entry = 0;
-	acl_new = acl_init(ACL_MAX_ENTRIES);
-	if (acl_new == NULL)
-		return (NULL);
-	tag = ACL_UNDEFINED_TAG;
-
-	/* only save the default user/group/other entries */
-	entry_id = ACL_FIRST_ENTRY;
-	while (acl_get_entry(acl_old, entry_id, &entry) == 1) {
-		entry_id = ACL_NEXT_ENTRY;
-
-		assert(_entry_brand(entry) == ACL_BRAND_POSIX);
-
-		if (acl_get_tag_type(entry, &tag) == -1)
-			return (NULL);
-
-		switch(tag) {
-		case ACL_USER_OBJ:
-		case ACL_GROUP_OBJ:
-		case ACL_OTHER:
-			if (acl_get_tag_type(entry, &tag) == -1)
-				return (NULL);
-			if (acl_get_permset(entry, &perm) == -1)
-				return (NULL);
-			if (acl_create_entry(&acl_new, &entry_new) == -1)
-				return (NULL);
-			if (acl_set_tag_type(entry_new, tag) == -1)
-				return (NULL);
-			if (acl_set_permset(entry_new, perm) == -1)
-				return (NULL);
-			if (acl_copy_entry(entry_new, entry) == -1)
-				return (NULL);
-			assert(_entry_brand(entry_new) == ACL_BRAND_POSIX);
-			break;
-		case ACL_MASK:
-			have_mask_entry = 1;
-			break;
-		default:
-			break;
-		}
-	}
-
-	assert(_acl_brand(acl_new) == ACL_BRAND_POSIX);
-
-	if (have_mask_entry && recalculate_mask) {
-		if (acl_calc_mask(&acl_new) == -1)
-			return (NULL);
-	}
-
-	return (acl_new);
-}
-
-acl_t
-acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_strip_np(aclp, recalculate_mask));
-
-	case ACL_BRAND_POSIX:
-		return (_posix1e_acl_strip_np(aclp, recalculate_mask));
-
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-}
-
-/*
- * Return 1, if ACL is trivial, 0 otherwise.
- *
- * ACL is trivial, iff its meaning could be fully expressed using just file
- * mode.  In other words, ACL is trivial iff it doesn't have "+" to the right
- * of the mode bits in "ls -l" output ;-)
- */
-int
-acl_is_trivial_np(const acl_t aclp, int *trivialp)
-{
-	acl_t tmpacl;
-	int differs;
-
-	if (aclp == NULL || trivialp == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_POSIX:
-		if (aclp->ats_acl.acl_cnt == 3)
-			*trivialp = 1;
-		else
-			*trivialp = 0;
-
-		return (0);
-
-	case ACL_BRAND_NFS4:
-		/*
-		 * Calculate trivial ACL - using acl_strip_np - and compare
-		 * with the original.
-		 */
-		tmpacl = acl_strip_np(aclp, 0);
-		if (tmpacl == NULL)
-			return (-1);
-
-		differs = _acl_differs(aclp, tmpacl);
-		acl_free(tmpacl);
-
-		if (differs)
-			*trivialp = 0;
-		else
-			*trivialp = 1;
-
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
author	trasz <trasz@FreeBSD.org>	2009-06-25 13:08:02 +0000
committer	trasz <trasz@FreeBSD.org>	2009-06-25 13:08:02 +0000
commit	28121c52ac4c22fa1d8539c179f2f4e34f7b35df (patch)
tree	c1c321031cbf9fc94e282288248cee188cdfe955 /lib/libc/posix1e/acl_strip.c
parent	860d8cee97fd50ca72f3ef61800fb95d989ed515 (diff)
download	FreeBSD-src-28121c52ac4c22fa1d8539c179f2f4e34f7b35df.zip FreeBSD-src-28121c52ac4c22fa1d8539c179f2f4e34f7b35df.tar.gz