Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Apr 2026 15:29:33 +0000
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Mark Johnston <markj@FreeBSD.org>
Subject:   git: 3b0fc4472aa5 - stable/15 - bhyve/slirp: Avoid a nested declaration of environ
Message-ID:  <69eb8c5d.35b8b.71c71e6b@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=3b0fc4472aa5e147ebad6d4bae5e001ca6a4b415

commit 3b0fc4472aa5e147ebad6d4bae5e001ca6a4b415
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-11-24 14:08:21 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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;


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eb8c5d.35b8b.71c71e6b>