Remove KRB5_USE_INET, HAS_UNISTD_H, HAS_SETVBUF, and replace

with appropriate autoconf-style symbols.  See individual ChangeLogs
for details.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10202 dc483132-0cff-0310-8789-dd5450dbe970

23 files changed, 73 insertions, 24 deletions

diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index b94c9dc8d..f8ed2e0ef 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 5f861b763..3b3bcb474 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 62570f32b..7f3afaed1 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 d341b8301..29901ec6a 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 2fd446a5b..2f62b2bdd 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 d9da67f4c..179174e6e 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 8f9a0b050..0aee8934a 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 4149be964..f520b17dc 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 4c5438641..7d8b7ce15 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 a76a19277..df98e0cd1 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 257c06e84..512e6f09a 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 49c0b9ec7..4e4aba9ec 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 ebddd0559..1f93922d4 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 ff2c9142b..d50f8e38f 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 07ba48a25..0a4e401c5 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 a5eb91bca..1d84a0898 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 b8e677481..5a9849066 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 418072f8f..3f31216dd 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 a072aa719..de22a9e28 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 32471f8f2..918a14f5e 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 531e61a47..55249bd84 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 2ce2ac7cd..5a17d8ec4 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 3d69c15bd..e05d42ab9 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