From owner-svn-src-all@FreeBSD.ORG Sat Feb 7 05:37:21 2015 Return-Path: Delivered-To: svn-src-all@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 BD1D5D90; Sat, 7 Feb 2015 05:37:21 +0000 (UTC) Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C347940; Sat, 7 Feb 2015 05:37:21 +0000 (UTC) Received: by pdbfl12 with SMTP id fl12so19052300pdb.6; Fri, 06 Feb 2015 21:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=Y2fpH0PwWsYa4hJ2xgRHKb6h3FYSHHRVjn3qCVtbIcA=; b=qiHRTzBPbyzxNSY6lA/K/i3gh8KDM6QNQbFvvXhV/zAmFaO0MkofctNAPutyAzhXSQ lIoflddKDtEtx4JYF4bam044k4rQKwPYsr41WGxBTaI3fyIphWEhzQz5ooWbkr+1mwzB 3bsK3J9IRjEwPITCYIcssN3MCKJE5RIQKdkhy7aLKysTiXLAXHuopqusNi+APNJgFlR9 HO41XOYqsSXuNFMYjvexla1EdevdUNi/fH1qIdQqACCa63mwnZ2gDNwie8GqbfAYYqYP 7PjTKL3lP1iMZ89lyZAR4sxBIw1oQU0+hXJeJYV7599X7HdcgIfzsyohqXr/+l12zukx 7hig== X-Received: by 10.70.129.75 with SMTP id nu11mr11154161pdb.151.1423287440907; Fri, 06 Feb 2015 21:37:20 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id dy3sm1336340pab.33.2015.02.06.21.37.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 21:37:20 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: Date: Fri, 6 Feb 2015 21:37:19 -0800 Message-Id: References: <201502061754.t16HssXU042750@svn.freebsd.org> <609da07b7a80b4a59fce8655370b045e@gritton.org> To: James Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:37:21 -0000 --Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 6, 2015, at 21:31, Garrett Cooper wrote: > On Feb 6, 2015, at 21:27, James Gritton wrote: >=20 >> 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 >>>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>>> --- 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 =3D &dummystring; >>>> + break; >>>> + case IP_MOUNT_PROCFS: >>>> + if = (!bool_param(j->intparams[IP_MOUNT_PROCFS])) >>>> + continue; >>>> + j->comstring =3D &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 =3D &dummystring; >>=20 >> 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 =3D &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. >=20 > True. I looked at the code afterwards and it looks ok. mount.procfs = doesn=92t exist in my environment. Is that command correct? >=20 > $ which mount.procfs; echo $? > 1 Nevermind =97 thinking Linux for a sec. I think I see the bug now. = etc/rc.d/jail before this change used to pass ${rootdir} if it was = defined, and the new code wasn=92t passing that=85 Might want to = doublecheck it, but adding the rootdir afterwards might fix that. --Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1aSPAAoJEMZr5QU6S73ewiQH/jFaeq4Y6BdqhaaBoWwCAvtc 3R6uSGA3djPjNoxpAoUyy0rTn91Jc0d5ThomTaDnNBVYro7vPUVlfWdrQDBIx/CP 8s6Wwx2nRMqXno9Lb4VzmUt5mHtrvNJi0qXzC82b0TaccYnMzHrg5/aPXAO1qnlE XyK166PRwvW6CTWJgAJLjb/2qXAofG/Zw37WWwjrTcprRbiNDRQoYixXBtnAD385 Y47Jt0cqky+JHG9FDPK+HcdggFUc0MH3V/IquBtR7KPO6ImD5rRYihT4I9M+GxGc PPWf92E/UzW24GVZK7zel3e6uppTyulQ2EvRCDUCTglYZmjAG3UfPlsi2SG9ROI= =WPzD -----END PGP SIGNATURE----- --Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67--