From owner-p4-projects@FreeBSD.ORG  Sun Aug 31 18:00:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08F641065680; Sun, 31 Aug 2008 18:00:06 +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 A8CA21065671
	for <perforce@freebsd.org>; Sun, 31 Aug 2008 18:00:05 +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 8B2428FC21
	for <perforce@freebsd.org>; Sun, 31 Aug 2008 18:00:05 +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 m7VI05aM085343
	for <perforce@freebsd.org>; Sun, 31 Aug 2008 18:00:05 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VI05lJ085341
	for perforce@freebsd.org; Sun, 31 Aug 2008 18:00:05 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 31 Aug 2008 18:00:05 GMT
Message-Id: <200808311800.m7VI05lJ085341@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 148923 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: Sun, 31 Aug 2008 18:00:06 -0000

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

Change 148923 by trasz@trasz_traszkan on 2008/08/31 17:59:20

	Fix buildworld.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#10 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#2 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#11 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/stack_protector.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#31 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_stack_protector.c#1 add

Differences ...

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

@@ -1,6 +1,6 @@
 # $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.19 2006/07/07 14:02:17 rwatson Exp $
 
-.PATH: ${.CURDIR}/posix1e
+.PATH: ${.CURDIR}/posix1e ${.CURDIR}/../../sys/kern/
 
 SRCS+=	acl_branding.c			\
 	acl_calc_mask.c			\
@@ -28,7 +28,7 @@
 	mac_exec.c			\
 	mac_get.c			\
 	mac_set.c			\
-	${.CURDIR/../../sys/kern/subr_acl_nfs4.c
+	subr_acl_nfs4.c
 
 SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
 

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

@@ -34,7 +34,7 @@
 int
 __oldacl_get_perm_np(acl_permset_t permset_d, oldacl_perm_t perm)
 {
-	return (acl_get_perm_np(permset_p, perm));
+	return (acl_get_perm_np(permset_d, perm));
 }
 
 int

==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#11 (text+ko) ====

@@ -1612,7 +1612,7 @@
 kern/sched_4bsd.c		optional sched_4bsd
 kern/sched_ule.c		optional sched_ule
 kern/serdev_if.m		standard
-kern/stack_protector.c		standard \
+kern/subr_stack_protector.c	standard \
 	compile-with "${NORMAL_C:N-fstack-protector*}"
 kern/subr_acl_posix1e.c		standard
 kern/subr_acl_nfs4.c		standard

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#31 (text+ko) ====

@@ -44,7 +44,8 @@
 #include <sys/acl.h>
 #else
 #include <errno.h>
-#include <sys/types.h>
+#include <assert.h>
+#include <sys/acl.h>
 #include <sys/stat.h>
 #define KASSERT(a, b) assert(a)
 #define CTASSERT(a)