diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-07-03 23:39:55 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-07-03 23:39:55 +0000 |
| commit | 3cdcaf69c7ac5df4a7a710baddb4c0c11ffff061 (patch) | |
| tree | 1ad599b6f6860b40de7b6d2e24d64e15cd7fe9ed /src/include/krb5 | |
| parent | bc29722caef4b5866c6d60fb99eb79ff0758ea66 (diff) | |
| download | krb5-3cdcaf69c7ac5df4a7a710baddb4c0c11ffff061.zip krb5-3cdcaf69c7ac5df4a7a710baddb4c0c11ffff061.tar.gz krb5-3cdcaf69c7ac5df4a7a710baddb4c0c11ffff061.tar.bz2 | |
* 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
Diffstat (limited to 'src/include/krb5')
| -rw-r--r-- | src/include/krb5/stock/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index 6b42f34..1b8f67f 100644 --- 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 3224b5c..c4cc76c 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 */ |