From nobody Thu Sep 11 04:02:32 2025 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 4cMkRD4nmkz67Ykh; Thu, 11 Sep 2025 04:02:32 +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 4cMkRD45ngz3rWN; Thu, 11 Sep 2025 04:02:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757563352; 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=rDsE9ZavoHmNeM1PSy8AOR9NE16rRTzAJRysaJBa4K8=; b=Ro9C95LKyFlBSPWcn9w7HOxUmj/bbdG+XukVWDXzPODUghTnozlFI6D6XYqy3dRSd3d2BO oQMdJ+dc+3NIsMGh530kdVxvBXlGPm6pHFUFGeOGJP6L8Ho/K6/pb/TldnMvheHs48QRyq osFC3KdCKyXh6TVyh611ykPixEV1TG6d4xRHGDIC+7J6EJ52eh+lbKuVXfJ23+8jxuLIIG ft+whIBK/n9jgg1DR3etaF6OmxQYViFTL4gO6UZQWfThltGGNrcoOzoISXdKsFdlo/pwFY rEUHP9tSljU2jXDEsBnPEyUzr7swNsQteXfMw0cI1O6vzpS6L6LAn/WKQad1/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757563352; 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=rDsE9ZavoHmNeM1PSy8AOR9NE16rRTzAJRysaJBa4K8=; b=QzW0cK8Y9WEkxS9TRLgKJZczPi6aKYpo4eLZX5zts4DColSxQxlI88POqIRYyveUpzS5+p 9fEqjoHNOKk7fZ/9Jqwihh4Ia+bh7RTPyAtokmOZdwYqUMsYwgkNqeyVlFVT4XvNaKZjRz lUeMPsC8EruuNrMp2zHlRdvomvkkvdCB8MkdQr/2r9GnaxPsKyJDHHoNFtmUwAZD7bsGiw 1vnVZcuyhslZa6ygziohPVk7Er2IwiLQp31N2bBqeBHnscid28WL0GMd6BnZI5yQLenmYb FAB87U42pkXjROx07FhnebgkMxrjwhmti//8jxv5nzk1i8HE/Y/OGDhJZhQs1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757563352; a=rsa-sha256; cv=none; b=VueFYwLyAck83gns91PZUuha3jVWETTyRSrh1z3feGNLygvcl9W+ON79NAQW/uUM7fUKz2 geUzfdc+gdFxQPDbxNBkrUqXg8CS+zVOw/uoHYTxaTZqr5rr5Ia+0aB+qXMNVfiLu9+gXk imZaI5c+AgtBueDLNbpKEiP6LUrRfF/5JjJuXqcjwZ12gdipOpcLH3SyZBD/9Z7wUcEY9X wDzlcxJB5XgQiG9NZEFMQbWQIReMRq8T2wxNtcJnHU4DE5uM5NidlA7m+nH2HBokH4ACCb ilVWNbDZMM+Mcthxh67vKooX5f9Jp+Casy49H239UZGogNo543cjCTrLhBiWBQ== 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 4cMkRD3PcwzrkX; Thu, 11 Sep 2025 04:02:32 +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 58B42Wii023730; Thu, 11 Sep 2025 04:02:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58B42WK5023727; Thu, 11 Sep 2025 04:02:32 GMT (envelope-from git) Date: Thu, 11 Sep 2025 04:02:32 GMT Message-Id: <202509110402.58B42WK5023727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ab7858d90eba - stable/15 - ngctl: Fix build without JAIL 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ab7858d90eba6d8b5829ad974da91ee30dcf92f4 Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ab7858d90eba6d8b5829ad974da91ee30dcf92f4 commit ab7858d90eba6d8b5829ad974da91ee30dcf92f4 Author: Zhenlei Huang AuthorDate: 2025-09-10 04:00:05 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-11 04:01:37 +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 (cherry picked from commit 685e60e860d61f6e1bcf981f5c30647e0c025702) --- 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)