diff options
40 files changed, 130 insertions, 49 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3ab8ec1b16..73b9a01a94 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 25 21:06:40 1997 Tom Yu <tlyu@mit.edu> + + * acconfig.h: Punt HAS_SETVBUF, HAS_UNISTD_H, KRB5_USE_INET. + Thu Sep 18 17:51:39 1997 Tom Yu <tlyu@mit.edu> * acconfig.h: Remove USE_STRING_H, HAS_STRDUP, HAS_LABS diff --git a/src/acconfig.h b/src/acconfig.h index f67b762138..53c237dd22 100644 --- a/src/acconfig.h +++ b/src/acconfig.h @@ -7,7 +7,6 @@ handle it on some systems. */ #undef ANSI_STDIO -#undef HAS_SETVBUF #undef HAS_STDLIB_H #undef HAS_VOID_TYPE #undef KRB5_NO_PROTOTYPES @@ -23,8 +22,6 @@ #undef USE_DIRENT_H #undef WAIT_USES_INT #undef krb5_sigtype -#undef HAS_UNISTD_H -#undef KRB5_USE_INET #undef HAVE_STDARG_H #undef HAVE_VARARGS_H diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 2dd4e5af5d..a82c21bc4b 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 25 21:10:37 1997 Tom Yu <tlyu@mit.edu> + + * win-mac.h: Replace KRB5_USE_INET with something more sane. + + * k5-int.h: Replace HAS_UNISTD_H with something more sane. + Thu Sep 18 17:52:59 1997 Tom Yu <tlyu@mit.edu> * win-mac.h: Replace USE_STRING_H with something more sane. diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 47edbce03f..acb0fca197 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -375,7 +375,7 @@ extern char *getenv(); extern char *strdup KRB5_PROTOTYPE((const char *)); #endif -#ifdef HAS_UNISTD_H +#ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 9226e5efec..826e96773c 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 25 21:50:44 1997 Tom Yu <tlyu@mit.edu> + + * configure.in: Replace KRB5_USE_INET, HAS_UNISTD_H, HAS_SETVBUF. + Thu Sep 18 20:42:03 1997 Tom Yu <tlyu@mit.edu> * configure.in: Replace USE_STRING_H, HAS_STRDUP, HAS_LABS diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 2e6dcd8eb5..f197553267 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -4,7 +4,7 @@ AC_CONFIG_HEADER(autoconf.h) AC_PROG_LEX AC_PROG_INSTALL HAVE_YYLINENO -AC_CHECK_FUNCS(strdup labs) +AC_CHECK_FUNCS(strdup labs setvbuf) CHECK_DIRENT CHECK_WAIT_TYPE AC_TYPE_UID_T @@ -20,12 +20,11 @@ KRB5_SIGTYPE dnl dnl -AC_CHECK_HEADERS(string.h) +AC_CHECK_HEADERS(string.h unistd.h) AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H),AC_DEFINE(NO_STDLIB_H)) AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h macsock.h stddef.h xom.h dbm.h ndbm.h) AC_HEADER_STDARG -AC_FUNC_CHECK([setvbuf],AC_DEFINE(HAS_SETVBUF)) dnl check for ANSI stdio, esp "b" option to fopen(). This (unfortunately) dnl requires a run check... AC_C_CROSS @@ -86,8 +85,7 @@ dnl then from osconf.h, we have AC_TIME_WITH_SYS_TIME AC_CHECK_HEADERS(sys/time.h) -AC_HEADER_CHECK(netinet/in.h,AC_DEFINE(KRB5_USE_INET)) -AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H)) +AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) diff --git a/src/include/win-mac.h b/src/include/win-mac.h index 516c719979..cd787d0c71 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -96,7 +96,7 @@ typedef unsigned char u_char; #define MAXHOSTNAMELEN 512 #define MAXPATHLEN 256 /* Also for Windows temp files */ -#define KRB5_USE_INET +#define HAVE_NETINET_IN_H #define MSDOS_FILESYSTEM #define HAVE_STRING_H #define HAVE_SRAND diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog index d834bdbd96..aa65ef1d25 100644 --- a/src/kadmin/v5passwdd/ChangeLog +++ b/src/kadmin/v5passwdd/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 25 21:17:00 1997 Tom Yu <tlyu@mit.edu> + + * srv_net.c (net_init): Replace KRB5_USE_INET with something more + sane. + + * adm_conn.c (kadm_contact_server): Replace KRB5_USE_INET with + something more sane. + Thu Sep 18 17:54:40 1997 Tom Yu <tlyu@mit.edu> * kpasswd.c: Replace USE_STRING_H with something more sane. diff --git a/src/kadmin/v5passwdd/adm_conn.c b/src/kadmin/v5passwdd/adm_conn.c index 5a458fe69d..4d888782a9 100644 --- a/src/kadmin/v5passwdd/adm_conn.c +++ b/src/kadmin/v5passwdd/adm_conn.c @@ -332,7 +332,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote) /* * XXX - only know ADDRTYPE_INET. */ -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H *local = (krb5_address *) malloc(sizeof(krb5_address)); *remote = (krb5_address *) malloc(sizeof(krb5_address)); realm_name = (char *) malloc((size_t) realmp->length + 1); @@ -539,9 +539,9 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote) if (!found) kret = KRB5_SERVICE_UNKNOWN; } -#else /* KRB5_USE_INET */ +#else /* HAVE_NETINET_IN_H */ kret = ENOENT; -#endif /* KRB5_USE_INET */ +#endif /* HAVE_NETINET_IN_H */ cleanup: if (kret) { diff --git a/src/kadmin/v5passwdd/srv_net.c b/src/kadmin/v5passwdd/srv_net.c index eefc8981f5..a16a0bffdb 100644 --- a/src/kadmin/v5passwdd/srv_net.c +++ b/src/kadmin/v5passwdd/srv_net.c @@ -481,7 +481,7 @@ net_init(kcontext, realm, debug_level, port) } net_service_princ_init = 1; -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H /* Now get our host name/entry */ if (gethostname(our_host_name, sizeof(our_host_name))) { kret = errno; @@ -661,10 +661,10 @@ net_init(kcontext, realm, debug_level, port) ("- bound socket %d on port\n", net_listen_socket)); kret = 0; } -#else /* KRB5_USE_INET */ +#else /* HAVE_NETINET_IN_H */ /* Don't know how to do anything else. */ kret = ENOENT; -#endif /* KRB5_USE_INET */ +#endif /* HAVE_NETINET_IN_H */ done: DPRINT(DEBUG_CALLS, net_debug_level, ("X net_init() = %d\n", kret)); diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index da51802038..fc0363be73 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,13 @@ +Thu Sep 25 21:19:08 1997 Tom Yu <tlyu@mit.edu> + + * network.c: Replace KRB5_USE_IENT with something more sane. + + * do_tgs_req.c: Replace KRB5_USE_INET with something more sane. + + * main.c: Replace KRB5_USE_INET with something more sane. + + * do_as_req.c: Replace KRB5_USE_INET with something more sane. + Wed Sep 24 11:56:50 1997 Ezra Peisach <epeisach@kangaroo.mit.edu> * kdc_util.c (add_to_transited): Fix up memory leaks, clean out diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 5d87865b2d..e571680272 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -28,13 +28,13 @@ #include "com_err.h" #include <syslog.h> -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include <sys/types.h> #include <netinet/in.h> #ifndef hpux #include <arpa/inet.h> #endif /* hpux */ -#endif /* KRB5_USE_INET */ +#endif /* HAVE_NETINET_IN_H */ #include "kdc_util.h" #include "policy.h" @@ -83,7 +83,7 @@ krb5_data **response; /* filled in with a response packet */ e_data.data = 0; encrypting_key.contents = 0; -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H if (from->address->addrtype == ADDRTYPE_INET) fromstring = (char *) inet_ntoa(*(struct in_addr *)from->address->contents); #endif diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c index 7a83a9b324..be56124bcc 100644 --- a/src/kdc/do_tgs_req.c +++ b/src/kdc/do_tgs_req.c @@ -28,7 +28,7 @@ #include "com_err.h" #include <syslog.h> -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include <sys/types.h> #include <netinet/in.h> #ifndef hpux @@ -99,7 +99,7 @@ krb5_data **response; /* filled in with a response packet */ if ((retval = setup_server_realm(request->server))) return retval; -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H if (from->address->addrtype == ADDRTYPE_INET) fromstring = (char *) inet_ntoa(*(struct in_addr *)from->address->contents); diff --git a/src/kdc/main.c b/src/kdc/main.c index 80976c0910..83223e5d37 100644 --- a/src/kdc/main.c +++ b/src/kdc/main.c @@ -37,7 +37,7 @@ #include "extern.h" #include "kdc5_err.h" #include "kdb_kt.h" -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif diff --git a/src/kdc/network.c b/src/kdc/network.c index e098761bde..f2cc0b566a 100644 --- a/src/kdc/network.c +++ b/src/kdc/network.c @@ -30,7 +30,7 @@ #include "kdc5_err.h" #include <ctype.h> -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include <sys/types.h> #include <netinet/in.h> #include <sys/socket.h> diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index b94c9dc8dc..f8ed2e0ef5 100644 --- a/src/lib/crypto/os/ChangeLog +++ b/src/lib/crypto/os/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 25 21:53:11 1997 Tom Yu <tlyu@mit.edu> + + * c_localaddr.c: Replace KRB5_USE_INET with something more sane. + Tue Aug 12 09:09:14 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (SRCS): Add $(srcdir) as needed. diff --git a/src/lib/crypto/os/c_localaddr.c b/src/lib/crypto/os/c_localaddr.c index 5f861b7636..3b3bcb474f 100644 --- a/src/lib/crypto/os/c_localaddr.c +++ b/src/lib/crypto/os/c_localaddr.c @@ -47,7 +47,7 @@ * type; you have to ask for one with a valid type. * */ -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -153,7 +153,7 @@ n_found = 0; /* ifr->ifr_addr has what we want! */ switch (ifr->ifr_addr.sa_family) { -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H case AF_INET: { struct sockaddr_in *in = diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index 62570f32b7..7f3afaed12 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 25 21:30:36 1997 Tom Yu <tlyu@mit.edu> + + * adm_conn.c (kadm_contact_server): Replace KRB5_USE_INET with + something more sane. + Thu Nov 21 00:58:04 EST 1996 Richard Basch <basch@lehman.com> * Makefile.in: Win32 build diff --git a/src/lib/kadm/adm_conn.c b/src/lib/kadm/adm_conn.c index d341b8301e..29901ec6a7 100644 --- a/src/lib/kadm/adm_conn.c +++ b/src/lib/kadm/adm_conn.c @@ -332,7 +332,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote) /* * XXX - only know ADDRTYPE_INET. */ -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H *local = (krb5_address *) malloc(sizeof(krb5_address)); *remote = (krb5_address *) malloc(sizeof(krb5_address)); realm_name = (char *) malloc((size_t) realmp->length + 1); @@ -539,9 +539,9 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote) if (!found) kret = KRB5_SERVICE_UNKNOWN; } -#else /* KRB5_USE_INET */ +#else /* HAVE_NETINET_IN_H */ kret = ENOENT; -#endif /* KRB5_USE_INET */ +#endif /* HAVE_NETINET_IN_H */ cleanup: if (kret) { diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 2fd446a5b1..2f62b2bdd0 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 25 21:11:16 1997 Tom Yu <tlyu@mit.edu> + + * put_svc_key.c: Replace HAS_UNISTD_H with something more sane. + + * kuserok.c: Replace HAS_UNISTD_H with something more sane. + + * configure.in: Replace HAS_UNISTD_H with something more sane. + Mon Sep 1 21:37:36 1997 Tom Yu <tlyu@mit.edu> * decomp_tkt.c (decomp_ticket): Fix swapped args to memset. diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in index d9da67f4c1..179174e6e9 100644 --- a/src/lib/krb4/configure.in +++ b/src/lib/krb4/configure.in @@ -6,8 +6,7 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_CONST KRB5_POSIX_LOCKS -AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H)) -AC_CHECK_HEADERS(sys/select.h time.h) +AC_CHECK_HEADERS(sys/select.h time.h unistd.h) dnl Could check for full stdc environment, but will only test dnl for stdlib.h AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H)) diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c index 8f9a0b0503..0aee8934a0 100644 --- a/src/lib/krb4/kuserok.c +++ b/src/lib/krb4/kuserok.c @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <string.h> -#ifdef HAS_UNISTD_H +#ifdef HAVE_UNISTD_H #include <unistd.h> #endif #ifdef __SCO__ diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c index 4149be9642..f520b17dc3 100644 --- a/src/lib/krb4/put_svc_key.c +++ b/src/lib/krb4/put_svc_key.c @@ -27,7 +27,7 @@ #include <string.h> #include <stdio.h> #include <fcntl.h> -#ifdef HAS_UNISTD_H +#ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 4c54386415..7d8b7ce15f 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 25 21:23:11 1997 Tom Yu <tlyu@mit.edu> + + * fcc_maybe.c: Replace KRB5_USE_INET with something more sane. + + * fcc_gennew.c: Replace KRB5_USE_INET with something more sane. + Mon Sep 15 15:15:33 1997 Ezra Peisach <epeisach@mit.edu> * fcc-proto.h, fcc_reslv.c (krb5_fcc_resolve): Incoming name diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c index a76a192771..df98e0cd12 100644 --- a/src/lib/krb5/ccache/file/fcc_gennew.c +++ b/src/lib/krb5/ccache/file/fcc_gennew.c @@ -29,7 +29,7 @@ #include "fcc.h" #include "k5-int.h" -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H) #include <netinet/in.h> #endif diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c index 257c06e841..512e6f09af 100644 --- a/src/lib/krb5/ccache/file/fcc_maybe.c +++ b/src/lib/krb5/ccache/file/fcc_maybe.c @@ -34,7 +34,7 @@ #include "fcc.h" -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H) #include <netinet/in.h> #endif diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index 49c0b9ec78..4e4aba9ecc 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 25 21:04:47 1997 Tom Yu <tlyu@mit.edu> + + * scc_maybe.c (krb5_scc_open_file): Replace HAS_SETVBUF with + something more sane. + Mon Sep 15 15:15:33 1997 Ezra Peisach <epeisach@mit.edu> * scc-proto.h, scc_reslv.c (krb5_scc_resolve): Incoming name diff --git a/src/lib/krb5/ccache/stdio/scc_maybe.c b/src/lib/krb5/ccache/stdio/scc_maybe.c index ebddd0559d..1f93922d4d 100644 --- a/src/lib/krb5/ccache/stdio/scc_maybe.c +++ b/src/lib/krb5/ccache/stdio/scc_maybe.c @@ -128,7 +128,7 @@ krb5_scc_open_file (context, id, mode) f = fopen (data->filename, open_flag); if (!f) return krb5_scc_interpret (context, errno); -#ifdef HAS_SETVBUF +#ifdef HAVE_SETVBUF setvbuf(f, data->stdio_buffer, _IOFBF, sizeof (data->stdio_buffer)); #else setbuf (f, data->stdio_buffer); diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index ff2c9142b1..d50f8e38f7 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,21 @@ +Thu Sep 25 21:24:54 1997 Tom Yu <tlyu@mit.edu> + + * mk_faddr.c: Replace KRB5_USE_INET with something more sane. + + * port2ip.c: Replace KRB5_USE_INET with something more sane. + + * os-proto.h: Replace KRB5_USE_INET with something more sane. + + * locate_kdc.c: Replace KRB5_USE_INET with something more sane. + + * genaddrs.c (krb5_auth_con_genaddrs): Replace KRB5_USE_INET with + something more sane. + + * gen_port.c (krb5_gen_portaddr): Replace KRB5_USE_INET with + something more sane. + + * full_ipadr.c: Replace KRB5_USE_INET with something more sane. + Thu Sep 18 17:56:00 1997 Tom Yu <tlyu@mit.edu> * hst_realm.c: Replace USE_STRING_H with something more sane. diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c index 07ba48a25b..0a4e401c53 100644 --- a/src/lib/krb5/os/full_ipadr.c +++ b/src/lib/krb5/os/full_ipadr.c @@ -27,7 +27,7 @@ #define NEED_SOCKETS #include "k5-int.h" -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include "os-proto.h" diff --git a/src/lib/krb5/os/gen_port.c b/src/lib/krb5/os/gen_port.c index a5eb91bca5..1d84a0898a 100644 --- a/src/lib/krb5/os/gen_port.c +++ b/src/lib/krb5/os/gen_port.c @@ -34,7 +34,7 @@ krb5_gen_portaddr(context, addr, ptr, outaddr) krb5_const_pointer ptr; krb5_address **outaddr; { -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H krb5_int32 adr; krb5_int16 port; diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c index b8e677481d..5a9849066f 100644 --- a/src/lib/krb5/os/genaddrs.c +++ b/src/lib/krb5/os/genaddrs.c @@ -46,7 +46,7 @@ krb5_auth_con_genaddrs(context, auth_context, infd, flags) krb5_address * rport; SOCKET fd = (SOCKET) infd; -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H struct sockaddr_in lsaddr, rsaddr; krb5_address lcaddr, rcaddr; krb5_address lcport, rcport; diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index 418072f8f7..3f31216ddc 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -47,7 +47,7 @@ krb5_locate_kdc(context, realm, addr_pp, naddrs) struct sockaddr_in *sin_p; struct hostent *hp; struct servent *sp; -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H u_short udpport = htons(KRB5_DEFAULT_PORT); u_short sec_udpport = htons(KRB5_DEFAULT_SEC_PORT); #endif @@ -74,7 +74,7 @@ krb5_locate_kdc(context, realm, addr_pp, naddrs) if (code) return code; -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H if ((sp = getservbyname(KDC_PORTNAME, "udp"))) udpport = sp->s_port; if ((sp = getservbyname(KDC_SECONDARY_PORTNAME, "udp"))) @@ -92,7 +92,7 @@ krb5_locate_kdc(context, realm, addr_pp, naddrs) return 0; } -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H if (sec_udpport) count = count * 2; #endif @@ -118,7 +118,7 @@ krb5_locate_kdc(context, realm, addr_pp, naddrs) hp = gethostbyname(hostlist[i]); if (hp != 0) { switch (hp->h_addrtype) { -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H case AF_INET: for (j=0; hp->h_addr_list[j]; j++) { sin_p = (struct sockaddr_in *) &addr_p[out++]; diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c index a072aa7198..de22a9e289 100644 --- a/src/lib/krb5/os/mk_faddr.c +++ b/src/lib/krb5/os/mk_faddr.c @@ -27,7 +27,7 @@ #define NEED_SOCKETS #include "k5-int.h" -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include "os-proto.h" #if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H) diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index 32471f8f2d..918a14f5e1 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -35,7 +35,7 @@ krb5_error_code krb5_locate_kdc int *)); #endif -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H krb5_error_code krb5_unpack_full_ipaddr PROTOTYPE((krb5_context, const krb5_address *, @@ -49,6 +49,6 @@ krb5_error_code krb5_make_full_ipaddr int */ krb5_address **)); -#endif /* KRB5_USE_INET */ +#endif /* HAVE_NETINET_IN_H */ #endif /* KRB5_LIBOS_INT_PROTO__ */ diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c index 531e61a470..55249bd840 100644 --- a/src/lib/krb5/os/port2ip.c +++ b/src/lib/krb5/os/port2ip.c @@ -27,7 +27,7 @@ #define NEED_SOCKETS #include "k5-int.h" -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #include "os-proto.h" krb5_error_code diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 2ce2ac7cd2..5a17d8ec49 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 25 21:28:41 1997 Tom Yu <tlyu@mit.edu> + + * rc_io.c: Replace KRB5_USE_INET with something more sane. + Tue Mar 25 01:15:39 1997 Theodore Y. Ts'o <tytso@mit.edu> * rc_io.c (krb5_rc_io_open): rcache owner should be checked against diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 3d69c15bd7..e05d42ab95 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -31,7 +31,7 @@ #define O_BINARY 0 #endif -#ifdef KRB5_USE_INET +#ifdef HAVE_NETINET_IN_H #if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H) #include <netinet/in.h> #endif diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog index f3a429d8fb..af9e054961 100644 --- a/src/mac/libraries/ChangeLog +++ b/src/mac/libraries/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 25 21:05:23 1997 Tom Yu <tlyu@mit.edu> + + * autoconf.h: Change HAS_SETVBUF, KRB5_USE_INET to something more + sane. + Thu Sep 18 17:59:05 1997 Tom Yu <tlyu@mit.edu> * autoconf.h: Replace USE_STRING_H with something more sane. diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h index f44a5db218..2531b711d2 100644 --- a/src/mac/libraries/autoconf.h +++ b/src/mac/libraries/autoconf.h @@ -1,6 +1,6 @@ /* autoconf.h. DO NOT DELETE -- this version of autoconf.h is specific for macintosh. */ -#define HAS_SETVBUF 1 +#define HAVE_SETVBUF 1 #define HAS_ANSI_CONST 1 #define HAS_STDLIB_H 1 #define HAS_VOID_TYPE 1 @@ -12,7 +12,7 @@ #define HAVE_STRING_H 1 #define WAIT_USES_INT 1 #define krb5_sigtype void -#define KRB5_USE_INET 1 +#define HAVE_NETINET_IN_H 1 #define ODBM 1 /* Define to empty if the keyword does not work. */ #define const |