From 3cdcaf69c7ac5df4a7a710baddb4c0c11ffff061 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 3 Jul 2002 23:39:55 +0000 Subject: [PATCH] * 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 --- src/include/krb5/stock/ChangeLog | 6 ++++++ src/include/krb5/stock/osconf.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index 6b42f340f..1b8f67f3d 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -1,3 +1,9 @@ +2002-07-03 Alexandra Ellwood + + * 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 * osconf.h: Drop _MSDOS support. diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index 3224b5ca1..c4cc76c76 100644 --- 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 */ -- 2.26.2