From owner-svn-src-stable-9@FreeBSD.ORG  Sat Dec  1 16:44:34 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3B40F59C;
 Sat,  1 Dec 2012 16:44:34 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1DF678FC08;
 Sat,  1 Dec 2012 16:44:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1GiXSE049810;
 Sat, 1 Dec 2012 16:44:33 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB1GiX19049809;
 Sat, 1 Dec 2012 16:44:33 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212011644.qB1GiX19049809@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 1 Dec 2012 16:44:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243757 - stable/9/etc/rc.d
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Dec 2012 16:44:34 -0000

Author: eadler
Date: Sat Dec  1 16:44:33 2012
New Revision: 243757
URL: http://svnweb.freebsd.org/changeset/base/243757

Log:
  MFC r243080:
  	Only pass ip[46].addr when _addrl contains a value
  
  Approved by:	cperciva (implicit)

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

Modified: stable/9/etc/rc.d/jail
==============================================================================
--- stable/9/etc/rc.d/jail	Sat Dec  1 15:54:54 2012	(r243756)
+++ stable/9/etc/rc.d/jail	Sat Dec  1 16:44:33 2012	(r243757)
@@ -656,7 +656,8 @@ jail_start()
 		done
 
 		eval ${_setfib} jail -n ${_jail} ${_flags} -i -c path=${_rootdir} host.hostname=${_hostname} \
-			ip4.addr=\"${_addrl}\" ip6.addr=\"${_addr6l}\" ${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
+			${_addrl:+ip4.addr=\"${_addrl}\"} ${_addr6l:+ip6.addr=\"${_addr6l}\"} \
+			${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
 			</dev/null
 
 		if [ "$?" -eq 0 ] ; then