From 1c3583b49c311a8f21552f1fef6b20cccd70089c Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 1 Nov 2021 16:32:40 +0100
Subject: [PATCH 316/325] ggated: Add undocumented -J flag to disable jailing

Should work around:

    fk@r500 ~ $sudo ggated -v -j
    info: Reading exports file (/etc/gg.exports).
    debug: Added 127.0.0.1/32 /dev/zvol/r500/ggated/t520.eli RW to exports list.
    info: Exporting 1 object(s).
    info: Listen on port: 3080.
    error: Unable to jail process in directory /var/empty
    error: Exiting.

Obtained from: ElectroBSD
---
 sbin/ggate/ggated/ggated.c | 5 ++++-
 sbin/ggate/shared/ggate.c  | 3 ++-
 sbin/ggate/shared/ggate.h  | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index 9a4e7838d0e4..779e5c224dbe 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -1082,7 +1082,7 @@ main(int argc, char *argv[])
 
 	bindaddr = htonl(INADDR_ANY);
 	port = G_GATE_PORT;
-	while ((ch = getopt(argc, argv, "a:hnjp:F:R:S:v")) != -1) {
+	while ((ch = getopt(argc, argv, "a:hnjJp:F:R:S:v")) != -1) {
 		switch (ch) {
 		case 'a':
 			bindaddr = g_gate_str2ip(optarg);
@@ -1094,6 +1094,9 @@ main(int argc, char *argv[])
 		case 'F':
 			ggated_pidfile = optarg;
 			break;
+		case 'J':
+			g_gate_no_jailing = 1;
+			break;
 		case 'j':
 			g_gate_jail_test = 1;
 			break;
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index 4c0d3886f463..05a2cdcd1f83 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -66,6 +66,7 @@
 
 
 int g_gate_devfd = -1;
+int g_gate_no_jailing = 0;
 int g_gate_verbose = 0;
 static int g_gate_logfd = -1;
 
@@ -496,7 +497,7 @@ g_gate_drop_privs(const char *ggate_user, in_addr_t jail_address)
 	jailst.ip4 = &jail_ip;
 	jailst.ip6s = 0;
 	jailst.ip6 = NULL;
-	if (jail(&jailst) == -1) {
+	if (!g_gate_no_jailing && jail(&jailst) == -1) {
 		g_gate_xlog("Unable to jail process in directory %s", pw->pw_dir);
 	}
 	PJDLOG_VERIFY(chdir("/") == 0);
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index bb6ddc4ac8f8..0a648d5e3513 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -63,6 +63,7 @@
 #define GGATE_MAX_BIO_LENGTH	1048576
 
 extern int g_gate_devfd;
+extern int g_gate_no_jailing;
 extern int g_gate_verbose;
 
 extern int nagle;
-- 
2.32.0