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

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ab8ec1b16f9ad9190461a1f7c932a8adb88fbe8..73b9a01a94d09ee6a8caca1e7400c7ebd90cfbf5 100644 (file)
--- 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 f67b762138ac2dd841e093b7ebdd87f5033921a9..53c237dd226c60496e6740e5b4dd8b30afc1c88f 100644 (file)
--- 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 2dd4e5af5da2932b394d8572dbcb6ae0e7195b26..a82c21bc4b266abd1f9fefbef50dc42a7f67bd02 100644 (file)
--- 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 47edbce03f1518c4a34cd9a1364d05543c584c1b..acb0fca197d4556ed1d82ab855dcf9efefd59061 100644 (file)
--- 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 9226e5efec41ec14674c9dff40f825d9243678b4..826e96773c0aaa754ec67768445da8aeb742df7e 100644 (file)
--- 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 2e6dcd8eb57a30c579662c056306c1c011bda157..f19755326708f48c05eed69ce134d11fa4ee6ca4 100644 (file)
--- 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 516c7199791251cb48b706ca46f6aecb703bd9b4..cd787d0c71194f283c79bc8dbf76e9d125082c35 100644 (file)
--- 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 d834bdbd96a65420fc0c82c1ee0fab216a820ee0..aa65ef1d25891c56414f0ce7d986da8e500b5148 100644 (file)
--- 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 5a458fe69d1b0f750eba355f3482156bd985c4d6..4d888782a9f757cdfddf49ba6766abd69a0d889f 100644 (file)
--- 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 eefc8981f5f30a6b16e25996b1f38f8b8f9f1aac..a16a0bffdbb1b13c20bfd1de91472ea5f42700d0 100644 (file)
--- 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 da518020387917c3038fcbdcce71fa28bef632e5..fc0363be734990e0454c0f6a67b63d81e31e5c00 100644 (file)
--- 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 5d87865b2d3ff1d32e32792f1ee259f9f937d17c..e571680272012320e03c695a53ef42d391318f88 100644 (file)
--- 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 7a83a9b324ec57b19a1b6029194cc070eb49081c..be56124bcc689a9ec2441075e9487d79b208427c 100644 (file)
--- 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 80976c09104426f8340ac0be3278e83d45e31aff..83223e5d374be3e2ebf50b45627435e2c0937cc1 100644 (file)
--- 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 e098761bde7019a3fa5b26e52e48646a4fc1d6ca..f2cc0b566a05bf719a278565dcd0b500e1998073 100644 (file)
--- 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 b94c9dc8dcb32f6e3f49cde53ef94c71b593f54a..f8ed2e0ef5564dab8835b98330c89b05741ddaae 100644 (file)
--- 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 5f861b76364e7e7645f8125dbbac06f0b2929b26..3b3bcb474f0d04290db3db2e0855d0327a284ade 100644 (file)
--- 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 62570f32b73467538654849eaf4d4fd5fd8a3291..7f3afaed1246177cbdb1e386a19c74e49c58cd9a 100644 (file)
--- 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 d341b8301ea8a2d836adc70aaff8713e99296dc8..29901ec6a7943ebe64735ac18cbdf8167ddfddf7 100644 (file)
--- 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 2fd446a5b1cf7ab6f068f9be913b08d4c5ed2b72..2f62b2bdd0306f94e4a915b40d96ffb4f9b4163f 100644 (file)
--- 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 d9da67f4c12ecb1c954551b6015e3300137ac361..179174e6e931bce16c7697ec4a03e8f8084d5a7e 100644 (file)
--- 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 8f9a0b0503920a62ef1021fd6bcc6a3739c8bd09..0aee8934a095a1bf0f184afb1c0062d125664360 100644 (file)
--- 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 4149be9642701c2d282ac972ee352459f687b1e8..f520b17dc3bb9ec9425dc05496066379d74835f0 100644 (file)
--- 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 4c543864153e47043a0eb80dca8351d2d8f9804e..7d8b7ce15f5c26d397fabe7204d354ce309e0c8f 100644 (file)
--- 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 a76a1927713b151e4fe5e20af5699dc86f08e9ba..df98e0cd12a5c9085928cf200c8cbaddc62b918a 100644 (file)
--- 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 257c06e8416dbc6f44a2eee6f10fc9937ace5e05..512e6f09af134f249aa46a0e5f032a396ba566e7 100644 (file)
--- 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 49c0b9ec78151fe5cc5496d7ece7681554fb1fcc..4e4aba9ecc9b3771765e447eaadad6201203c052 100644 (file)
--- 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 ebddd0559d9f775437096e31da33bd7312f4612f..1f93922d4dd9884ff9c3ecf0042c613d717eff59 100644 (file)
--- 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 ff2c9142b178991a71bef7f0c660105d64a888f8..d50f8e38f7fb9f1421771191216eb0ad665b057e 100644 (file)
--- 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 07ba48a25b59f6bccb69116ee3aa04858f0b9435..0a4e401c53848e5d4c4273bada00ba59475de968 100644 (file)
--- 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 a5eb91bca54f3c0f6df099de8ccc8454af428785..1d84a0898ab6099ed8a07879b9f68aad99e7ef72 100644 (file)
--- 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 b8e677481df3341a427250d7fa8c7536670be385..5a9849066f144e0be719db35dd62061cc67a996c 100644 (file)
--- 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 418072f8f7451d19fcf23b3b34edab5005edd303..3f31216ddc1cbb33144a3a3951ab7a3c958ce5e8 100644 (file)
--- 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 a072aa7198e4c9fcb8e0db54900d34e504758b9a..de22a9e289ce422cb71759ca92646fe31f2839d0 100644 (file)
--- 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 32471f8f2dbcb8496536f22a64f633c422fcb08a..918a14f5e150e1bdef03200093e40fcbec1eea87 100644 (file)
--- 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 531e61a470823b70ee0d7487cbd54d6b417a0c46..55249bd840f9ad0dd49e2f246a2cefe95b213b64 100644 (file)
--- 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 2ce2ac7cd27daeacff677f2ec43966c674f3518a..5a17d8ec4941c9eb98b371cfe65cce4ef268c08a 100644 (file)
--- 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 3d69c15bd7d7d9a8c004fdd4b2b998d7be7a1562..e05d42ab95798ca55ad9a655a5e091a7ddec2a92 100644 (file)
--- 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 f3a429d8fb73e2590058e4328791d7649ba437ec..af9e054961ab6eb51badb68304dea4fb6cf912b0 100644 (file)
--- 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 f44a5db218c397a2867ee8fe5777efa95af7ce98..2531b711d23d2e0333f1f19b333903df9eeab2f5 100644 (file)
--- 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