PERFORCE change 148847 for review

[Edward Tomasz Napierala]

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

Change 148847 by trasz at 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)