Date: Sun, 31 Aug 2008 18:00:05 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 148923 for review Message-ID: <200808311800.m7VI05lJ085341@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808311800.m7VI05lJ085341>