Changed over to the new profile config file on the PC

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 3be4ea2ac22b827004a886103d931d603e2df22e..26edc36cb4561d719033ae9e7a1a53e9cd5a2a66 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 27 11:24:24 1995 Keith Vetter (keithv@fusion.com)
+
+       * k5-config.h: Changed over to the new single config file on the PC.
+
 Wed Apr 26 10:41:08 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * Makefile.in: Reflect current list of headers to be installed.

diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h
index c8abd634e88c4607da8d4f7dd3abf862cae4f955..a8134ca0c1037b016dccf4b64c2b4ec225420775 100644 (file)
--- a/src/include/krb5/k5-config.h
+++ b/src/include/krb5/k5-config.h
@@ -33,9 +33,12 @@
 /* Kerberos Windows initialization file */
 #define KERBEROS_INI    "kerberos.ini"
 #define INI_FILES       "Files"
+#ifdef OLD_CONFIG_FILES
 #define INI_KRB_CONF    "krb.conf"             /* Location of krb.conf file */
 #define INI_KRB_REALMS  "krb.realms"   /* Location of krb.realms file */
+#endif
 #define INI_KRB_CCACHE  "krb5cc"       /* Location of the ccache */
+#define INI_KRB5_CONF   "krb5.ini"             /* Location of krb5.conf file */
 
 #define KRB5_DBM_COMPAT__                       /* Don't load dbm.h */
 #define KRB5_KDB5__                             /* Don't load kdb.h */
@@ -106,14 +109,14 @@ typedef unsigned char     u_char;
 /* Some of our own infrastructure where the WinSock stuff was too hairy
    to dump into a clean Unix program...  */
 
-#define        SOCKET_INITIALIZE()     win_socket_initialize()
-#define        SOCKET_CLEANUP()        WSACleanup()
-#define        SOCKET_ERRNO            (WSAGetLastError())
-#define        SOCKET_SET_ERRNO(x)     (WSASetLastError (x))
-#define        SOCKET_NFDS(f)          (0)     /* select()'s first arg is ignored */
-#define SOCKET_READ(fd, b, l)  (recv(fd, b, l, 0))
-#define SOCKET_WRITE(fd, b, l) (send(fd, b, l, 0))
-#define SOCKET_EINTR           WSAEINTR
+#define SOCKET_INITIALIZE()     win_socket_initialize()
+#define SOCKET_CLEANUP()        WSACleanup()
+#define SOCKET_ERRNO            (WSAGetLastError())
+#define SOCKET_SET_ERRNO(x)     (WSASetLastError (x))
+#define SOCKET_NFDS(f)          (0)     /* select()'s first arg is ignored */
+#define SOCKET_READ(fd, b, l)   (recv(fd, b, l, 0))
+#define SOCKET_WRITE(fd, b, l)  (send(fd, b, l, 0))
+#define SOCKET_EINTR            WSAEINTR
 
 int win_socket_initialize();
 #endif