From owner-p4-projects@FreeBSD.ORG  Mon Jun 30 20:13:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 67F5D1065672; Mon, 30 Jun 2008 20:13:55 +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 292D7106564A
	for <perforce@freebsd.org>; Mon, 30 Jun 2008 20:13:55 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 186AE8FC1B
	for <perforce@freebsd.org>; Mon, 30 Jun 2008 20:13:55 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5UKDsut031752
	for <perforce@freebsd.org>; Mon, 30 Jun 2008 20:13:54 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5UKDsuF031750
	for perforce@freebsd.org; Mon, 30 Jun 2008 20:13:54 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 30 Jun 2008 20:13:54 GMT
Message-Id: <200806302013.m5UKDsuF031750@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144384 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, 30 Jun 2008 20:13:55 -0000

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

Change 144384 by trasz@trasz_traszkan on 2008/06/30 20:13:52

	Rename a flag to match Darwin.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/unistd.h#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#4 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/unistd.h#3 (text+ko) ====

@@ -153,7 +153,7 @@
 #define	_PC_CAP_PRESENT		61
 #define	_PC_INF_PRESENT		62
 #define	_PC_MAC_PRESENT		63
-#define	_ACL_ACE_ENABLED	64
+#define	_PC_EXTENDED_SECURITY_NP	64
 #endif
 
 /* From OpenSolaris, used by SEEK_DATA/SEEK_HOLE. */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#4 (text+ko) ====

@@ -2103,11 +2103,15 @@
 #endif
 		break;
 
-	case _ACL_ACE_ENABLED:
+	case _PC_EXTENDED_SECURITY_NP:
+#ifdef UFS_ACL
 		if (ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS)
 			*ap->a_retval = 1;
 		else
 			*ap->a_retval = 0;
+#else
+		*ap->a_retval = 0;
+#endif
 		break;
 
 	case _PC_ACL_PATH_MAX: