From nobody Wed Sep 10 04:00:35 2025 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 4cM6RS0F3rz66tl8; Wed, 10 Sep 2025 04:00:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cM6RR4VKNz45N0; Wed, 10 Sep 2025 04:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757476835; 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=3/7kApcy7umqA+++FWR3YbmRYu5Mp1oPC0X9ZulEDtc=; b=ne+qC4NxPK8QJk/WVXaesOkIhwm+wT8EU3NiRi0g/NB0oCqmV5S3Q4snq5yzhCv0TRz5EA /hROTtZaqyibDdCPPvxNGu6pmVq2676jhZiS4bDkqFzek+PR1Xf32B9sfHVEwK0dC9/BuH p/PpSjQk9REvYo3KVT4vWqxzj5aeV6k7hAq9EfeYfXRDi1Y/69iMDLyWB8BCSetYyYQbQ4 z4JuV60rfn5z6mBIbKcOfqgDqOKocZQlgOcNWvZWnqvuPo41JlR75kynPW90/IDDHzkxiz zJDOLVKEr9XGTPHlNNeagC8rVFcSI4CyEgf9Ij1BZ5LS8vtx2bIDGCi20co6pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757476835; 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=3/7kApcy7umqA+++FWR3YbmRYu5Mp1oPC0X9ZulEDtc=; b=sqcbhO6tfpob6M5WiKOoaJC1pCMcN2ehsUGj6wbyCRTH655QViv+NTdT97N92Ebqd1H1Qd ARkTjw/P26VMlzQHNqh3G5/Eyzo0O/hydSWYoSjha9o6zdMIW8zaQT0tH+uVfxELDRS/BD ev3/toJkPMpxnBf8rnCEgb/N0P7T445igjeHu4XjAUiYrtVgWRpzmZMpWVqvRXywzUaJy+ /uVdRPB3BvFyDvKzKagBFZpkSs0Z2OZFFXpuut2UxMjVn3sJ312BIOxkNMa2gO2UouR/8k cAVsdp0Ha2Lt7iMTSJxqgTFvAKctYyoQCpAWEIM3aR/yzFkV0q1kJY/zruCPxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757476835; a=rsa-sha256; cv=none; b=lyvjCH1xqw7P/x7LEsV3S2j5xuWDtenDeL/UdRZHUB4VYEt/EoFry1iQVmqehILY6UUtsj sWx28tNCycBsGaQq0bLGt3ubbM3DfUY8PhbCpVunsw1QurHpPjY917CvbrYelL62vbB52m SgqATqRpLl6mYeKFTZsPSJ5Ec5fy6XSqhcVvzqa+WmgP7aI/TjeeHjxEGOff5MSjYY1KqE +d8WZ/tiHA9F/KgwiLS/fzBnrlbV/E4XxN4UVdg6/OCt5vM4r5nYzBFZb5JiehSw9Mw/2V 7M204WlEVDbHmCCVMdrmgznT1Pa+NSkJNVlIGFaKSdpBZyFGylxpySfEV3SF/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cM6RR45M4z14pn; Wed, 10 Sep 2025 04:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58A40ZXL005884; Wed, 10 Sep 2025 04:00:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58A40Z2u005881; Wed, 10 Sep 2025 04:00:35 GMT (envelope-from git) Date: Wed, 10 Sep 2025 04:00:35 GMT Message-Id: <202509100400.58A40Z2u005881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 685e60e860d6 - main - ngctl: Fix build without JAIL 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 685e60e860d61f6e1bcf981f5c30647e0c025702 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=685e60e860d61f6e1bcf981f5c30647e0c025702 commit 685e60e860d61f6e1bcf981f5c30647e0c025702 Author: Zhenlei Huang AuthorDate: 2025-09-10 04:00:05 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-10 04:00:05 +0000 ngctl: Fix build without JAIL Reported by: Michael Dexter Fixes: 72d01e62b082 netgraph: teach ngctl to attach and run itself in a jail MFC after: 1 day --- usr.sbin/ngctl/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index b32e4f878b6e..b86f1ca27e71 100644 --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -144,7 +144,9 @@ main(int ac, char *av[]) char name[NG_NODESIZ]; int interactive = isatty(0) && isatty(1); FILE *fp = NULL; +#ifdef JAIL const char *jail_name = NULL; +#endif int ch, rtn = 0; /* Set default node name */ @@ -181,6 +183,7 @@ main(int ac, char *av[]) ac -= optind; av += optind; +#ifdef JAIL if (jail_name != NULL) { int jid; @@ -196,6 +199,7 @@ main(int ac, char *av[]) errx((errno == EPERM) ? EX_NOPERM : EX_OSERR, "cannot attach to jail"); } +#endif /* Create a new socket node */ if (NgMkSockNode(name, &csock, &dsock) < 0)