From owner-svn-src-all@FreeBSD.ORG  Wed Jun 24 22:06:57 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 423E010656B1;
	Wed, 24 Jun 2009 22:06:57 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 304408FC1F;
	Wed, 24 Jun 2009 22:06:57 +0000 (UTC)
	(envelope-from jamie@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 n5OM6uIx031487;
	Wed, 24 Jun 2009 22:06:56 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5OM6ulP031485;
	Wed, 24 Jun 2009 22:06:56 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <200906242206.n5OM6ulP031485@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Wed, 24 Jun 2009 22:06:56 +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: r194923 - head/sys/kern
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: Wed, 24 Jun 2009 22:06:57 -0000

Author: jamie
Date: Wed Jun 24 22:06:56 2009
New Revision: 194923
URL: http://svn.freebsd.org/changeset/base/194923

Log:
  Wrap a PR_VNET inside "#ifdef VIMAGE" since that the only place it applies.
  bz wants the blame for this.
  
  Noticed by:	rwatson
  Approved by:	bz (mentor)

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Wed Jun 24 22:04:04 2009	(r194922)
+++ head/sys/kern/kern_jail.c	Wed Jun 24 22:06:56 2009	(r194923)
@@ -3151,9 +3151,11 @@ prison_check_af(struct ucred *cred, int 
 	KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
 
 	pr = cred->cr_prison;
+#ifdef VIMAGE
 	/* Prisons with their own network stack are not limited. */
 	if (pr->pr_flags & PR_VNET)
 		return (0);
+#endif
 
 	error = 0;
 	switch (af)