From owner-svn-src-all@FreeBSD.ORG  Sat Jun 20 17:44:04 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 609FC1065670;
	Sat, 20 Jun 2009 17:44:04 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4EE618FC1C;
	Sat, 20 Jun 2009 17:44:04 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5KHi4vh082574;
	Sat, 20 Jun 2009 17:44:04 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5KHi4ft082572;
	Sat, 20 Jun 2009 17:44:04 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906201744.n5KHi4ft082572@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 20 Jun 2009 17:44:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194545 - head/sys/netipx
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2009 17:44:04 -0000

Author: rwatson
Date: Sat Jun 20 17:44:04 2009
New Revision: 194545
URL: http://svn.freebsd.org/changeset/base/194545

Log:
  Invoke the MAC Framework's mac_socket_create_mbuf() entry point when
  generating IPX output for SPX sockets.
  
  Obtained from:	TrustedBSD Project

Modified:
  head/sys/netipx/spx_usrreq.c

Modified: head/sys/netipx/spx_usrreq.c
==============================================================================
--- head/sys/netipx/spx_usrreq.c	Sat Jun 20 17:42:53 2009	(r194544)
+++ head/sys/netipx/spx_usrreq.c	Sat Jun 20 17:44:04 2009	(r194545)
@@ -89,6 +89,8 @@ __FBSDID("$FreeBSD$");
 #include <netipx/spx_timer.h>
 #include <netipx/spx_var.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * SPX protocol implementation.
  */
@@ -813,6 +815,10 @@ send:
 	if (so->so_options & SO_DEBUG || traceallspxs)
 		spx_trace(SA_OUTPUT, cb->s_state, cb, si, 0);
 
+#ifdef MAC
+	mac_socket_create_mbuf(so, m);
+#endif
+
 	if (so->so_options & SO_DONTROUTE)
 		error = ipx_outputfl(m, NULL, IPX_ROUTETOIF);
 	else