From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 27 20:25:55 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A791D106566B;
	Wed, 27 Oct 2010 20:25:55 +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 970C68FC26;
	Wed, 27 Oct 2010 20:25:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RKPtvI027805;
	Wed, 27 Oct 2010 20:25:55 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RKPtsM027803;
	Wed, 27 Oct 2010 20:25:55 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <201010272025.o9RKPtsM027803@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Wed, 27 Oct 2010 20:25:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214433 - projects/jailconf/usr.sbin/jail
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Oct 2010 20:25:55 -0000

Author: jamie
Date: Wed Oct 27 20:25:55 2010
New Revision: 214433
URL: http://svn.freebsd.org/changeset/base/214433

Log:
  Use a little more "ifdef INET6".

Modified:
  projects/jailconf/usr.sbin/jail/config.c

Modified: projects/jailconf/usr.sbin/jail/config.c
==============================================================================
--- projects/jailconf/usr.sbin/jail/config.c	Wed Oct 27 19:01:09 2010	(r214432)
+++ projects/jailconf/usr.sbin/jail/config.c	Wed Oct 27 20:25:55 2010	(r214433)
@@ -580,13 +580,23 @@ ip_params(struct cfjail *j)
 			}
 			if ((cs = strchr(s->s, '/'))) {
 				prefix = strtol(cs + 1, &ep, 10);
-				if (!isip6 && *ep == '.'
+				if (
+#ifdef INET6
+				    !isip6 &&
+#endif
+				    *ep == '.'
 				    ? inet_pton(AF_INET, cs + 1, &addr4) != 1
-				    : *ep || prefix < 0 || prefix >
-				    (isip6 ? 128 : 32)) {
-					jail_warnx(j, isip6
-					    ? "ip6.addr: bad prefixlen \"%s\""
-					    : "ip4.addr: bad netmask \"%s\"",
+				    : *ep || prefix < 0 || prefix > (
+#ifdef INET6
+				      isip6 ? 128 :
+#endif
+				      32)) {
+					jail_warnx(j,
+#ifdef INET6
+					    isip6
+					    ? "ip6.addr: bad prefixlen \"%s\"" :
+#endif
+					    "ip4.addr: bad netmask \"%s\"",
 					    cs);
 					error = -1;	
 				}