From nobody Wed Jul 5 10:03:30 2023 X-Original-To: dev-commits-src-main@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 4QwwGW46R0z4lMLW; Wed, 5 Jul 2023 10:03:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QwwGV72VRz3GG7; Wed, 5 Jul 2023 10:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688551411; 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=tsjPFM1cEU5rGaKINqqC7JqQua2iXWWaedfl6TJCGYE=; b=CmaDds9O8cadr1WeWp5Zgu/9u1P7q9+tLGzSPfrZ5NxTm9r8YKtLf5XMiNFg/SbnGLH+3Z UyMrJc35LLRSNZBJ2dhCwf3M4Jn+hKh3/SD34xdoeVMhrlNlFy8A+6FGoVq9T/McnKu1dt oFTja5qC9gQrJ3NUWnJWfIWFCiu/dndeGhlX9i9zeQBFHKECuYWbXLyytT14Krecd39BLO aSD/f19xi/GzFTOi3FvnA9EAjyz7VMebbqI4vdohqeb/3RblbQTWD2AB3eeVPkofPms9ir w4KqsCD/rPlxew13LxNGj2vRFgqfT/WdeYV9EsJdzGDDOVdvceX/26FKWUgctw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688551411; 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=tsjPFM1cEU5rGaKINqqC7JqQua2iXWWaedfl6TJCGYE=; b=wgwHVDErwAX+04gD/bx2D1/QWxx/8IzlsAnxsaTLW4URi+TOrGx75iBbjFY5nlp1J/kcjc OyWicW60dUxBRqbGs+qUpIcU/2HVwLq2fPYPNQiJttgy5LgzjaK9cMlqSvFEp7jsfp44sM hWt8LgsiUHU40o2FD1e6MA6Idi7pqTumZY965Bs7FO16QUXhNIG3dctJ1AnDS9HEI7HUIu 4tGBgb+cG3jt5tX08N0YRykoRIys8de7y2Ujt4nQ0y42YCwWqq6OXM9See+pDLO6Z/NOD5 AsYJzpyJW0V6vyqBgDFwYAteOqlHxCoG6Zu4V/hATAD9ldv32VRHJ4lMtN1wwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688551411; a=rsa-sha256; cv=none; b=fmdORM/t2y1xvu44xJzqoP64Wc9RRLb2iPafv7Gh3K/uwTHXFZoFHnFrF1cd2oSRhar3tj sSKkHu21zFlgXchkTmGvuMD9eZNZ7xSbuEtEne217NmsRqJUI6NVFZqDkSCUopdEM4uhHk dwiLmrzgyMgatIhi4FMBPCdq3NRAss/XPVvDUE/oa5AeXTW0YBLFnyzKx/oclWymTGhF5D SxyyitmOTTFT1yaemUyD2Vq1ZfjGRX77aDLMM9DQuFs5SzfEoy4G6BksWBpi4zQfT9bRfT GGvhyMpoECA88yJdoo58Ekfru+2YB5UkQhJnjicnEccGDzCknZe6Gre7ZDX3+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QwwGV68Bzz19Wx; Wed, 5 Jul 2023 10:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365A3UrH072934; Wed, 5 Jul 2023 10:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365A3UU2072933; Wed, 5 Jul 2023 10:03:30 GMT (envelope-from git) Date: Wed, 5 Jul 2023 10:03:30 GMT Message-Id: <202307051003.365A3UU2072933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: fda83023cdef - main - jls: low-effort fix to make it compilable with neither inet nor inet6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fda83023cdefd62ae693cfb853ef204ad4e1d7fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=fda83023cdefd62ae693cfb853ef204ad4e1d7fb commit fda83023cdefd62ae693cfb853ef204ad4e1d7fb Author: Mateusz Guzik AuthorDate: 2023-07-05 10:01:28 +0000 Commit: Mateusz Guzik CommitDate: 2023-07-05 10:03:07 +0000 jls: low-effort fix to make it compilable with neither inet nor inet6 --- usr.sbin/jls/jls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index 8773df3cef1c..9d0bebe4855a 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -384,7 +384,10 @@ print_jail(int pflags, int jflags) { char *nname, *xo_nname; char **param_values; - int i, jid, n, spc; + int i, jid, spc; +#if (defined INET || defined INET6) + int n; +#endif jid = jailparam_get(params, nparams, jflags); if (jid < 0) @@ -402,7 +405,9 @@ print_jail(int pflags, int jflags) (char *)params[3].jp_value, *(int *)params[4].jp_value ? "DYING" : "ACTIVE"); xo_emit("{P: }{:cpusetid/%d}\n", *(int *)params[5].jp_value); +#if (defined INET || defined INET6) n = 6; +#endif #ifdef INET if (ip4_ok && !strcmp(params[n].jp_name, "ip4.addr")) { emit_ip_addr_list(AF_INET, "ipv4_addrs", params + n);