Add #define's for DEFAULT_PROFILE_FILENAME

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

diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index ad51c5eb66b3c1eee6ddb53cc22d043517994976..48232228e592128ccbf3952c9e8e6afa10d951d2 100644 (file)
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 21 21:00:40 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+       * osconf.h: Add #define's for DEFAULT_PROFILE_FILENAME.  
+
 Tue Mar 28 19:49:56 1995 Keith Vetter (keithv@fusion.com)
 
        * osconf.h: moved the differing part of osconf.win inside it.

diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 6a8e655189246d8492f9cee7bb49ce2ba1835d22..2efebf417988cb5d0fb60b8e97152d61993b1019 100644 (file)
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -36,16 +36,24 @@
                                   conversion */
 
 #ifdef KRB5_ATHENA_COMPAT
+/*
+ * Let's store krb5.conf is the same place whether or not we're
+ * compiling under with Project Athena options turned on.  Things are
+ * much more sane that way!!!!  --- Ted
+ */
+#define DEFAULT_PROFILE_FILENAME "/etc/krb5.conf"
 #define        DEFAULT_CONFIG_FILENAME "/etc/athena/krb.conf.v5"
 #define        DEFAULT_TRANS_FILENAME  "/etc/athena/krb.realms"
 #define        DEFAULT_LNAME_FILENAME  "/etc/athena/aname"
 #define        DEFAULT_KEYTAB_NAME     "FILE:/etc/athena/v5srvtab"
 #elif defined(_WINDOWS)
+#define DEFAULT_PROFILE_FILENAME "krb5.ini"
 #define        DEFAULT_CONFIG_FILENAME "krb.conf"
 #define        DEFAULT_TRANS_FILENAME  "krb.realms"
 #define        DEFAULT_LNAME_FILENAME  "/aname"
 #define        DEFAULT_KEYTAB_NAME     "FILE:/v5srvtab"
 #else
+#define DEFAULT_PROFILE_FILENAME "/etc/krb5.conf"
 #define        DEFAULT_CONFIG_FILENAME "@KRB5ROOT/krb.conf"
 #define        DEFAULT_TRANS_FILENAME  "@KRB5ROOT/krb.realms"
 #define        DEFAULT_LNAME_FILENAME  "@KRB5ROOT/aname"