From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 13 Dec 2000 03:41:59 +0000 (+0000)
Subject: fix multiple-include problem on OpenBSD
X-Git-Tag: krb5-1.3-alpha1~1731
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4a345a4b464a5ce403cc6cd9f673a3abd06248f;p=krb5.git

fix multiple-include problem on OpenBSD

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12893 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 3780f9d9a..de700c2bb 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,5 +1,9 @@
 2000-12-12  Ken Raeburn  <raeburn@mit.edu>
 
+	* network.c: Don't include net/if.h if ARPHRD_ETHER is defined.
+	Fix suggested by Kevin Coffman <kwc@citi.umich.edu> for OpenBSD,
+	which breaks on multiple inclusions of net/if.h.
+
 	* configure.in: Look for ifaddrs.h.
 	* network.c (printaddr, printifaddr, addr_eq, foreach_localaddr):
 	Update from lib/krb5/os/localaddr.c, including getifaddrs
diff --git a/src/kdc/network.c b/src/kdc/network.c
index 83c5565fa..d7e7596e9 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -51,7 +51,9 @@
 #endif
 #include <arpa/inet.h>
 
+#ifndef ARPHRD_ETHER /* OpenBSD breaks on multiple inclusions */
 #include <net/if.h>
+#endif
 
 extern int errno;