From owner-svn-src-head@FreeBSD.ORG  Sat Nov 29 16:17:39 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A86211065670;
	Sat, 29 Nov 2008 16:17:39 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A2F6C8FC16;
	Sat, 29 Nov 2008 16:17:39 +0000 (UTC) (envelope-from bz@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 mATGHdB4056139;
	Sat, 29 Nov 2008 16:17:39 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mATGHdrp056138;
	Sat, 29 Nov 2008 16:17:39 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200811291617.mATGHdrp056138@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 29 Nov 2008 16:17:39 +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: r185441 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Nov 2008 16:17:39 -0000

Author: bz
Date: Sat Nov 29 16:17:39 2008
New Revision: 185441
URL: http://svn.freebsd.org/changeset/base/185441

Log:
  Unbreak the no-networks (no INET/6) build that I broke with
  the commit in r185435.
  
  Pointyhat:	no, but I could need a ski cap for the winter

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Sat Nov 29 14:58:58 2008	(r185440)
+++ head/sys/kern/kern_jail.c	Sat Nov 29 16:17:39 2008	(r185441)
@@ -532,11 +532,13 @@ kern_jail(struct thread *td, struct jail
 
 	sx_xlock(&allprison_lock);
 	/* Make sure we cannot run into problems with ambiguous bind()ings. */
+#if defined(INET) || defined(INET6)
 	error = prison_check_conflicting_ips(pr);
 	if (error) {
 		sx_xunlock(&allprison_lock);
 		goto e_dropcpuset;
 	}
+#endif
 
 	/* Determine next pr_id and add prison to allprison list. */
 	tryprid = lastprid + 1;