From 5e0c75d6098b923b12f3db29485997e649e06b81 Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com>
Date: Tue, 22 Feb 2022 18:42:51 +0100
Subject: passt: Drop PASST_LEGACY_NO_OPTIONS sections

...nobody uses those builds anymore.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 conf.c         | 12 ------------
 hooks/pre-push |  4 ----
 passt.c        |  2 --
 tap.c          |  7 -------
 4 files changed, 25 deletions(-)

diff --git a/conf.c b/conf.c
index 9851575..c8a3693 100644
--- a/conf.c
+++ b/conf.c
@@ -1281,18 +1281,6 @@ void conf(struct ctx *c, int argc, char **argv)
 	if (!*c->pasta_ifn)
 		if_indextoname(c->ifi, c->pasta_ifn);
 
-#ifdef PASST_LEGACY_NO_OPTIONS
-	if (c->mode == MODE_PASST) {
-		c->foreground = 1;
-		c->stderr = 1;
-
-		if (!tcp_tap) {
-			memset(c->tcp.port_to_tap, 0xff,
-			       PORT_EPHEMERAL_MIN / 8);
-		}
-	}
-#endif
-
 	c->tcp.ns_detect_ports   = c->udp.ns_detect_ports   = 0;
 	c->tcp.init_detect_ports = c->udp.init_detect_ports = 0;
 
diff --git a/hooks/pre-push b/hooks/pre-push
index 3a46922..0246776 100755
--- a/hooks/pre-push
+++ b/hooks/pre-push
@@ -66,7 +66,3 @@ scp *.deb *.rpm					"${USER_HOST}:${BIN}/avx2/"
 ssh "${USER_HOST}"				"mv ${LATEST} ${AWAY}"
 ssh "${USER_HOST}"				"mv ${TEMP} ${LATEST}"
 ssh "${USER_HOST}"				"rm -rf ${AWAY}"
-
-# Legacy, for KubeVirt tests
-# CFLAGS="-DPASST_LEGACY_NO_OPTIONS -static" make avx2
-# scp passt qrap				"${USER_HOST}:${BUILDS}/static/"
diff --git a/passt.c b/passt.c
index 36f0161..3d18d1f 100644
--- a/passt.c
+++ b/passt.c
@@ -309,9 +309,7 @@ int main(int argc, char **argv)
 	struct sigaction sa;
 	char *log_name;
 
-#ifndef PASST_LEGACY_NO_OPTIONS
 	check_root();
-#endif
 	drop_caps();
 
 	c.pasta_userns_fd = c.pasta_netns_fd = c.fd_tap = c.fd_tap_listen = -1;
diff --git a/tap.c b/tap.c
index 38004a5..9e6ece9 100644
--- a/tap.c
+++ b/tap.c
@@ -818,13 +818,6 @@ static void tap_sock_unix_init(struct ctx *c)
 	}
 
 	info("UNIX domain socket bound at %s\n", addr.sun_path);
-#ifdef PASST_LEGACY_NO_OPTIONS
-	/*
-	 * syscalls:passt chmod
-	 */
-	chmod(addr.sun_path,
-	      S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-#endif
 
 	listen(fd, 0);
 
-- 
cgit v1.2.3