git: 7f0550463a40 - stable/12 - MFC r368676: jail: show symbolic jailparam flags

[Jamie Gritton]

The branch stable/12 has been updated by jamie:

URL: https://cgit.FreeBSD.org/src/commit/?id=7f0550463a4098fac37d6abb37a124005cbed09f

commit 7f0550463a4098fac37d6abb37a124005cbed09f
Author:     Jamie Gritton <jamie at FreeBSD.org>
AuthorDate: 2020-12-15 20:56:35 +0000
Commit:     Jamie Gritton <jamie at FreeBSD.org>
CommitDate: 2020-12-26 21:00:50 +0000

    MFC r368676: jail: show symbolic jailparam flags
    
    Bugfix to not hide jailparam flags, which for example changes the output
    "vnet=2" to the less opaque "vnet=inherit"
    
    Reported by:    kevans
---
 usr.sbin/jls/jls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 4c968fdc76df..46c5a5c8b15e 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -323,7 +323,7 @@ add_param(const char *name, void *value, size_t valuelen,
 		}
 		xo_errx(1, "%s", jail_errmsg);
 	}
-	param->jp_flags = flags;
+	param->jp_flags |= flags;
 	return param - params;
 }