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 3780f9d9ac55fbf468a1f63f09bac0da53089025..de700c2bb8c403e5ecbebfe85b5d13d11fc37eb4 100644 (file)
--- 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 83c5565fa3890c7ea396eb349ca61d5882513d24..d7e7596e9af62effc8231e03c12f314b47bdf440 100644 (file)
--- 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;