diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-07-24 16:26:28 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-07-24 16:26:28 -0400 |
| commit | 688a2702d2045abf5f99acfb59f3f372391e5be4 (patch) | |
| tree | 191c3f0e11012369929598a1f6e16951e4561aab /src/include | |
| parent | 4a788fb072b06ab25fb39c7720e2fe7bb79fd7f4 (diff) | |
| download | krb5-688a2702d2045abf5f99acfb59f3f372391e5be4.tar.gz krb5-688a2702d2045abf5f99acfb59f3f372391e5be4.tar.xz krb5-688a2702d2045abf5f99acfb59f3f372391e5be4.zip | |
Support changing the built-in ccache/keytab names
* Add DEFCCNAME, DEFKTNAME, and DEFCKTNAME configure variables to
change the built-in ccache and keytab names.
* Add krb5-config options to display the built-in ccache and keytab
names.
* In the default build, use krb5-config to discover the system's
built-in ccache and keytab names and use them (if not overridden).
This can be controlled with the --with-krb5-config=PATH or
--without-krb5-config configure options.
* Make the built-in ccache name subject to parameter expansion.
ticket: 7221 (new)
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/osconf.hin | 4 | ||||
| -rw-r--r-- | src/include/win-mac.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/include/osconf.hin b/src/include/osconf.hin index 803d73bd5..c3a33c22b 100644 --- a/src/include/osconf.hin +++ b/src/include/osconf.hin @@ -42,8 +42,6 @@ #if defined(_WIN32) #define DEFAULT_PROFILE_FILENAME "krb5.ini" -#define DEFAULT_KEYTAB_NAME "FILE:%{WINDOWS}\\krb5kt" -#define DEFAULT_CLIENT_KEYTAB_NAME "FILE:%{WINDOWS}\\krb5clientkt" #else /* !_WINDOWS */ #if TARGET_OS_MAC #define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf" @@ -55,8 +53,6 @@ #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_CLIENT_KEYTAB_NAME "FILE:/etc/krb5.client-keytab" #endif /* _WINDOWS */ #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins" diff --git a/src/include/win-mac.h b/src/include/win-mac.h index 2274d8a51..daec295b2 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -231,6 +231,9 @@ HINSTANCE get_lib_instance(void); #define THREEPARAMOPEN(x,y,z) open(x,y,z) +#define DEFKTNAME "FILE:%{WINDOWS}\\krb5kt" +#define DEFCKTNAME "FILE:%{WINDOWS}\\krb5clientkt" + #ifndef KRB5_CALLCONV #define KRB5_CALLCONV #endif |