From owner-svn-src-head@FreeBSD.ORG Thu Nov 15 17:23:58 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C0DF914 for ; Thu, 15 Nov 2012 17:23:58 +0000 (UTC) (envelope-from postmaster@mailpod.hostingplatform.com) Received: from atl4mhob06.myregisteredsite.com (atl4mhob06.myregisteredsite.com [209.17.115.44]) by mx1.freebsd.org (Postfix) with ESMTP id D13F18FC12 for ; Thu, 15 Nov 2012 17:23:57 +0000 (UTC) Received: from mailpod1.hostingplatform.com (mailpod1.networksolutionsemail.com [206.188.198.65]) by atl4mhob06.myregisteredsite.com (8.14.4/8.14.4) with ESMTP id qAFHNu9C012454 for ; Thu, 15 Nov 2012 12:23:56 -0500 Received: (qmail 3643 invoked by uid 0); 15 Nov 2012 15:58:53 -0000 Received: (qmail 26453 invoked by uid 0); 15 Nov 2012 15:07:47 -0000 Received: from unknown (HELO atl4mhib47.myregisteredsite.com) (209) by 0 with SMTP; 15 Nov 2012 15:07:47 -0000 Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by atl4mhib47.myregisteredsite.com (8.14.4/8.14.4) with ESMTP id qAFF7kDw027486 for ; Thu, 15 Nov 2012 10:07:46 -0500 Received: from hub.freebsd.org (hub.FreeBSD.org [8.8.178.136]) by mx2.freebsd.org (Postfix) with ESMTP id 9563B3B78AB; Thu, 15 Nov 2012 15:07:29 +0000 (UTC) Received: from hub.FreeBSD.org (hub.FreeBSD.org [8.8.178.136]) by hub.freebsd.org (Postfix) with ESMTP id 3F45A1289; Thu, 15 Nov 2012 15:07:30 +0000 (UTC) (envelope-from owner-svn-src-all@freebsd.org) Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0518644; Thu, 15 Nov 2012 15:06:15 +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 95C158FC0C; Thu, 15 Nov 2012 15:06:15 +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 qAFF6Fbk004034; Thu, 15 Nov 2012 15:06:15 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFF6FuS004033; Thu, 15 Nov 2012 15:06:15 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211151506.qAFF6FuS004033@svn.freebsd.org> From: Eitan Adler Date: Thu, 15 Nov 2012 15:06:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243080 - head/etc/rc.d X-SVN-Group: head MIME-Version: 1.0 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-svn-src-all@freebsd.org Sender: owner-svn-src-all@freebsd.org X-SpamScore: 0 X-MailHub-Apparently-To: mjm@michaelmeltzer.com X-MailHub-Forwarded: Yes X-BeenThere: svn-src-head@freebsd.org List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2012 17:23:58 -0000 Author: eadler Date: Thu Nov 15 15:06:15 2012 New Revision: 243080 URL: http://svnweb.freebsd.org/changeset/base/243080 Log: Only pass ip[46].addr when _addrl contains a value Submitted by: crees Reviewed by: Mike Jakubik Approved by: cperciva MFC after: 2 weeks Modified: head/etc/rc.d/jail Modified: head/etc/rc.d/jail ============================================================================== --- head/etc/rc.d/jail Thu Nov 15 15:06:12 2012 (r243079) +++ head/etc/rc.d/jail Thu Nov 15 15:06:15 2012 (r243080) @@ -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 \