diff options
| author | Tom Yu <tlyu@mit.edu> | 2000-02-25 22:11:12 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2000-02-25 22:11:12 +0000 |
| commit | d9b950dd26da3523dfb7462be427ba6bfe0fea05 (patch) | |
| tree | 534eddfabac685100e03a94d8cec121c9976fb54 /src | |
| parent | 5bae06639e2667c9da241ec9e3d032e0c41e0442 (diff) | |
| download | krb5-d9b950dd26da3523dfb7462be427ba6bfe0fea05.tar.gz krb5-d9b950dd26da3523dfb7462be427ba6bfe0fea05.tar.xz krb5-d9b950dd26da3523dfb7462be427ba6bfe0fea05.zip | |
* configure.in: Check for sys/sockio.h
* network.c: Conditionally include sys/sockio.h for SIOC* if
necessary.
(process_packet): Bracket AF_INET6 branch of a switch statement
with an ifdef.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12074 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdc/ChangeLog | 9 | ||||
| -rw-r--r-- | src/kdc/configure.in | 2 | ||||
| -rw-r--r-- | src/kdc/network.c | 6 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index ec22618cc..a49e84c9a 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,12 @@ +2000-02-25 Tom Yu <tlyu@mit.edu> + + * configure.in: Check for sys/sockio.h + + * network.c: Conditionally include sys/sockio.h for SIOC* if + necessary. + (process_packet): Bracket AF_INET6 branch of a switch statement + with an ifdef. + 2000-02-25 Ken Raeburn <raeburn@mit.edu> Alec H. Peterson <ahp@hilander.com> diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 8b56a1c83..6bcd6c4d9 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -2,7 +2,7 @@ AC_INIT(main.c) CONFIG_RULES AC_PROG_INSTALL AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) -AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h) +AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h sys/sockio.h) AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf) AC_PROG_AWK KRB5_AC_INET6 diff --git a/src/kdc/network.c b/src/kdc/network.c index 713ef02f1..e77a12110 100644 --- a/src/kdc/network.c +++ b/src/kdc/network.c @@ -40,6 +40,10 @@ #include <sys/types.h> #include <netinet/in.h> #include <sys/socket.h> +#ifdef HAVE_SYS_SOCKIO_H +/* for SIOCGIFCONF, etc. */ +#include <sys/sockio.h> +#endif #include <sys/time.h> #if HAVE_SYS_SELECT_H #include <sys/select.h> @@ -406,11 +410,13 @@ void process_packet(port_fd, prog, portnum) addr.length = 4; addr.contents = (krb5_octet *) &((struct sockaddr_in *)&saddr)->sin_addr; break; +#ifdef KRB5_USE_INET6 case AF_INET6: addr.addrtype = ADDRTYPE_INET6; addr.length = 16; addr.contents = (krb5_octet *) &((struct sockaddr_in6 *)&saddr)->sin6_addr; break; +#endif default: addr.addrtype = -1; addr.length = 0; |