From owner-svn-src-head@freebsd.org  Tue Dec 15 20:56:36 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E7AA4C2749;
 Tue, 15 Dec 2020 20:56:36 +0000 (UTC)
 (envelope-from jamie@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CwVtD0S52z4s1f;
 Tue, 15 Dec 2020 20:56:36 +0000 (UTC)
 (envelope-from jamie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 028131A0E0;
 Tue, 15 Dec 2020 20:56:36 +0000 (UTC)
 (envelope-from jamie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BFKuZao015421;
 Tue, 15 Dec 2020 20:56:35 GMT (envelope-from jamie@FreeBSD.org)
Received: (from jamie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BFKuZZa015420;
 Tue, 15 Dec 2020 20:56:35 GMT (envelope-from jamie@FreeBSD.org)
Message-Id: <202012152056.0BFKuZZa015420@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jamie set sender to
 jamie@FreeBSD.org using -f
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Tue, 15 Dec 2020 20:56:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r368676 - head/usr.sbin/jls
X-SVN-Group: head
X-SVN-Commit-Author: jamie
X-SVN-Commit-Paths: head/usr.sbin/jls
X-SVN-Commit-Revision: 368676
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2020 20:56:36 -0000

Author: jamie
Date: Tue Dec 15 20:56:35 2020
New Revision: 368676
URL: https://svnweb.freebsd.org/changeset/base/368676

Log:
  Bugfix to not hide jailparam flags, which for example changes the output
  "vnet=2" to the less opaque "vnet=inherit"
  
  Reported by:	kevans
  MFC after:	5 days

Modified:
  head/usr.sbin/jls/jls.c

Modified: head/usr.sbin/jls/jls.c
==============================================================================
--- head/usr.sbin/jls/jls.c	Tue Dec 15 20:02:40 2020	(r368675)
+++ head/usr.sbin/jls/jls.c	Tue Dec 15 20:56:35 2020	(r368676)
@@ -323,7 +323,7 @@ add_param(const char *name, void *value, size_t valuel
 		}
 		xo_errx(1, "%s", jail_errmsg);
 	}
-	param->jp_flags = flags;
+	param->jp_flags |= flags;
 	return param - params;
 }