From 395002a2ec6c1c63e9fd9e7a5e045c08e52c3499 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Sun, 21 Dec 2014 00:54:49 +0000
Subject: [PATCH] Stop pulling in <arpa/inet.h> or <arpa/nameser.h> when
 unnecessary. *Do* pull it in when in_{port,addr}_h is needed and
 <netinet/in.h> isn't.

ok reyk@
---
 usr.sbin/httpd/config.c      | 4 +---
 usr.sbin/httpd/control.c     | 3 ++-
 usr.sbin/httpd/log.c         | 3 +--
 usr.sbin/httpd/logger.c      | 3 ++-
 usr.sbin/httpd/parse.y       | 3 +--
 usr.sbin/httpd/proc.c        | 3 +--
 usr.sbin/httpd/server.c      | 3 +--
 usr.sbin/httpd/server_fcgi.c | 3 +--
 usr.sbin/httpd/server_file.c | 3 +--
 usr.sbin/httpd/server_http.c | 3 +--
 usr.sbin/relayd/agentx.c     | 4 +---
 usr.sbin/relayd/check_icmp.c | 3 +--
 usr.sbin/relayd/config.c     | 4 +---
 usr.sbin/relayd/log.c        | 3 +--
 usr.sbin/relayd/parse.y      | 3 +--
 usr.sbin/relayd/pfe_route.c  | 3 +--
 usr.sbin/relayd/proc.c       | 3 +--
 usr.sbin/relayd/relay.c      | 3 +--
 usr.sbin/relayd/relay_http.c | 3 +--
 usr.sbin/relayd/relay_udp.c  | 3 +--
 usr.sbin/relayd/relayd.h     | 3 ++-
 usr.sbin/relayd/shuffle.c    | 3 +--
 usr.sbin/relayd/snmp.c       | 3 +--
 23 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index b35d3de4e3a..d651a02239d 100644
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.25 2014/12/12 14:45:59 reyk Exp $	*/
+/*	$OpenBSD: config.c,v 1.26 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -25,8 +25,6 @@
 #include <net/if.h>
 #include <net/pfvar.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
 #include <net/route.h>
 
 #include <ctype.h>
diff --git a/usr.sbin/httpd/control.c b/usr.sbin/httpd/control.c
index 1988ba7fc3a..a6422bc0cef 100644
--- a/usr.sbin/httpd/control.c
+++ b/usr.sbin/httpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.4 2014/08/04 15:49:28 reyk Exp $	*/
+/*	$OpenBSD: control.c,v 1.5 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -23,6 +23,7 @@
 #include <sys/un.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
 
 #include <errno.h>
 #include <event.h>
diff --git a/usr.sbin/httpd/log.c b/usr.sbin/httpd/log.c
index dc06b1653b6..f086d00735f 100644
--- a/usr.sbin/httpd/log.c
+++ b/usr.sbin/httpd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.3 2014/10/25 03:23:49 lteo Exp $	*/
+/*	$OpenBSD: log.c,v 1.4 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -24,7 +24,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/usr.sbin/httpd/logger.c b/usr.sbin/httpd/logger.c
index 94026955c89..672f3b820c1 100644
--- a/usr.sbin/httpd/logger.c
+++ b/usr.sbin/httpd/logger.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logger.c,v 1.7 2014/11/11 15:54:45 beck Exp $	*/
+/*	$OpenBSD: logger.c,v 1.8 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -22,6 +22,7 @@
 #include <sys/uio.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 84b70c86993..943e00ad232 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.45 2014/12/18 10:10:11 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.46 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -35,7 +35,6 @@
 #include <net/pfvar.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <arpa/nameser.h>
 #include <net/route.h>
 
 #include <ctype.h>
diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c
index fc3c0e4a8db..95c3e984998 100644
--- a/usr.sbin/httpd/proc.c
+++ b/usr.sbin/httpd/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.6 2014/12/16 03:35:49 millert Exp $	*/
+/*	$OpenBSD: proc.c,v 1.7 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -26,7 +26,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index cc4c69075fe..1d30f352413 100644
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.48 2014/12/12 14:45:59 reyk Exp $	*/
+/*	$OpenBSD: server.c,v 1.49 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -29,7 +29,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c
index 43fe45ccfd2..842214e9ccf 100644
--- a/usr.sbin/httpd/server_fcgi.c
+++ b/usr.sbin/httpd/server_fcgi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_fcgi.c,v 1.42 2014/12/12 14:45:59 reyk Exp $	*/
+/*	$OpenBSD: server_fcgi.c,v 1.43 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2014 Florian Obser <florian@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/httpd/server_file.c b/usr.sbin/httpd/server_file.c
index cd751584b63..a476f370801 100644
--- a/usr.sbin/httpd/server_file.c
+++ b/usr.sbin/httpd/server_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_file.c,v 1.41 2014/12/12 14:45:59 reyk Exp $	*/
+/*	$OpenBSD: server_file.c,v 1.42 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c
index 8a4b7ab5591..e317a3a6391 100644
--- a/usr.sbin/httpd/server_http.c
+++ b/usr.sbin/httpd/server_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_http.c,v 1.56 2014/12/08 19:31:27 florian Exp $	*/
+/*	$OpenBSD: server_http.c,v 1.57 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/relayd/agentx.c b/usr.sbin/relayd/agentx.c
index 56e6e472089..bfc9b25e795 100644
--- a/usr.sbin/relayd/agentx.c
+++ b/usr.sbin/relayd/agentx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: agentx.c,v 1.8 2014/11/19 10:24:40 blambert Exp $    */
+/*      $OpenBSD: agentx.c,v 1.9 2014/12/21 00:54:49 guenther Exp $    */
 /*
  * Copyright (c) 2013,2014 Bret Stephen Lambert <blambert@openbsd.org>
  *
@@ -21,8 +21,6 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 
-#include <arpa/inet.h>
-
 #include <err.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c
index 0d2b2f2bf38..a32d9306a7a 100644
--- a/usr.sbin/relayd/check_icmp.c
+++ b/usr.sbin/relayd/check_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_icmp.c,v 1.37 2014/10/25 03:23:49 lteo Exp $	*/
+/*	$OpenBSD: check_icmp.c,v 1.38 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -27,7 +27,6 @@
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp6.h>
-#include <arpa/inet.h>
 
 #include <limits.h>
 #include <event.h>
diff --git a/usr.sbin/relayd/config.c b/usr.sbin/relayd/config.c
index 4aab8c445f3..6537e6d5c04 100644
--- a/usr.sbin/relayd/config.c
+++ b/usr.sbin/relayd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.21 2014/12/12 10:05:09 reyk Exp $	*/
+/*	$OpenBSD: config.c,v 1.22 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -25,8 +25,6 @@
 #include <net/if.h>
 #include <net/pfvar.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
 #include <net/route.h>
 
 #include <ctype.h>
diff --git a/usr.sbin/relayd/log.c b/usr.sbin/relayd/log.c
index 4dbc0527332..ff4e3bbf418 100644
--- a/usr.sbin/relayd/log.c
+++ b/usr.sbin/relayd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.25 2014/12/12 10:05:09 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.26 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -24,7 +24,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index 48128698ed9..bbf22f6010c 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.197 2014/12/18 20:55:01 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.198 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -35,7 +35,6 @@
 #include <net/pfvar.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <arpa/nameser.h>
 #include <net/route.h>
 
 #include <ctype.h>
diff --git a/usr.sbin/relayd/pfe_route.c b/usr.sbin/relayd/pfe_route.c
index ace000a1ea8..715bad81f30 100644
--- a/usr.sbin/relayd/pfe_route.c
+++ b/usr.sbin/relayd/pfe_route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_route.c,v 1.6 2014/06/25 11:05:15 reyk Exp $	*/
+/*	$OpenBSD: pfe_route.c,v 1.7 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009 - 2011 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
 
 #include <net/if.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <net/route.h>
 
 #include <stdio.h>
diff --git a/usr.sbin/relayd/proc.c b/usr.sbin/relayd/proc.c
index f0dfcbba403..d8c67611d9c 100644
--- a/usr.sbin/relayd/proc.c
+++ b/usr.sbin/relayd/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.18 2014/12/16 03:35:49 millert Exp $	*/
+/*	$OpenBSD: proc.c,v 1.19 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -26,7 +26,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index 55b444ee581..bb0651948c4 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.183 2014/12/18 20:55:01 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.184 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/relayd/relay_http.c b/usr.sbin/relayd/relay_http.c
index 82820ccf420..6622c34be64 100644
--- a/usr.sbin/relayd/relay_http.c
+++ b/usr.sbin/relayd/relay_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_http.c,v 1.36 2014/12/18 20:55:01 reyk Exp $	*/
+/*	$OpenBSD: relay_http.c,v 1.37 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/relayd/relay_udp.c b/usr.sbin/relayd/relay_udp.c
index d447c712cbd..df1912218a5 100644
--- a/usr.sbin/relayd/relay_udp.c
+++ b/usr.sbin/relayd/relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.36 2014/12/18 20:55:01 reyk Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.37 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index cd894508000..ab2b534fab4 100644
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.200 2014/12/18 20:55:01 reyk Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.201 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -24,6 +24,7 @@
 #include <sys/tree.h>
 
 #include <sys/param.h>		/* MAXHOSTNAMELEN */
+#include <netinet/in.h>
 #include <limits.h>
 #include <imsg.h>
 #include <siphash.h>
diff --git a/usr.sbin/relayd/shuffle.c b/usr.sbin/relayd/shuffle.c
index fd7d3717e90..256d16dba16 100644
--- a/usr.sbin/relayd/shuffle.c
+++ b/usr.sbin/relayd/shuffle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shuffle.c,v 1.2 2009/06/09 16:26:03 deraadt Exp $	*/
+/*	$OpenBSD: shuffle.c,v 1.3 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Portions Copyright (C) 2008 Theo de Raadt
@@ -24,7 +24,6 @@
 
 #include <netinet/in.h>
 #include <net/if.h>
-#include <arpa/inet.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/relayd/snmp.c b/usr.sbin/relayd/snmp.c
index a40b1f35af1..5715cb8396d 100644
--- a/usr.sbin/relayd/snmp.c
+++ b/usr.sbin/relayd/snmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmp.c,v 1.20 2014/11/25 09:17:00 blambert Exp $	*/
+/*	$OpenBSD: snmp.c,v 1.21 2014/12/21 00:54:49 guenther Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
 
 #include <netinet/in.h>
 #include <net/if.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
-- 
2.20.1