summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ftp-proxy
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-01-21 21:50:32 +0000
committerderaadt <deraadt@openbsd.org>2015-01-21 21:50:32 +0000
commit68928c43a99c1507757b46fa476c5482a4d9e547 (patch)
tree5bf56e1982f7ba71f533dfad5168b595aa24f8c8 /usr.sbin/ftp-proxy
parentRemove the useless variable ifa in rt_getifa(). (diff)
downloadwireguard-openbsd-68928c43a99c1507757b46fa476c5482a4d9e547.tar.xz
wireguard-openbsd-68928c43a99c1507757b46fa476c5482a4d9e547.zip
Include <netinet/in.h> before <net/pfvar.h>. In a future change when
ports is ready, <net/pfvar.h> will stop including a pile of balony.
Diffstat (limited to 'usr.sbin/ftp-proxy')
-rw-r--r--usr.sbin/ftp-proxy/filter.c6
-rw-r--r--usr.sbin/ftp-proxy/ftp-proxy.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/ftp-proxy/filter.c b/usr.sbin/ftp-proxy/filter.c
index 25ecc8208b9..dd4a9eebe47 100644
--- a/usr.sbin/ftp-proxy/filter.c
+++ b/usr.sbin/ftp-proxy/filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filter.c,v 1.20 2012/09/18 10:11:53 henning Exp $ */
+/* $OpenBSD: filter.c,v 1.21 2015/01/21 21:50:33 deraadt Exp $ */
/*
* Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -20,11 +20,11 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <net/if.h>
-#include <net/pfvar.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
+#include <net/if.h>
+#include <net/pfvar.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c
index 0803e414019..57d58fa97ff 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy.c
+++ b/usr.sbin/ftp-proxy/ftp-proxy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp-proxy.c,v 1.29 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: ftp-proxy.c,v 1.30 2015/01/21 21:50:33 deraadt Exp $ */
/*
* Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -22,10 +22,10 @@
#include <sys/resource.h>
#include <sys/socket.h>
-#include <net/if.h>
-#include <net/pfvar.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <net/if.h>
+#include <net/pfvar.h>
#include <err.h>
#include <errno.h>