From: Alexandra Ellwood Date: Thu, 6 Mar 2003 19:55:39 +0000 (+0000) Subject: * osconf.h: Added DEFAULT_SECURE_PROFILE_PATH so that KfM will only search paths... X-Git-Tag: krb5-1.3-alpha1~31 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72d8b6e214ede1f8ad38a75da74abba92b83f72e;p=krb5.git * 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 --- diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index 890114c12..3c7bb4f61 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -1,3 +1,11 @@ +2003-03-06 Alexandra Ellwood + + * 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 * 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 e686c9434..b56d05748 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"