openssh unix dev - Dec 2018 - [PATCH] drop old netinet/in_systm.h include

This header provides only three typedefs: n_long, n_short, and n_time.
OpenSSH doesn't use it at all, and the headers it includes don't.  So
punt this ancient include since it offers nothing useful.
---
 defines.h  | 1 -
 includes.h | 1 -
 misc.c     | 1 -
 readconf.c | 1 -
 servconf.c | 1 -
 5 files changed, 5 deletions(-)

diff --git a/defines.h b/defines.h
index 8f4213062a9c..e7a71726f6b2 100644
--- a/defines.h
+++ b/defines.h
@@ -55,7 +55,6 @@ enum
 /*
  * Definitions for IP type of service (ip_tos)
  */
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #ifndef IPTOS_LOWDELAY
 # define IPTOS_LOWDELAY          0x10
diff --git a/includes.h b/includes.h
index 0fd71792e1ac..94cbc92edd1c 100644
--- a/includes.h
+++ b/includes.h
@@ -110,7 +110,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h> /* For typedefs */
 #ifdef HAVE_RPC_TYPES_H
 # include <rpc/types.h> /* For INADDR_LOOPBACK */
 #endif
diff --git a/misc.c b/misc.c
index dd74c8d45874..c8f6b6a33023 100644
--- a/misc.c
+++ b/misc.c
@@ -47,7 +47,6 @@
 #include <unistd.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
diff --git a/readconf.c b/readconf.c
index 7331ef5ad6ca..de721e95070b 100644
--- a/readconf.c
+++ b/readconf.c
@@ -21,7 +21,6 @@
 #include <sys/un.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 
diff --git a/servconf.c b/servconf.c
index 52d9be4295be..01e596097839 100644
--- a/servconf.c
+++ b/servconf.c
@@ -20,7 +20,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #ifdef HAVE_NET_ROUTE_H
 #include <net/route.h>
-- 
2.19.1

On Tue, 11 Dec 2018, Mike Frysinger wrote:
> This header provides only three typedefs: n_long, n_short, and n_time.
> OpenSSH doesn't use it at all, and the headers it includes don't. 
So
> punt this ancient include since it offers nothing useful.
IIRC this was needed on some systems because other sys/* headers depended
on its definitions. 

No idea if that's still the case though

On 14 Dec 2018 16:31, Damien Miller wrote:
> On Tue, 11 Dec 2018, Mike Frysinger wrote:
> > This header provides only three typedefs: n_long, n_short, and n_time.
> > OpenSSH doesn't use it at all, and the headers it includes
don't.  So
> > punt this ancient include since it offers nothing useful.
> 
> IIRC this was needed on some systems because other sys/* headers depended
> on its definitions. 
> 
> No idea if that's still the case though
i looked through current {Open,Net,Free}BSD systems and couldn't find
such dependencies.  so it's a question of what systems still exist ...

alternatively could add a configure time test for the header and move
the include to something like includes.h.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL:
<http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20181214/06ba8ec0/attachment.asc>