commit 1e0b974519c8228e271b2b6e677c1b8f9a109b6b
from: Omar Polo <op@omarpolo.com>
date: Mon May 08 10:27:32 2023 UTC

send capsicum/landlock/seccomp hack to Valhalla

commit - 0b62f4842d7c65b8f64c5f676a0a05333fd7db6f
commit + 1e0b974519c8228e271b2b6e677c1b8f9a109b6b
blob - 82d472ac0e0f2abc72a3b1487566e36fb4543993
blob + 0bf0e63a7ac6febc4a54846ed9e0ed76eda48b49
--- gmid.h
+++ gmid.h
@@ -196,7 +196,6 @@ struct conf {
 	/* from command line */
 	int		 foreground;
 	int		 verbose;
-	int		 can_open_sockets;
 
 	/* in the config */
 	int		 port;
@@ -367,7 +366,7 @@ void		 fcgi_error(struct bufferevent *, short, void *)
 void		 fcgi_req(struct client *);
 
 /* sandbox.c */
-void		 sandbox_server_process(int);
+void		 sandbox_server_process(void);
 void		 sandbox_logger_process(void);
 
 /* utf8.c */
blob - 88051af876f1a7396cd8291db495363a94c864bd
blob + f4d770d69c1a08115598847a8480881c29d9badd
--- parse.y
+++ parse.y
@@ -1058,8 +1058,6 @@ struct proxy *
 new_proxy(void)
 {
 	struct proxy *p;
-
-	conf.can_open_sockets = 1;
 
 	p = xcalloc(1, sizeof(*p));
 	p->protocols = TLS_PROTOCOLS_DEFAULT;
@@ -1170,8 +1168,6 @@ fastcgi_conf(const char *path, const char *port)
 	struct fcgi	*f;
 	int		i;
 
-	conf.can_open_sockets = 1;
-
 	for (i = 0; i < FCGI_MAX; ++i) {
 		f = &fcgi[i];
 
blob - 01dc96665e83798a6db2e611f972b6946c31df3d
blob + 1e95b8e6d6ea2b8422d7d24ca72dc41b35c2792f
--- sandbox.c
+++ sandbox.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 void
-sandbox_server_process(int can_open_sockets)
+sandbox_server_process(void)
 {
 	struct vhost	*h;
 	struct location	*l;
@@ -54,7 +54,7 @@ sandbox_logger_process(void)
 #warning "No sandbox method known for this OS"
 
 void
-sandbox_server_process(int can_open_sockets)
+sandbox_server_process(void)
 {
 	return;
 }
blob - ae2ba796b83353dd27ef7afccb2a394a83c08322
blob + 8027b5fd8fda453b484f2832ea8b75b018a240e5
--- server.c
+++ server.c
@@ -1399,7 +1399,7 @@ loop(struct tls *ctx_, int sock4, int sock6, struct im
 	signal_set(&sigusr2, SIGUSR2, &handle_siginfo, NULL);
 	signal_add(&sigusr2, NULL);
 
-	sandbox_server_process(conf.can_open_sockets);
+	sandbox_server_process();
 	event_dispatch();
 	_exit(0);
 }