From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:37:10 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 733F5C59; Sat, 7 Feb 2015 05:37:10 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20C7593C; Sat, 7 Feb 2015 05:37:10 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) by m2.gritton.org (8.14.9/8.14.9) with ESMTP id t175b9BO079015; Fri, 6 Feb 2015 22:37:09 -0700 (MST) (envelope-from jamie@freebsd.org) Received: (from www@localhost) by m2.gritton.org (8.14.9/8.14.9/Submit) id t175b9ej079014; Fri, 6 Feb 2015 22:37:09 -0700 (MST) (envelope-from jamie@freebsd.org) X-Authentication-Warning: gritton.org: www set sender to jamie@freebsd.org using -f To: Garrett Cooper Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail X-PHP-Originating-Script: 0:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Fri, 06 Feb 2015 22:37:09 -0700 From: James Gritton In-Reply-To: References: <201502061754.t16HssXU042750@svn.freebsd.org> <609da07b7a80b4a59fce8655370b045e@gritton.org> Message-ID: <66d9c0b5cbced6ffa23ebd023a69a351@gritton.org> X-Sender: jamie@freebsd.org User-Agent: Roundcube Webmail/1.0.3 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list 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: Sat, 07 Feb 2015 05:37:10 -0000 On 2015-02-06 22:31, Garrett Cooper wrote: > On Feb 6, 2015, at 21:27, James Gritton wrote: > >> On 2015-02-06 22:18, Garrett Cooper wrote: >>> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>>> Modified: head/usr.sbin/jail/command.c >>>> ============================================================================== >>>> --- head/usr.sbin/jail/command.c Fri Feb 6 17:43:13 2015 (r278322) >>>> +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 (r278323) >>>> @@ -112,6 +112,12 @@ next_command(struct cfjail *j) >>>> if (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) >>>> continue; >>>> j->comstring = &dummystring; >>>> + break; >>>> + case IP_MOUNT_PROCFS: >>>> + if (!bool_param(j->intparams[IP_MOUNT_PROCFS])) >>>> + continue; >>>> + j->comstring = &dummystring; >>>> + break; >>> Did you intend on adding another break? The code would previously >>> fall >>> through to the next case statement... >>>> case IP__OP: >>>> case IP_STOP_TIMEOUT: >>>> j->comstring = &dummystring; >> >> Yes. The code did indeed previously fall to the next case, but it was >> a no-op: the next case only had the same exact assignment that had >> just taken place (j->comstring = &dummystring). The lack of a break >> that had existed before was just some sloppy coding that I didn't >> notice at the time because it didn't actually change any behavior. >> Nonetheless it seemed worth correcting when I noticed it. > > True. I looked at the code afterwards and it looks ok. mount.procfs > doesn’t exist in my environment. Is that command correct? > > $ which mount.procfs; echo $? > 1 I added mount.procfs as a jail parameter, but it's not a command. Just like the existing mount.devfs and mount.fdescfs aren't commands either. The reason these jail parameters exist is to ease the backward compatibility with the old rc-based jail system. It should be a simple case of doing for procfs exactly what I did for the other two, but apparently it isn't. It's likely related to something I'm missing in the proper way of modifying rc scripts. - Jamie