From owner-p4-projects@FreeBSD.ORG  Sat Aug 30 14:50: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 EB9E4106567B; Sat, 30 Aug 2008 14:50:30 +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 AFC1B1065670
	for <perforce@freebsd.org>; Sat, 30 Aug 2008 14:50:30 +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 9CB9C8FC1F
	for <perforce@freebsd.org>; Sat, 30 Aug 2008 14:50:30 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UEoUuc047656
	for <perforce@freebsd.org>; Sat, 30 Aug 2008 14:50:30 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UEoUhv047654
	for perforce@freebsd.org; Sat, 30 Aug 2008 14:50:30 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 30 Aug 2008 14:50:30 GMT
Message-Id: <200808301450.m7UEoUhv047654@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 148847 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: Sat, 30 Aug 2008 14:50:31 -0000

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

Change 148847 by trasz@trasz_traszkan on 2008/08/30 14:50:06

	Include kern/subr_acl_nfs4.c in a libc in somewhat nicer way.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#8 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#5 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#8 (text+ko) ====

@@ -26,7 +26,8 @@
 	mac.c				\
 	mac_exec.c			\
 	mac_get.c			\
-	mac_set.c
+	mac_set.c			\
+	${.CURDIR/../../sys/kern/subr_acl_nfs4.c
 
 SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
 

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#5 (text+ko) ====

@@ -26,16 +26,20 @@
 
 /* XXX: remove all the err(3) calls. */
 #include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <assert.h>
 #include <sys/acl.h>
 
+#include "acl_support.h"
+
 /*
- * XXX: I don't think this is the correct way of doing stuff.
+ * These two routines from sys/kern/subr_acl_nfs4.c are used by both kernel
+ * and libc.
  */
-#include "/sys/kern/subr_acl_nfs4.c"
-
-#include "acl_support.h"
+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)