diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-02-24 14:19:25 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-02-24 14:19:25 +0000 |
| commit | 0ec5613eb5d0720ff859542ccc561aeb14d31ba5 (patch) | |
| tree | 7f9522038d43609b6061d59a45ee34870f4a2087 /src | |
| parent | 54b2c420ca9f205c6ac455feab6b2e5aafa8a92a (diff) | |
| download | krb5-0ec5613eb5d0720ff859542ccc561aeb14d31ba5.tar.gz krb5-0ec5613eb5d0720ff859542ccc561aeb14d31ba5.tar.xz krb5-0ec5613eb5d0720ff859542ccc561aeb14d31ba5.zip | |
Test for <arpa/inet.h> for possible inet_ntop prototype
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12065 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/clients/ChangeLog | 5 | ||||
| -rw-r--r-- | src/clients/configure.in | 2 | ||||
| -rw-r--r-- | src/clients/klist/ChangeLog | 6 | ||||
| -rw-r--r-- | src/clients/klist/klist.c | 7 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/clients/ChangeLog b/src/clients/ChangeLog index 1a5356fee..2ab67bdaa 100644 --- a/src/clients/ChangeLog +++ b/src/clients/ChangeLog @@ -1,3 +1,8 @@ +2000-02-24 Ezra Peisach <epeisach@mit.edu> + + * configure.in: Test for <arpa/inet.h> include file for inet_ntop + prototype. + 2000-02-07 Ken Raeburn <raeburn@mit.edu> * configure.in: Check for inet_ntop and getipnodebyaddr, both used diff --git a/src/clients/configure.in b/src/clients/configure.in index 6ab8d37d8..bd2046d2c 100644 --- a/src/clients/configure.in +++ b/src/clients/configure.in @@ -10,7 +10,7 @@ else SETENVOBJ= fi AC_SUBST(SETENVOBJ) -AC_CHECK_HEADERS(unistd.h pwd.h) +AC_CHECK_HEADERS(unistd.h pwd.h arpa/inet.h) case $krb5_cv_host in alpha-dec-osf*) AC_CHECK_LIB(security,setluid, diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog index 2539ba0a4..8eb54d7be 100644 --- a/src/clients/klist/ChangeLog +++ b/src/clients/klist/ChangeLog @@ -1,3 +1,9 @@ +2000-02-24 Ezra Peisach <epeisach@engrailed.mit.edu> + + * klist.c: Include <arpa/inet.h> if present for inet_ntop + prototype. Use const for the variable receiving the result of + inet_ntop. + 2000-02-16 Danilo Almeida <dalmeida@mit.edu> * klist.c: Fix GET_PROGNAME macro to properly return program name diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c index d3f8ef2f3..c448d980f 100644 --- a/src/clients/klist/klist.c +++ b/src/clients/klist/klist.c @@ -36,6 +36,9 @@ #include <string.h> #include <stdio.h> #include <time.h> +#if defined(HAVE_ARPA_INET_H) +#include <arpa/inet.h> +#endif #ifndef _WIN32 #define GET_PROGNAME(x) (strrchr((x), '/') ? strrchr((x), '/')+1 : (x)) @@ -110,7 +113,9 @@ void usage() * whether Kerberos 4 and Keberos 5 libraries are available */ +#ifdef KRB5_KRB4_COMPAT static int got_k4 = 0; +#endif static int got_k5 = 0; int @@ -652,7 +657,7 @@ void one_addr(a) if (no_resolve || !h) { #ifdef HAVE_INET_NTOP char buf[46]; - char *name = inet_ntop(a->addrtype, a->contents, buf, sizeof(buf)); + const char *name = inet_ntop(a->addrtype, a->contents, buf, sizeof(buf)); if (name) { printf ("%s", name); return; |