Date: Wed, 12 Nov 2003 09:39:00 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42141 for review Message-ID: <200311121739.hACHd0n9003989@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=42141 Change 42141 by peter@peter_daintree on 2003/11/12 09:38:03 IFC @42140 Affected files ... .. //depot/projects/hammer/sys/kern/vfs_mount.c#17 edit .. //depot/projects/hammer/sys/netgraph/ng_message.h#6 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#13 integrate Differences ... ==== //depot/projects/hammer/sys/kern/vfs_mount.c#17 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.113 2003/11/12 02:54:47 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.114 2003/11/12 17:09:12 peter Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -1302,7 +1302,7 @@ vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK); path = malloc(MNAMELEN, M_MOUNT, M_WAITOK); vfsname[0] = path[0] = 0; - sprintf(patt, "%%%d[a-z0-9]:%%%zds", MFSNAMELEN, MNAMELEN); + sprintf(patt, "%%%d[a-z0-9]:%%%ds", MFSNAMELEN, MNAMELEN); if (sscanf(mountfrom, patt, vfsname, path) < 1) goto done; ==== //depot/projects/hammer/sys/netgraph/ng_message.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Julian Elischer <julian@freebsd.org> * - * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.20 2003/11/12 09:10:11 harti Exp $ + * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.21 2003/11/12 17:03:40 harti Exp $ * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $ */ @@ -98,7 +98,7 @@ * Interfaces within the kernel are defined by a different * value (see NG_ABI_VERSION in netgraph.g) */ -#define NG_VERSION 5 +#define NG_VERSION 6 /* Flags field flags */ #define NGF_ORIG 0x00000000 /* the msg is the original request */ ==== //depot/projects/hammer/sys/security/mac_test/mac_test.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.32 2003/11/12 03:14:31 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.33 2003/11/12 17:21:57 jhb Exp $ */ /* @@ -1065,7 +1065,7 @@ mac_test_check_kenv_dump(struct ucred *cred) { - ASSERT_CRED_LABEL(&cred->cr_label); + ASSERT_CRED_LABEL(cred->cr_label); return (0); }help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311121739.hACHd0n9003989>