commit b3ef1874c36079d2d553f0f0ff29c020adda57a4
from: Stefan Sperling <stsp@stsp.name>
date: Tue Sep 17 09:39:57 2024 UTC

remove fallback code for OpenBSD 6.8 and earlier

commit - 8b2d313fcfd72c808e3b125f1c5033a1270e7bca
commit + b3ef1874c36079d2d553f0f0ff29c020adda57a4
blob - d3c7a2e25bd1707f0b4cdffecf31a4a7c8d5538d
blob + f275fff419cb80238e276ff4a0f2d76159ecb0ef
--- commands.c
+++ commands.c
@@ -1102,9 +1102,7 @@ struct intlist Intlist[] = {
 	{ "inet",	"IPv4/IPv6 addresses",			CMPL(h) (char **)intiphelp, sizeof(struct ghs), intip, 1 },
 	{ "ip",		"Alias for \"inet\" command",		CMPL(h) (char **)intiphelp, sizeof(struct ghs), intip, 1 },
 	{ "alias",	NULL, /* backwards compatibilty */	CMPL(h) (char **)intiphelp, sizeof(struct ghs), intip, 1 },
-#ifdef IFXF_AUTOCONF4		/* 6.6+ */
 	{ "autoconf4",  "IPv4 Autoconfigurable address (DHCP)",	CMPL0 0, 0, intxflags, 1 },
-#endif
 	{ "description", "Interface description",		CMPL0 0, 0, intdesc, 1 },
 	{ "group",	"Interface group",			CMPL0 0, 0, intgroup, 1 },
 	{ "rdomain",	"Interface routing domain",		CMPL0 0, 0, intrdomain, 1 },
@@ -1174,16 +1172,9 @@ struct intlist Intlist[] = {
 	{ "mpls",	"MPLS",					CMPL0 0, 0, intxflags, 1 },
 	{ "inet6",	"IPv6 addresses",			CMPL(h) (char **)intip6help, sizeof(struct ghs), intip, 1 },
 	{ "autoconf6",  "IPv6 Autoconfigurable address",	CMPL0 0, 0, intxflags, 1 },
-#ifdef IFXF_INET6_NOPRIVACY	/* pre-6.9 */
-	{ "autoconfprivacy", "Privacy addresses for IPv6 autoconf", CMPL0 0, 0, intxflags, 1 },
-#endif
-#ifdef IFXF_AUTOCONF6TEMP	/* 6.9+ */
 	{ "autoconfprivacy", "Privacy addresses for IPv6 autoconf", CMPL0 0, 0, intxflags, 1 }, /* XXX bkcompat */
 	{ "temporary",	"Temporary addresses for IPv6 autoconf", CMPL0 0, 0, intxflags, 1 },
-#endif
-#ifdef IFXF_MONITOR		/* 6.9+ */
 	{ "monitor",	"Monitor mode for incoming traffic",	CMPL0 0, 0, intxflags, 1 },
-#endif
 	{ "wgpeer",	"Wireguard peer config",		CMPL0 0, 0, intwgpeer, 1 },
 	{ "wgport",	"Wireguard UDP port",			CMPL0 0, 0, intwg, 1 },
 	{ "wgkey",	"Wireguard private key",		CMPL0 0, 0, intwg, 1 },
blob - 59857e36537bbbad39dc7b6f9c2fea7a2f4adc67
blob + ae6e56540ceb9ca63ab56bfd40d22810c7e1fe64
--- conf.c
+++ conf.c
@@ -533,7 +533,6 @@ dhcpleased_has_defaultroute(struct sockaddr_rtlabel *s
 int
 dhcpleased_controls_interface(char *ifname, int ifs)
 {
-#ifdef IFXF_AUTOCONF4		/* 6.6+ */
 	int ifxflags;
 
 	if (!dhcpleased_is_running())
@@ -541,9 +540,6 @@ dhcpleased_controls_interface(char *ifname, int ifs)
 
 	ifxflags = get_ifxflags(ifname, ifs);
 	return ((ifxflags & IFXF_AUTOCONF4) != 0);
-#else
-	return 0;
-#endif
 }
 
 /*
@@ -946,18 +942,10 @@ void conf_ifxflags(FILE *output, int ifs, char *ifname
 			fprintf(output, " mpls\n");
 		if (ifr.ifr_flags & IFXF_AUTOCONF6)
 			fprintf(output, " autoconf6\n");
-#ifdef IFXF_INET6_NOPRIVACY	/* pre-6.9 */
-		if (ifr.ifr_flags & IFXF_INET6_NOPRIVACY)
-			fprintf(output, " no autoconfprivacy\n");
-#endif
-#ifdef IFXF_AUTOCONF6TEMP	/* 6.9+ */
 		if (ifr.ifr_flags & IFXF_AUTOCONF6TEMP)
 			fprintf(output, " temporary\n");
-#endif
-#ifdef IFXF_MONITOR		/* 6.9+ */
 		if (ifr.ifr_flags & IFXF_MONITOR)
 			fprintf(output, " monitor\n");
-#endif
 		if (ifr.ifr_flags & IFXF_WOL)
 			fprintf(output, " wol\n");
 	}
blob - 6b53fbb6dd34907c5c9db71a1e0049f934873831
blob + 031502710a5c7be123a4d9e6bd7367f75378b4f7
--- if.c
+++ if.c
@@ -645,14 +645,12 @@ show_autoconf(int argc, char **argv)
 			continue;
 
 		ifxflags = get_ifxflags(ifnp->if_name, ifs);
-#ifdef IFXF_AUTOCONF4		/* 6.6+ */
 		if ((ifxflags & IFXF_AUTOCONF4) && dhcpleased_is_running()) {
 			char *args[] = { DHCPLEASECTL, "-l",
 			    ifnp->if_name, NULL };
 			cmdargs_output(DHCPLEASECTL, args, fd, nullfd);
 			have_output = 1;
 		}
-#endif
 		if ((ifxflags & IFXF_AUTOCONF6) && slaacd_is_running()) {
 			char *args[] = { SLAACCTL, "show", "interface",
 			    ifnp->if_name, NULL };
@@ -2507,26 +2505,17 @@ intxflags(char *ifname, int ifs, int argc, char **argv
 		set = 1;
 
 	if (isprefix(argv[0], "autoconfprivacy")) {
-#ifdef IFXF_INET6_NOPRIVACY	/* pre-6.9 */
-		value = -IFXF_INET6_NOPRIVACY;
-#endif
-#ifdef IFXF_AUTOCONF6TEMP	/* 6.9+ */
 		value = IFXF_AUTOCONF6TEMP;
 	} else if (isprefix(argv[0], "temporary")) {
 		value = IFXF_AUTOCONF6TEMP;
-#endif
-#ifdef IFXF_MONITOR		/* 6.9+ */
 	} else if (isprefix(argv[0], "monitor")) {
 		value = IFXF_MONITOR;
-#endif
-#ifdef IFXF_AUTOCONF4		/* 6.6+ */
 	} else if (isprefix(argv[0], "autoconf4")) {
 		/* Have "autoconf4" on pppoe(4) do the right thing. */
 		if (is_pppoe(ifname, ifs))
 			return run_ipcp(ifname, ifs, set);
 
 		value = IFXF_AUTOCONF4;
-#endif
 	} else if (isprefix(argv[0], "autoconf6")) {
 		value = IFXF_AUTOCONF6;
 	} else if (isprefix(argv[0], "mpls")) {