From nobody Thu Sep 10 19:55:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hgpLs0kD4z6rDyY for ; Thu, 10 Sep 2026 19:55:33 +0000 (UTC) (envelope-from git@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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgpLs0WkMz4l7s for ; Thu, 10 Sep 2026 19:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789070133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWOOzyOQ0EIkxa+7152QoInfR9v4tTNwK0k38Dcv0uo=; b=V5qyCOWV5XpXi4kWGeTAzEVraEDYaXPSw5DCxCNXP4yYB/+bbPE/YdAeAmKvs+8thgvJmT OiE/59fSmE/VRRwuEEh9EbvAGYj+SG5yl7KSQtg1dYncWH4WkSs+0SEd1YwZB+/tFX1get 02qmmzitJlR/sJ5Ih84Kl3k+a56G0EDY5Hr6PEV08nBPiGDiUvdUzwQBeLvNvbqN12v8zI FMhlVkJ2mCcKe2X+aJgWNe+TlZH/Liu1ZP3IhjpZuGfpqBROv/xHGwbPkT9UJu7DZgIXBx EU8Hf8PnV+v3UoL7pXN0Y6dqPm6Qr2MRE6Z4XzWVDlIPCSrSDBDmXyX9apFVrA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789070133; b=Qy59ZnFjHR9azjozSSQUruwXbqKS3dUvXCOO9hJnb4byfFBY4ns2AKNZtXnVmYzLs2Vxoq Q3cV4GRYZRfBzx1nRTRZAc/ClpP+3JkJLIYEN0UW5heV+5CpxCVAL7gH47QzvO/WbUSf+D irSNp8OB0aGqS3+T8RsZqLqzb7m8ExDeG8yTIufSygecDaIyp7KgDYEz5NbBKIPxG+LYB9 G1eFJfk6X6HTfC7QKA0+l2cGbERpVDFHLcocUJMeJwUGTl240z1dQBi/lW4CgX2XaXkUnH 3JGzXaRuKCs2CZR7RcZOohVFKhOAasyyD559Ba5GzX7DxDtqBXNnRgUgE3Zb1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789070133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWOOzyOQ0EIkxa+7152QoInfR9v4tTNwK0k38Dcv0uo=; b=FnQzPzESuY12abrck2SfS25mgCTMcSpwKh6FD5yrfeMICrjIw4U5MoBCnz3aEDVlcpi8OL gcGCVDhmn1me12MB0HjMeOpROW2N9QZi50u/pbezgtzZTLy3xBN+wZBeYuhkOSPDgB7WM3 0u5x0eV6OHRKnL6YcbiaUxGteYCd5BiEYl2jshWLhDgugVdsPF39aRPwhJgoqNiKv34Q4Y oINAK2LVhuCygiKM5JZvJOGNqxg5GaVpD/8r4C05TumRTv0k2s0MwtKbfwQuin+etMe4Sg goZcPRj9On8QPPBU7q9dp5OrB8hDJjT68V7ioyZ8N0GGRer0tBATY2NGKySfWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hgpLr6gvMzjQr for ; Thu, 10 Sep 2026 19:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 202d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 19:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 9ae680fcfd36 - main - libjail, jls(8), jail(8): use the JAIL_PARAM_* constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ae680fcfd36e03547ffc7989c80dcbaac200556 Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 19:55:17 +0000 Message-Id: <6aa30b25.202d0.31030169@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=9ae680fcfd36e03547ffc7989c80dcbaac200556 commit 9ae680fcfd36e03547ffc7989c80dcbaac200556 Author: Abdelkader Boudih AuthorDate: 2026-09-10 19:51:30 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-10 19:55:04 +0000 libjail, jls(8), jail(8): use the JAIL_PARAM_* constants Replaced hardcoded jail parameter name strings in the base userland consumers with the JAIL_PARAM_* constants. No functional change. Reviewed by: jamie, adrian Differential Revision: https://reviews.freebsd.org/D59577 --- lib/libjail/jail.c | 30 +++++++++++++------------- lib/libjail/jail_getid.c | 24 ++++++++++----------- usr.sbin/jail/config.c | 38 +++++++++++++++++---------------- usr.sbin/jail/jail.c | 37 ++++++++++++++++---------------- usr.sbin/jls/jls.c | 55 ++++++++++++++++++++++++++++-------------------- 5 files changed, 98 insertions(+), 86 deletions(-) diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index 61ca46007db9..9b7a3e751f19 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -174,7 +174,7 @@ jail_setv(int flags, ...) goto error; if (jailparam_import(jp + njp, value) < 0) goto error; - if (!strcmp(name, "desc") && + if (!strcmp(name, JAIL_PARAM_DESC) && (flags & (JAIL_GET_DESC | JAIL_OWN_DESC))) { jp_desc = jp + njp; desc_value = value; @@ -224,17 +224,17 @@ jail_getv(int flags, ...) va_end(tap); goto error; } - if (!strcmp(jp[njp].jp_name, "desc") && + if (!strcmp(jp[njp].jp_name, JAIL_PARAM_DESC) && (flags & (JAIL_USE_DESC | JAIL_AT_DESC))) { jp_desc = jp + njp; desc_value = value; - } else if (!strcmp(jp[njp].jp_name, "lastjid")) { + } else if (!strcmp(jp[njp].jp_name, JAIL_PARAM_LASTJID)) { jp_lastjid = jp + njp; lastjid_value = value; - } else if (!strcmp(jp[njp].jp_name, "jid")) { + } else if (!strcmp(jp[njp].jp_name, JAIL_PARAM_JID)) { jp_jid = jp + njp; jid_value = value; - } if (!strcmp(jp[njp].jp_name, "name")) { + } if (!strcmp(jp[njp].jp_name, JAIL_PARAM_NAME)) { jp_name = jp + njp; name_value = value; } @@ -625,8 +625,8 @@ jailparam_set(struct jailparam *jp, unsigned njp, int flags) } i++; } - jiov[i].iov_base = __DECONST(char *, "errmsg"); - jiov[i].iov_len = sizeof("errmsg"); + jiov[i].iov_base = __DECONST(char *, JAIL_PARAM_ERRMSG); + jiov[i].iov_len = sizeof(JAIL_PARAM_ERRMSG); i++; jiov[i].iov_base = jail_errmsg; jiov[i].iov_len = JAIL_ERRMSGLEN; @@ -663,14 +663,14 @@ jailparam_get(struct jailparam *jp, unsigned njp, int flags) jp_desc = jp_lastjid = jp_jid = jp_name = NULL; arrays = 0; for (ai = j = 0; j < njp; j++) { - if (!strcmp(jp[j].jp_name, "desc") && + if (!strcmp(jp[j].jp_name, JAIL_PARAM_DESC) && (flags & (JAIL_USE_DESC | JAIL_AT_DESC))) jp_desc = jp + j; - else if (!strcmp(jp[j].jp_name, "lastjid")) + else if (!strcmp(jp[j].jp_name, JAIL_PARAM_LASTJID)) jp_lastjid = jp + j; - else if (!strcmp(jp[j].jp_name, "jid")) + else if (!strcmp(jp[j].jp_name, JAIL_PARAM_JID)) jp_jid = jp + j; - else if (!strcmp(jp[j].jp_name, "name")) + else if (!strcmp(jp[j].jp_name, JAIL_PARAM_NAME)) jp_name = jp + j; else if (jp[j].jp_elemlen && !(jp[j].jp_flags & JP_RAWVALUE)) { arrays = 1; @@ -700,8 +700,8 @@ jailparam_get(struct jailparam *jp, unsigned njp, int flags) jiov[ki].iov_len = (jp_key->jp_ctltype & CTLTYPE) == CTLTYPE_STRING ? strlen(jp_key->jp_value) + 1 : jp_key->jp_valuelen; ki++; - jiov[ki].iov_base = __DECONST(char *, "errmsg"); - jiov[ki].iov_len = sizeof("errmsg"); + jiov[ki].iov_base = __DECONST(char *, JAIL_PARAM_ERRMSG); + jiov[ki].iov_len = sizeof(JAIL_PARAM_ERRMSG); ki++; jiov[ki].iov_base = jail_errmsg; jiov[ki].iov_len = JAIL_ERRMSGLEN; @@ -1014,12 +1014,12 @@ jailparam_type(struct jailparam *jp) * parameter list. */ name = jp->jp_name; - if (!strcmp(name, "lastjid")) { + if (!strcmp(name, JAIL_PARAM_LASTJID)) { jp->jp_valuelen = sizeof(int); jp->jp_ctltype = CTLTYPE_INT | CTLFLAG_WR; return (0); } - if (!strcmp(name, "desc")) { + if (!strcmp(name, JAIL_PARAM_DESC)) { jp->jp_valuelen = sizeof(int); jp->jp_ctltype = CTLTYPE_INT | CTLFLAG_RW; return (0); diff --git a/lib/libjail/jail_getid.c b/lib/libjail/jail_getid.c index 9cc13d84e614..a7040bac86bc 100644 --- a/lib/libjail/jail_getid.c +++ b/lib/libjail/jail_getid.c @@ -60,19 +60,19 @@ jail_getid(const char *name) */ if (jid == 0) return jid; - jiov[0].iov_base = __DECONST(char *, "jid"); - jiov[0].iov_len = sizeof("jid"); + jiov[0].iov_base = __DECONST(char *, JAIL_PARAM_JID); + jiov[0].iov_len = sizeof(JAIL_PARAM_JID); jiov[1].iov_base = &jid; jiov[1].iov_len = sizeof(jid); } else { - jiov[0].iov_base = __DECONST(char *, "name"); - jiov[0].iov_len = sizeof("name"); + jiov[0].iov_base = __DECONST(char *, JAIL_PARAM_NAME); + jiov[0].iov_len = sizeof(JAIL_PARAM_NAME); jiov[1].iov_len = strlen(name) + 1; jiov[1].iov_base = alloca(jiov[1].iov_len); strcpy(jiov[1].iov_base, name); } - jiov[2].iov_base = __DECONST(char *, "errmsg"); - jiov[2].iov_len = sizeof("errmsg"); + jiov[2].iov_base = __DECONST(char *, JAIL_PARAM_ERRMSG); + jiov[2].iov_len = sizeof(JAIL_PARAM_ERRMSG); jiov[3].iov_base = jail_errmsg; jiov[3].iov_len = JAIL_ERRMSGLEN; jail_errmsg[0] = 0; @@ -93,16 +93,16 @@ jail_getname(int jid) char *name; char namebuf[MAXHOSTNAMELEN]; - jiov[0].iov_base = __DECONST(char *, "jid"); - jiov[0].iov_len = sizeof("jid"); + jiov[0].iov_base = __DECONST(char *, JAIL_PARAM_JID); + jiov[0].iov_len = sizeof(JAIL_PARAM_JID); jiov[1].iov_base = &jid; jiov[1].iov_len = sizeof(jid); - jiov[2].iov_base = __DECONST(char *, "name"); - jiov[2].iov_len = sizeof("name"); + jiov[2].iov_base = __DECONST(char *, JAIL_PARAM_NAME); + jiov[2].iov_len = sizeof(JAIL_PARAM_NAME); jiov[3].iov_base = namebuf; jiov[3].iov_len = sizeof(namebuf); - jiov[4].iov_base = __DECONST(char *, "errmsg"); - jiov[4].iov_len = sizeof("errmsg"); + jiov[4].iov_base = __DECONST(char *, JAIL_PARAM_ERRMSG); + jiov[4].iov_len = sizeof(JAIL_PARAM_ERRMSG); jiov[5].iov_base = jail_errmsg; jiov[5].iov_len = JAIL_ERRMSGLEN; jail_errmsg[0] = 0; diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index cc05c2916ca0..c45cd97ff1e0 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -95,33 +95,35 @@ static const struct ipspec intparams[] = { [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL}, [IP_ZFS_DATASET] = {"zfs.dataset", PF_INTERNAL}, #ifdef INET - [IP__IP4_IFADDR] = {"ip4.addr", PF_INTERNAL | PF_CONV | PF_REV}, + [IP__IP4_IFADDR] = {JAIL_PARAM_IP4_ADDR, + PF_INTERNAL | PF_CONV | PF_REV}, #endif #ifdef INET6 - [IP__IP6_IFADDR] = {"ip6.addr", PF_INTERNAL | PF_CONV | PF_REV}, + [IP__IP6_IFADDR] = {JAIL_PARAM_IP6_ADDR, + PF_INTERNAL | PF_CONV | PF_REV}, #endif [IP__MOUNT_FROM_FSTAB] = {"mount.fstab", PF_INTERNAL | PF_CONV | PF_REV}, [IP__OP] = {NULL, PF_CONV}, - [KP_ALLOW_CHFLAGS] = {"allow.chflags", 0}, - [KP_ALLOW_MOUNT] = {"allow.mount", 0}, - [KP_ALLOW_RAW_SOCKETS] = {"allow.raw_sockets", 0}, - [KP_ALLOW_SET_HOSTNAME]= {"allow.set_hostname", 0}, - [KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0}, - [KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0}, - [KP_DEVFS_RULESET] = {"devfs_ruleset", 0}, - [KP_HOST_HOSTNAME] = {"host.hostname", 0}, + [KP_ALLOW_CHFLAGS] = {JAIL_PARAM_ALLOW_CHFLAGS, 0}, + [KP_ALLOW_MOUNT] = {JAIL_PARAM_ALLOW_MOUNT, 0}, + [KP_ALLOW_RAW_SOCKETS] = {JAIL_PARAM_ALLOW_RAW_SOCKETS, 0}, + [KP_ALLOW_SET_HOSTNAME]= {JAIL_PARAM_ALLOW_SET_HOSTNAME, 0}, + [KP_ALLOW_SOCKET_AF] = {JAIL_PARAM_ALLOW_SOCKET_AF, 0}, + [KP_ALLOW_SYSVIPC] = {JAIL_PARAM_ALLOW_SYSVIPC, 0}, + [KP_DEVFS_RULESET] = {JAIL_PARAM_DEVFS_RULESET, 0}, + [KP_HOST_HOSTNAME] = {JAIL_PARAM_HOST_HOSTNAME, 0}, #ifdef INET - [KP_IP4_ADDR] = {"ip4.addr", 0}, + [KP_IP4_ADDR] = {JAIL_PARAM_IP4_ADDR, 0}, #endif #ifdef INET6 - [KP_IP6_ADDR] = {"ip6.addr", 0}, + [KP_IP6_ADDR] = {JAIL_PARAM_IP6_ADDR, 0}, #endif - [KP_JID] = {"jid", PF_IMMUTABLE}, - [KP_NAME] = {"name", PF_IMMUTABLE}, - [KP_PATH] = {"path", 0}, - [KP_PERSIST] = {"persist", 0}, - [KP_SECURELEVEL] = {"securelevel", 0}, - [KP_VNET] = {"vnet", 0}, + [KP_JID] = {JAIL_PARAM_JID, PF_IMMUTABLE}, + [KP_NAME] = {JAIL_PARAM_NAME, PF_IMMUTABLE}, + [KP_PATH] = {JAIL_PARAM_PATH, 0}, + [KP_PERSIST] = {JAIL_PARAM_PERSIST, 0}, + [KP_SECURELEVEL] = {JAIL_PARAM_SECURELEVEL, 0}, + [KP_VNET] = {JAIL_PARAM_VNET, 0}, }; /* diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index 46cabf76ae11..384dba992fd1 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -151,10 +151,10 @@ static const struct { enum intparam param; } listparams[] = { #ifdef INET - { "ip4.addr", KP_IP4_ADDR }, + { JAIL_PARAM_IP4_ADDR, KP_IP4_ADDR }, #endif #ifdef INET6 - { "ip6.addr", KP_IP6_ADDR }, + { JAIL_PARAM_IP6_ADDR, KP_IP6_ADDR }, #endif { "vnet.interface", IP_VNET_INTERFACE }, { "zfs.dataset", IP_ZFS_DATASET }, @@ -701,12 +701,12 @@ create_jail(struct cfjail *j) j->intparams[IP_EXEC_POSTSTART]); sjp = setparams = alloca((j->njp + dopersist) * sizeof(struct jailparam)); - if (dopersist && jailparam_init(sjp++, "persist") < 0) { + if (dopersist && jailparam_init(sjp++, JAIL_PARAM_PERSIST) < 0) { jail_warnx(j, "%s", jail_errmsg); return -1; } for (jp = j->jp; jp < j->jp + j->njp; jp++) - if (!dopersist || !equalopts(jp->jp_name, "persist")) + if (!dopersist || !equalopts(jp->jp_name, JAIL_PARAM_PERSIST)) *sjp++ = *jp; ns = sjp - setparams; @@ -735,12 +735,12 @@ clear_persist(struct cfjail *j) if (!(j->flags & JF_PERSIST)) return; j->flags &= ~JF_PERSIST; - jiov[0].iov_base = __DECONST(char *, "jid"); - jiov[0].iov_len = sizeof("jid"); + jiov[0].iov_base = __DECONST(char *, JAIL_PARAM_JID); + jiov[0].iov_len = sizeof(JAIL_PARAM_JID); jiov[1].iov_base = &j->jid; jiov[1].iov_len = sizeof(j->jid); - jiov[2].iov_base = __DECONST(char *, "nopersist"); - jiov[2].iov_len = sizeof("nopersist"); + jiov[2].iov_base = __DECONST(char *, JAIL_PARAM_NOPERSIST); + jiov[2].iov_len = sizeof(JAIL_PARAM_NOPERSIST); jiov[3].iov_base = NULL; jiov[3].iov_len = 0; jid = jail_set(jiov, 4, JAIL_UPDATE); @@ -766,7 +766,7 @@ update_jail(struct cfjail *j) if (ns == 0) return 0; sjp = setparams = alloca(++ns * sizeof(struct jailparam)); - if (jailparam_init(sjp, "jid") < 0 || + if (jailparam_init(sjp, JAIL_PARAM_JID) < 0 || jailparam_import_raw(sjp, &j->jid, sizeof j->jid) < 0) { jail_warnx(j, "%s", jail_errmsg); failed(j); @@ -801,18 +801,18 @@ rdtun_params(struct cfjail *j, int dofail) j->flags |= JF_RDTUN; nrt = 0; for (jp = j->jp; jp < j->jp + j->njp; jp++) - if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) + if (JP_RDTUN(jp) && strcmp(jp->jp_name, JAIL_PARAM_JID)) nrt++; if (nrt == 0) return 0; rtjp = rtparams = alloca(++nrt * sizeof(struct jailparam)); - if (jailparam_init(rtjp, "jid") < 0 || + if (jailparam_init(rtjp, JAIL_PARAM_JID) < 0 || jailparam_import_raw(rtjp, &j->jid, sizeof j->jid) < 0) { jail_warnx(j, "%s", jail_errmsg); exit(1); } for (jp = j->jp; jp < j->jp + j->njp; jp++) - if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) { + if (JP_RDTUN(jp) && strcmp(jp->jp_name, JAIL_PARAM_JID)) { *++rtjp = *jp; rtjp->jp_value = NULL; } @@ -820,7 +820,8 @@ rdtun_params(struct cfjail *j, int dofail) if (jailparam_get(rtparams, nrt, 0) > 0) { rtjp = rtparams + 1; for (jp = j->jp; rtjp < rtparams + nrt; jp++) { - if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) { + if (JP_RDTUN(jp) && + strcmp(jp->jp_name, JAIL_PARAM_JID)) { jp_value = jp->jp_value; jp_valuelen = jp->jp_valuelen; if (jp_value == NULL && jp_valuelen > 0) { @@ -876,13 +877,13 @@ running_jid(struct cfjail *j) j->jid = -1; return; } - jiov[0].iov_base = __DECONST(char *, "jid"); - jiov[0].iov_len = sizeof("jid"); + jiov[0].iov_base = __DECONST(char *, JAIL_PARAM_JID); + jiov[0].iov_len = sizeof(JAIL_PARAM_JID); jiov[1].iov_base = &jid; jiov[1].iov_len = sizeof(jid); } else if ((pval = string_param(j->intparams[KP_NAME]))) { - jiov[0].iov_base = __DECONST(char *, "name"); - jiov[0].iov_len = sizeof("name"); + jiov[0].iov_base = __DECONST(char *, JAIL_PARAM_NAME); + jiov[0].iov_len = sizeof(JAIL_PARAM_NAME); jiov[1].iov_len = strlen(pval) + 1; jiov[1].iov_base = alloca(jiov[1].iov_len); strcpy(jiov[1].iov_base, pval); @@ -985,7 +986,7 @@ print_jail(FILE *fp, struct cfjail *j, int oldcl, int running) printsep = 1; } TAILQ_FOREACH(p, &j->params, tq) - if (strcmp(p->name, "jid")) { + if (strcmp(p->name, JAIL_PARAM_JID)) { if (printsep) fputs(separator, fp); else diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index 4f697a5bb382..40aa3f61eba2 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -178,37 +178,45 @@ main(int argc, char **argv) if (pflags & (PRINT_HEADER | PRINT_NAMEVAL)) add_param("all", NULL, (size_t)0, NULL, JP_USER); else if (pflags & PRINT_VERBOSE) { - add_param("jid", NULL, (size_t)0, NULL, JP_USER); - add_param("host.hostname", NULL, (size_t)0, NULL, + add_param(JAIL_PARAM_JID, NULL, (size_t)0, NULL, + JP_USER); + add_param(JAIL_PARAM_HOST_HOSTNAME, NULL, (size_t)0, + NULL, JP_USER); + add_param(JAIL_PARAM_PATH, NULL, (size_t)0, NULL, + JP_USER); + add_param(JAIL_PARAM_NAME, NULL, (size_t)0, NULL, + JP_USER); + add_param(JAIL_PARAM_DYING, NULL, (size_t)0, NULL, + JP_USER); + add_param(JAIL_PARAM_CPUSET_ID, NULL, (size_t)0, NULL, JP_USER); - add_param("path", NULL, (size_t)0, NULL, JP_USER); - add_param("name", NULL, (size_t)0, NULL, JP_USER); - add_param("dying", NULL, (size_t)0, NULL, JP_USER); - add_param("cpuset.id", NULL, (size_t)0, NULL, JP_USER); #ifdef INET if (ip4_ok) - add_param("ip4.addr", NULL, (size_t)0, NULL, - JP_USER); + add_param(JAIL_PARAM_IP4_ADDR, NULL, + (size_t)0, NULL, JP_USER); #endif #ifdef INET6 if (ip6_ok) - add_param("ip6.addr", NULL, (size_t)0, NULL, - JP_USER | JP_OPT); + add_param(JAIL_PARAM_IP6_ADDR, NULL, + (size_t)0, NULL, JP_USER | JP_OPT); #endif } else { pflags |= PRINT_DEFAULT; if (pflags & PRINT_JAIL_NAME) - add_param("name", NULL, (size_t)0, NULL, JP_USER); + add_param(JAIL_PARAM_NAME, NULL, (size_t)0, + NULL, JP_USER); else - add_param("jid", NULL, (size_t)0, NULL, JP_USER); + add_param(JAIL_PARAM_JID, NULL, (size_t)0, + NULL, JP_USER); #ifdef INET if (ip4_ok) - add_param("ip4.addr", NULL, (size_t)0, NULL, - JP_USER); + add_param(JAIL_PARAM_IP4_ADDR, NULL, + (size_t)0, NULL, JP_USER); #endif - add_param("host.hostname", NULL, (size_t)0, NULL, + add_param(JAIL_PARAM_HOST_HOSTNAME, NULL, (size_t)0, + NULL, JP_USER); + add_param(JAIL_PARAM_PATH, NULL, (size_t)0, NULL, JP_USER); - add_param("path", NULL, (size_t)0, NULL, JP_USER); } } else { pflags &= ~PRINT_VERBOSE; @@ -232,11 +240,12 @@ main(int argc, char **argv) /* Add the index key parameters. */ if (jid != 0) - add_param("jid", &jid, sizeof(jid), NULL, 0); + add_param(JAIL_PARAM_JID, &jid, sizeof(jid), NULL, 0); else if (jname != NULL) - add_param("name", jname, strlen(jname), NULL, 0); + add_param(JAIL_PARAM_NAME, jname, strlen(jname), NULL, 0); else - add_param("lastjid", &lastjid, sizeof(lastjid), NULL, 0); + add_param(JAIL_PARAM_LASTJID, &lastjid, sizeof(lastjid), + NULL, 0); /* Print a header line if requested. */ if (pflags & PRINT_VERBOSE) { @@ -449,13 +458,13 @@ print_jail(int pflags, int jflags) n = 6; #endif #ifdef INET - if (ip4_ok && !strcmp(params[n].jp_name, "ip4.addr")) { + if (ip4_ok && !strcmp(params[n].jp_name, JAIL_PARAM_IP4_ADDR)) { emit_ip_addr_list(AF_INET, "ipv4_addrs", params + n); n++; } #endif #ifdef INET6 - if (ip6_ok && !strcmp(params[n].jp_name, "ip6.addr")) { + if (ip6_ok && !strcmp(params[n].jp_name, JAIL_PARAM_IP6_ADDR)) { emit_ip_addr_list(AF_INET6, "ipv6_addrs", params + n); n++; } @@ -610,9 +619,9 @@ special_print(int pflags, struct jailparam *param) xo_emit("{P:\"\"}"); else if (!(pflags & PRINT_NAMEVAL)) xo_emit("{P:-}"); - } else if (ip_as_list && !strcmp(param->jp_name, "ip4.addr")) { + } else if (ip_as_list && !strcmp(param->jp_name, JAIL_PARAM_IP4_ADDR)) { emit_ip_addr_list(AF_INET, param->jp_name, param); - } else if (ip_as_list && !strcmp(param->jp_name, "ip6.addr")) { + } else if (ip_as_list && !strcmp(param->jp_name, JAIL_PARAM_IP6_ADDR)) { emit_ip_addr_list(AF_INET6, param->jp_name, param); } else { return 0;