From nobody Fri Apr 24 15:29:33 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 4g2H254zSVz6bSVX for ; Fri, 24 Apr 2026 15:29: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H25187Pz3DYp for ; Fri, 24 Apr 2026 15:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6Nkh6UoqvWgASuAKOyYDatdZ5oOzXeaU9ClgsEZOyM=; b=UoPjhowo2mDOICah2YYRJ/PtLQfSW8ij759hDd2nlViFPrsElLP9B38atOlVTXYiF9P5pj 6EukK8WTuZ5BFbg3SRaxNOszRboE0RQ8nhTwdhuM3OC75tZfm1E0zIJXfmguQG8AylojfU EJeka/xToQKdWsIs3J2uRiCRM7Y5rnFlrbjQJ8LLEPnuOzC1XPhqfkO/GYQvjUFILDxNWD fOkEA2Y4z9Y2YSQOeJUSb3LweizV1CwBLOvAJFzAFAOoiFR34qFr9xTQWnpoW9obcpzLu4 ebCilHS5CTbph3s9wwv2XA8gGRPbIGNM20GuLdkI0L32MsvIU5ek+iC4hNVuPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044573; a=rsa-sha256; cv=none; b=bQgQHgSaO0oMGExMeUd5E4eJKMPsdIIzubzCqzimtLDEshiVYAhIMZP+QzBqvwRCNnzIp7 ycO0+6dBFZ5IulWppkGjbBYnBVvTH2LD0CZP5Vtlzrsa4bnXKLshH5d++yS/aL43PknpIN ZKM29mmvjw2TthDxeoWdAlUl0P8xur9bked8lMbenFPtJNDn02HuSC2jBpmoIfYVcRNh55 01pYPC3b6BQSST51TdKtUWbpNOlu1fKNk/m6FscmsM7UxOjpPkUCqU8Ks3UZhTPhNWfDXL Ux9Jl5pfkK0fjIN9EfiwaEOJVfuR3Y3IFPp8aQxcmiUHaSZGmPc8T2sT/upWNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6Nkh6UoqvWgASuAKOyYDatdZ5oOzXeaU9ClgsEZOyM=; b=lG6+lE11VAG07pUb84dgjgaocrS9Mzrpp46JqltOfcci8s6frInn2R8UhlK1eE+8tp5ARR QrnZeNfi9x6lXbq6htEKGHZDRxvDlYmDJmQ+5ybKwuxYuWWBlp5d3ruMb4Ki+0m7hP1Gc0 gZDFpMWhcP8nb9cbGMS7cCDW7ne36dump+P2hdb8N+EEsMIIFYD6gqma+G4LLzvR41U57s Ec2Wp4kto/nIdV1IrRdp/Px1BgYtIJoDAjWFeQ4brYL8+JOFWy0mhbPXhFUU6qpPaoAdCi pgMfrqQG4K3UJsqR6ZgN6ccijK8hEjVFdgAXig80DtaUl3eyGeh+7X/TcafdAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H250g5mz17qq for ; Fri, 24 Apr 2026 15:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35b8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: John Baldwin Subject: git: 3b0fc4472aa5 - stable/15 - bhyve/slirp: Avoid a nested declaration of environ 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3b0fc4472aa5e147ebad6d4bae5e001ca6a4b415 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:33 +0000 Message-Id: <69eb8c5d.35b8b.71c71e6b@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0fc4472aa5e147ebad6d4bae5e001ca6a4b415 commit 3b0fc4472aa5e147ebad6d4bae5e001ca6a4b415 Author: Mark Johnston AuthorDate: 2025-11-24 14:08:21 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:40 +0000 bhyve/slirp: Avoid a nested declaration of environ Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") (cherry picked from commit bac572b2b1c9aec0ebfd3ae1fd02b314984cb716) --- usr.sbin/bhyve/net_backend_slirp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backend_slirp.c b/usr.sbin/bhyve/net_backend_slirp.c index f565ecaee4f3..6084ca31966d 100644 --- a/usr.sbin/bhyve/net_backend_slirp.c +++ b/usr.sbin/bhyve/net_backend_slirp.c @@ -76,11 +76,12 @@ struct slirp_priv { uint8_t *buf; }; +extern char **environ; + static int slirp_init(struct net_backend *be, const char *devname __unused, nvlist_t *nvl, net_be_rxeof_t cb, void *param) { - extern char **environ; struct slirp_priv *priv = NET_BE_PRIV(be); nvlist_t *config; posix_spawn_file_actions_t fa;