From owner-p4-projects@FreeBSD.ORG  Mon Feb  4 12:10:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AABB816A478; Mon,  4 Feb 2008 12:10:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7066616A46E
	for <perforce@freebsd.org>; Mon,  4 Feb 2008 12:10:31 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B30313C4F6
	for <perforce@freebsd.org>; Mon,  4 Feb 2008 12:10:31 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m14CAVM6062486
	for <perforce@freebsd.org>; Mon, 4 Feb 2008 12:10:31 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m14CAV7q062483
	for perforce@freebsd.org; Mon, 4 Feb 2008 12:10:31 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 4 Feb 2008 12:10:31 GMT
Message-Id: <200802041210.m14CAV7q062483@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134773 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Feb 2008 12:10:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=134773

Change 134773 by rwatson@rwatson_sesame on 2008/02/04 12:10:18

	Submit chicken scratchings I found on an old notebook.  Nothing to
	see, move along.

Affected files ...

.. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/acl.h#6 edit

Differences ...

==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/acl.h#6 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999-2001, 2005 Robert N. M. Watson
+ * Copyright (c) 1999-2001, 2005-2006 Robert N. M. Watson
  * All rights reserved.
  *
  * This software was developed by Robert Watson for the TrustedBSD Project.
@@ -57,13 +57,23 @@
 };
 typedef struct acl_entry	*acl_entry_t;
 
-/* internal ACL structure */
-struct acl {
+/*
+ * In the first FreeBSD POSIX.1e implementation, there was a fixed maximum
+ * number of ACEs in the ACL array, ACL_MAX_ENTRIES.  In the new version, a
+ * variable sizes storage array is supported.  An old version of the
+ * structure is provided for compatibility purposes.
+ */
+struct acl_old {
 	int			acl_cnt;
 	struct acl_entry	acl_entry[ACL_MAX_ENTRIES];
 };
 
-/* external ACL structure */
+struct acl {
+	int			acl_len;	/* Space for ACEs in array. */
+	int			acl_cnt;	/* In use ACEs in array. */
+	struct acl_entry	*acl_entries;	/* ACE array. */
+};
+
 struct acl_t_struct {
 	struct acl		ats_acl;
 	int			ats_cur_entry;
@@ -75,6 +85,7 @@
  */
 #define	ACL_TYPE_ACCESS		0x00000000
 #define	ACL_TYPE_DEFAULT	0x00000001
+#define	ACL_TYPE_NFSV4		0x00000002
 
 /*
  * Possible entry_id values for acl_get_entry()