From owner-svn-src-stable@FreeBSD.ORG  Mon Dec  9 21:32:37 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61DCF3FC;
 Mon,  9 Dec 2013 21:32:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DC821228;
 Mon,  9 Dec 2013 21:32:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9LWbxj098516;
 Mon, 9 Dec 2013 21:32:37 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9LWb28098515;
 Mon, 9 Dec 2013 21:32:37 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201312092132.rB9LWb28098515@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 9 Dec 2013 21:32:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259141 - stable/10/etc/rc.d
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Dec 2013 21:32:37 -0000

Author: peter
Date: Mon Dec  9 21:32:36 2013
New Revision: 259141
URL: http://svnweb.freebsd.org/changeset/base/259141

Log:
  MFC r259094 - Fix undocumented side effect of r256256 that changes/breaks
  existing jails.  This burned us in the freebsd cluster yesterday.

Modified:
  stable/10/etc/rc.d/jail
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/jail
==============================================================================
--- stable/10/etc/rc.d/jail	Mon Dec  9 21:08:52 2013	(r259140)
+++ stable/10/etc/rc.d/jail	Mon Dec  9 21:32:36 2013	(r259141)
@@ -319,8 +319,8 @@ jail_extract_address()
 		_mask=${_mask:-/32}
 
 	elif [ "${_type}" = "inet6" ]; then
-		# In case _maske is not set for IPv6, use /64.
-		_mask=${_mask:-/64}
+		# In case _maske is not set for IPv6, use /128.
+		_mask=${_mask:-/128}
 	fi
 }