From owner-trustedbsd-cvs@FreeBSD.ORG  Mon Jan 22 16:06:55 2007
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A4D2816A403
	for <trustedbsd-cvs@freebsd.org>; Mon, 22 Jan 2007 16:06:55 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A67713C457
	for <trustedbsd-cvs@freebsd.org>; Mon, 22 Jan 2007 16:06:55 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53])
	by cyrus.watson.org (Postfix) with ESMTP id 7503D4BB12
	for <trustedbsd-cvs@trustedbsd.org>;
	Mon, 22 Jan 2007 11:06:52 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54])
	by mx2.freebsd.org (Postfix) with ESMTP id BBABC56F01;
	Mon, 22 Jan 2007 16:06:49 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B318D16A403; Mon, 22 Jan 2007 16:06:49 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6FF7F16A401
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:06:49 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F3C713C442
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:06:49 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MG6nDp027523
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:06:49 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG6nC1027520
	for perforce@freebsd.org; Mon, 22 Jan 2007 16:06:49 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 22 Jan 2007 16:06:49 GMT
Message-Id: <200701221606.l0MG6nC1027520@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 113347 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jan 2007 16:06:55 -0000

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

Change 113347 by millert@millert_macbook on 2007/01/22 16:06:13

	Add missing mac_framework include.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#6 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#6 (text+ko) ====

@@ -111,6 +111,10 @@
 #include <netinet/udp_var.h>
 #include <netinet/bootp.h>
 
+#ifdef MAC
+#include <security/mac_framework.h>
+#endif
+
 #include <sys/kdebug.h>
 
 #define DBG_LAYER_BEG		NETDBG_CODE(DBG_NETIP, 0)

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#9 (text+ko) ====

@@ -1711,7 +1711,7 @@
 		if (thread->label == oldlabel)
 			lh_release(oldlabel);
 	}
-	task->label = labelh_modify(task->label, 0);
+	task->label = labelh_modify(task->label, 1);
 	mac_task_label_update(pl, &task->maclabel);
 	/*
 	 * Replace the old label in the task's threads with the new one.
@@ -1752,7 +1752,7 @@
 		if (thread->label == oldlabel)
 			lh_release(oldlabel);
 	}
-	task->label = labelh_modify(task->label, 0);
+	task->label = labelh_modify(task->label, 1);
 	(*f)(&task->maclabel, arg);
 	/*
 	 * Replace the old label in the task's threads with the new one.