From owner-p4-projects@FreeBSD.ORG  Thu Nov 10 16:38:59 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6ABA316A421; Thu, 10 Nov 2005 16:38:59 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 02C0316A41F
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 16:38:59 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C43D043D45
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 16:38:58 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAAGcwqG096707
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 16:38:58 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAGcwj4096704
	for perforce@freebsd.org; Thu, 10 Nov 2005 16:38:58 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 10 Nov 2005 16:38:58 GMT
Message-Id: <200511101638.jAAGcwj4096704@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86602 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: Thu, 10 Nov 2005 16:39:00 -0000

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

Change 86602 by millert@millert_ibook on 2005/11/10 16:38:30

	Make ipctrace work again after some intervening framework changes.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.c#3 (text+ko) ====

@@ -69,7 +69,7 @@
 static void
 ipctrace_init()
 {
-
+	printf("ipctrace:: init\n");
 	tbuf_lock = mutex_alloc(ETAP_MISC_PRINTF);
 	tbuf_size = sizeof(tbuf);
 	tbuf_cur = tbuf;
@@ -151,7 +151,7 @@
  */
 
 static int
-ipctrace_syscall(struct proc *p, int call, void *arg)
+ipctrace_syscall(struct proc *p, int call, void *arg, int *retval)
 {
 	kern_return_t kr;
 	struct ipctrace_call_get out;
@@ -207,7 +207,7 @@
 
 static int
 ipctrace_externalize_label(struct label *l, char *element_name,
-    struct sbuf *sb, int *claimed)
+    struct sbuf *sb)
 {
 	struct ipctrace_label *ll;
 	ll = SLOT(l);
@@ -215,7 +215,6 @@
 	if (ll == NULL || strcmp(element_name, "ipctrace"))
 		return (0);
 
-	(*claimed)++;
 	if (ll->portn >= 0) {
 		if (strcmp(ll->itask, ll->ttask))
 			sbuf_printf(sb, "P:%s:%s:%d", ll->itask, ll->ttask, 
@@ -389,9 +388,12 @@
 	.mpo_execve_will_transition = ipctrace_execve_will_transition
 };
 
+static char *labelnamespaces[] = {"ipctrace"};
 struct mac_policy_conf ipctrace_policy_conf = {
 	"ipctrace",		/* policy name */
 	"IPC Trace Module",	/* full name */
+	labelnamespaces,	/* label namespaces */
+	1,			/* namespace count */
 	&ipctrace_ops,		/* policy operations */
 	0,			/* loadtime flags*/
 	&ipctrace_slot,		/* security field */