From owner-p4-projects@FreeBSD.ORG Tue Dec 9 08:04:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB4F16A4D0; Tue, 9 Dec 2003 08:04:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3A4F16A4CE for ; Tue, 9 Dec 2003 08:04:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAAFE43D28 for ; Tue, 9 Dec 2003 08:04:34 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9G4YXJ001065 for ; Tue, 9 Dec 2003 08:04:34 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9G4Yq3001061 for perforce@freebsd.org; Tue, 9 Dec 2003 08:04:34 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 9 Dec 2003 08:04:34 -0800 (PST) Message-Id: <200312091604.hB9G4Yq3001061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2003 16:04:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=43678 Change 43678 by cvance@cvance_sony on 2003/12/09 08:03:43 Patch up sebsd kernel, just a small collection of miss-merges from the MAC branch. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#8 (text+ko) ==== @@ -107,8 +107,8 @@ static int vfs_mount_alloc(struct vnode *, struct vfsconf *, const char *, struct thread *, struct label *, struct mount **); -static int vfs_domount(struct thread *, struct label *mntlabel, - const char *, char *, int fsflags, void *fsdata, +static int vfs_domount(struct thread *, const char *, char *, + int fsflags, void *fsdata, struct label *mntlabel, int compat); static void gets(char *cp); @@ -640,7 +640,7 @@ * into userspace. */ int -vfs_mount(td, fstype, fspath, fsflags, fsdata) +vfs_mount(td, fstype, fspath, fsflags, fsdata, mntlabel) struct thread *td; const char *fstype; char *fspath; ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#9 (text+ko) ==== @@ -248,7 +248,7 @@ { int error; - MAC_EXTERNALIZE(mount_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(mount, label, elements, outbuf, outbuflen); return (error); } @@ -269,7 +269,7 @@ { int error; - MAC_INTERNALIZE(mount_label, label, string); + MAC_INTERNALIZE(mount, label, string); return (error); } ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#10 (text+ko) ==== @@ -840,7 +840,7 @@ } static void -mac_test_create_devfs_device(struct mount *mp, dev_t dev, +mac_test_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev, struct devfs_dirent *devfs_dirent, struct label *label, const char *fullpath) { @@ -883,7 +883,7 @@ static void mac_test_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel, struct label *fslabel, struct label *mount_arg) { ASSERT_CRED_LABEL(cred->cr_label); @@ -1367,7 +1367,7 @@ static int mac_test_check_cap(struct ucred *cred, cap_value_t capv) { - ASSERT_CRED_LABEL(&cred->cr_label); + ASSERT_CRED_LABEL(cred->cr_label); return 0; }