From: Alexander Bluhm <alexander.bluhm@gmx.net>
Subject: remove include ip6_var.h
To: tech@openbsd.org
Date: Sun, 11 Feb 2024 20:18:57 +0100

Hi,

These userland programs don't need netinet6/ip6_var.h header.  As
struct ip6po_rhinfo contains struct route_in6, I want to reduce
this exposure to a minimum.  Only netstat/inet6.c is still infected.
Diff passes make release.

ok?

bluhm

Index: lib/libkvm/kvm_file2.c
===================================================================
RCS file: /mount/openbsd/cvs/src/lib/libkvm/kvm_file2.c,v
diff -u -p -r1.57 kvm_file2.c
--- lib/libkvm/kvm_file2.c	22 Feb 2022 17:35:01 -0000	1.57
+++ lib/libkvm/kvm_file2.c	11 Feb 2024 13:25:50 -0000
@@ -103,7 +103,6 @@
 
 #ifdef INET6
 #include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #endif
 
 #include <fcntl.h>
Index: usr.sbin/rad/frontend.c
===================================================================
RCS file: /mount/openbsd/cvs/src/usr.sbin/rad/frontend.c,v
diff -u -p -r1.43 frontend.c
--- usr.sbin/rad/frontend.c	14 Dec 2023 11:09:34 -0000	1.43
+++ usr.sbin/rad/frontend.c	11 Feb 2024 13:22:54 -0000
@@ -66,7 +66,6 @@
 #include <netinet6/nd6.h>
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 
 #include <ctype.h>
Index: sbin/slaacd/engine.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sbin/slaacd/engine.c,v
diff -u -p -r1.87 engine.c
--- sbin/slaacd/engine.c	3 Feb 2024 18:30:17 -0000	1.87
+++ sbin/slaacd/engine.c	11 Feb 2024 13:23:40 -0000
@@ -60,7 +60,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
 
Index: sbin/slaacd/frontend.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sbin/slaacd/frontend.c,v
diff -u -p -r1.65 frontend.c
--- sbin/slaacd/frontend.c	14 Dec 2023 09:58:59 -0000	1.65
+++ sbin/slaacd/frontend.c	11 Feb 2024 13:23:26 -0000
@@ -37,7 +37,6 @@
 #include <netinet6/nd6.h>
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 
 #include <errno.h>
Index: sbin/sysctl/sysctl.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sbin/sysctl/sysctl.c,v
diff -u -p -r1.259 sysctl.c
--- sbin/sysctl/sysctl.c	17 May 2023 22:12:51 -0000	1.259
+++ sbin/sysctl/sysctl.c	11 Feb 2024 13:24:47 -0000
@@ -75,7 +75,6 @@
 
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
-#include <netinet6/ip6_var.h>
 #include <netinet6/ip6_divert.h>
 
 #include <netmpls/mpls.h>