diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-12-13 03:41:59 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-12-13 03:41:59 +0000 |
| commit | d4a345a4b464a5ce403cc6cd9f673a3abd06248f (patch) | |
| tree | 7fcbec4fdf10c7df17d9e50e4907404fa1c466b8 /src/kdc | |
| parent | 6687799a35b9d75ebc9e3c3740e5ed2e2a2d6b96 (diff) | |
| download | krb5-d4a345a4b464a5ce403cc6cd9f673a3abd06248f.tar.gz krb5-d4a345a4b464a5ce403cc6cd9f673a3abd06248f.tar.xz krb5-d4a345a4b464a5ce403cc6cd9f673a3abd06248f.zip | |
fix multiple-include problem on OpenBSD
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12893 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | src/kdc/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kdc/network.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 3780f9d9ac..de700c2bb8 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 83c5565fa3..d7e7596e9a 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; |