* osconf.h (DEFAULT_PROFILE_PATH): Conditionalized for Mac OS X

	to look in Mac OS X Preferences file locations.
	[pullup from 1-2-2-branch]

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

diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index 6b42f340f3ecb893fd187f813a8556b79070e174..1b8f67f3dee618e79f5392198d487bc044cf0104 100644 (file)
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Alexandra Ellwood <lxs@mit.edu>
+
+       * osconf.h (DEFAULT_PROFILE_PATH): Conditionalized for Mac OS X
+       to look in Mac OS X Preferences file locations.
+       [pullup from 1-2-2-branch]
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
        * osconf.h: Drop _MSDOS support.

diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 3224b5ca127dc609c4d5f27d3910a0793a6a63c4..c4cc76c76a7cd92513ffdad09801c4b9bf07e5d8 100644 (file)
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -43,7 +43,11 @@
 #define        DEFAULT_LNAME_FILENAME  "/aname"
 #define        DEFAULT_KEYTAB_NAME     "FILE:%s\\krb5kt"
 #else /* !_WINDOWS */
+#if TARGET_OS_MAC
+#define DEFAULT_PROFILE_PATH   "/Library/Preferences/edu.mit.Kerberos:~/Library/Preferences/edu.mit.Kerberos"
+#else
 #define DEFAULT_PROFILE_PATH   "/etc/krb5.conf:@SYSCONFDIR/krb5.conf"
+#endif
 #define        DEFAULT_KEYTAB_NAME     "FILE:/etc/krb5.keytab"
 #define        DEFAULT_LNAME_FILENAME  "@PREFIX/lib/krb5.aname"
 #endif /* _WINDOWS  */