From owner-p4-projects@FreeBSD.ORG Thu Jun 3 08:24:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 838591065679; Thu, 3 Jun 2010 08:24:43 +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 446FD1065677 for ; Thu, 3 Jun 2010 08:24:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1763B8FC18 for ; Thu, 3 Jun 2010 08:24:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o538OgN5033271 for ; Thu, 3 Jun 2010 08:24:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o538OgT6033269 for perforce@freebsd.org; Thu, 3 Jun 2010 08:24:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 3 Jun 2010 08:24:42 GMT Message-Id: <201006030824.o538OgT6033269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 08:24:43 -0000 http://p4web.freebsd.org/@@179130?ac=10 Change 179130 by rwatson@rwatson_vimage_client on 2010/06/03 08:24:04 Correct merge nits from integration. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/posix4_mib.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#11 (text+ko) ==== @@ -853,7 +853,7 @@ * SYF_CAPENABLED. */ if (error == 0) { - if (!(callp->sy_flags & SYF_CAPENABLED) && + if (!(sa->callp->sy_flags & SYF_CAPENABLED) && (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) error = ENOSYS; } ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#13 (text+ko) ==== @@ -1025,7 +1025,7 @@ * SYF_CAPENABLED. */ if (error == 0) { - if (!(callp->sy_flags & SYF_CAPENABLED) && + if (!(sa->callp->sy_flags & SYF_CAPENABLED) && (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) error = ENOSYS; } ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/posix4_mib.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ SYSCTL_DECL(_p1003_1b); #define P1B_SYSCTL(num, name) \ - SYSCTL_INT(_p1003_1b, num, name, CTLFLAG_RD | CTFLAG_CAPRD, \ + SYSCTL_INT(_p1003_1b, num, name, CTLFLAG_RD | CTLFLAG_CAPRD, \ facility + num - 1, 0, ""); #define P1B_SYSCTL_RW(num, name) \ SYSCTL_PROC(_p1003_1b, num, name, CTLTYPE_INT | CTLFLAG_RW | \ @@ -68,11 +68,11 @@ SYSCTL_DECL(_kern_p1003_1b); #define P1B_SYSCTL(num, name) \ - SYSCTL_INT(_kern_p1003_1b, OID_AUTO, name, CTLFLAG_RD | CTFLAG_CAPRD, \ + SYSCTL_INT(_kern_p1003_1b, OID_AUTO, name, CTLFLAG_RD | CTLFLAG_CAPRD, \ facility + num - 1, 0, ""); #define P1B_SYSCTL_RW(num, name) \ SYSCTL_PROC(_p1003_1b, OID_AUTO, name, CTLTYPE_INT | CTLFLAG_RW | \ - CTFLAG_CAPRD, NULL, num, p31b_sysctl_proc, "I", ""); + CTLFLAG_CAPRD, NULL, num, p31b_sysctl_proc, "I", ""); SYSCTL_NODE(_kern, OID_AUTO, p1003_1b, CTLFLAG_RW, 0, "P1003.1B"); #endif