Added capability for windows version to read default values out of an ini file

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 482fdd03507c06071664b22f67a6fa4e059ad3f4..eadc4cd075098dee227081d6915c4f50abca80b9 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 28 19:53:09 1995 Keith Vetter (keithv@fusion.com)
+
+       * Makefile.in: changed to reflect deletion of stock/osconf.win.
+        * k5-config.h: added constants for reading default values
+            out of Windows ini files.
+        * los-proto.h: added new prototype for Windows ini stuff.
+
 Tue Mar 28 18:02:41 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (KRB5_HEADERS, install):  Account for file renames.

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 53e4f9c0261badc88fe9cb5409522251b4d6c4c4..4c766fd8ab68fff962b157131d87bd7a84bc8716 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -19,7 +19,7 @@ all:: all-$(WHAT)
 all-unix:: $(BUILT_HEADERS)
 all-mac:: $(BUILT_HEADERS)
 all-windows:
-       copy stock\osconf.win osconf.h
+       copy stock\osconf.h osconf.h
        echo /* not used in windows */ > autoconf.h
 
 includes:: autoconf.h

diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h
index 278033f6677c6e642359e199f89c72b8fa4f2c81..60e3687e60ff7fff6f910d3ae7d6f4041b7fa7cc 100644 (file)
--- a/src/include/krb5/k5-config.h
+++ b/src/include/krb5/k5-config.h
@@ -30,6 +30,13 @@
  * Machine-type definitions: PC Clone 386 running Microloss Windows
  */
 
+/* Kerberos Windows initialization file */
+#define KERBEROS_INI    "kerberos.ini"
+#define INI_FILES       "Files"
+#define INI_KRB_CONF    "krb.conf"             /* Location of krb.conf file */
+#define INI_KRB_REALMS  "krb.realms"   /* Location of krb.realms file */
+#define INI_KRB_CCACHE  "krb5cc"       /* Location of the ccache */
+
 #define KRB5_DBM_COMPAT__                       /* Don't load dbm.h */
 #define KRB5_KDB5__                             /* Don't load kdb.h */
 #define KRB5_KDB5_DBM__                         /* Don't load kdb_dbm.h */

diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 7b99931881aa3cfedb72730b4bfac91c1e2f3b44..f66170e8fcfaa40d5a205edf688ff7d13557c52d 100644 (file)
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -138,4 +138,7 @@ krb5_error_code INTERFACE krb5_os_init_context
 void INTERFACE krb5_os_free_context
         PROTOTYPE((krb5_context));
 
+krb5_error_code krb5_find_config_files
+        PROTOTYPE(());
+
 #endif /* KRB5_LIBOS_PROTO__ */