diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 19:55:39 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 19:55:39 +0000 |
| commit | 72d8b6e214ede1f8ad38a75da74abba92b83f72e (patch) | |
| tree | 3542b69aaad0294b76de1f7c43f4c43443f8e890 /src/include | |
| parent | 77496479cac1a3158c59fd6fd53e0b5cce02cde7 (diff) | |
| download | krb5-72d8b6e214ede1f8ad38a75da74abba92b83f72e.tar.gz krb5-72d8b6e214ede1f8ad38a75da74abba92b83f72e.tar.xz krb5-72d8b6e214ede1f8ad38a75da74abba92b83f72e.zip | |
* osconf.h: Added DEFAULT_SECURE_PROFILE_PATH so that KfM will only search paths that start with ~/ (homedir-based) when getting an insecure context. This is the same as DEFAULT_PROFILE_PATH on all other platforms, which allows us to avoid more references to TARGET_OS_MAC in krb5 sources
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15246 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/stock/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index 890114c126..3c7bb4f619 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -1,3 +1,11 @@ +2003-03-06 Alexandra Ellwood <lxs@mit.edu> + + * osconf.h: Added DEFAULT_SECURE_PROFILE_PATH so that KfM will only + search paths that start with ~/ (homedir-based) when getting an + insecure context. This is the same as DEFAULT_PROFILE_PATH on all + other platforms, which allows us to avoid more references to + TARGET_OS_MAC in krb5 sources. + 2002-09-18 Ken Raeburn <raeburn@mit.edu> * osconf.h (DEFAULT_KDC_UDP_PORTLIST): Renamed from diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index e686c94345..b56d057482 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/krb5/stock/osconf.h @@ -44,9 +44,11 @@ #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" +#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf" +#define DEFAULT_PROFILE_PATH ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH) #else -#define DEFAULT_PROFILE_PATH "/etc/krb5.conf:@SYSCONFDIR/krb5.conf" +#define DEFAULT_SECURE_PROFILE_PATH "/etc/krb5.conf:@SYSCONFDIR/krb5.conf" +#define DEFAULT_PROFILE_PATH DEFAULT_SECURE_PROFILE_PATH #endif #define DEFAULT_KEYTAB_NAME "FILE:/etc/krb5.keytab" #define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname" |