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 /doc/rst_source/conf.py | |
| 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 'doc/rst_source/conf.py')
| -rw-r--r-- | doc/rst_source/conf.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/rst_source/conf.py b/doc/rst_source/conf.py index c4203a24cb..031a1a745e 100644 --- a/doc/rst_source/conf.py +++ b/doc/rst_source/conf.py @@ -216,6 +216,9 @@ if 'mansubs' in tags: libdir = '``@LIBDIR@``' localstatedir = '``@LOCALSTATEDIR@``' sysconfdir = '``@SYSCONFDIR@``' + ccache = '``@CCNAME@``' + keytab = '``@KTNAME@``' + ckeytab = '``@CKTNAME@``' elif 'pathsubs' in tags: # Read configured paths from a file produced by the build system. execfile('paths.py') @@ -225,6 +228,9 @@ else: libdir = ':ref:`LIBDIR <paths>`' localstatedir = ':ref:`LOCALSTATEDIR <paths>`' sysconfdir = ':ref:`SYSCONFDIR <paths>`' + ccache = ':ref:`DEFCCNAME <paths>`' + keytab = ':ref:`DEFKTNAME <paths>`' + ckeytab = ':ref:`DEFCKTNAME <paths>`' rst_epilog = '\n' rst_epilog += '.. |bindir| replace:: %s\n' % bindir @@ -232,10 +238,10 @@ rst_epilog += '.. |sbindir| replace:: %s\n' % sbindir rst_epilog += '.. |libdir| replace:: %s\n' % libdir rst_epilog += '.. |kdcdir| replace:: %s\\ ``/krb5kdc``\n' % localstatedir rst_epilog += '.. |sysconfdir| replace:: %s\n' % sysconfdir +rst_epilog += '.. |ccache| replace:: %s\n' % ccache +rst_epilog += '.. |keytab| replace:: %s\n' % keytab +rst_epilog += '.. |ckeytab| replace:: %s\n' % ckeytab rst_epilog += ''' -.. |ccache| replace:: ``/tmp/krb5cc_<uid>`` -.. |clkeytab| replace:: ``/etc/krb5.client-keytab`` -.. |keytab| replace:: ``/etc/krb5.keytab`` .. |krb5conf| replace:: ``/etc/krb5.conf`` .. |defkeysalts| replace:: ``aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal des3-cbc-sha1:normal arcfour-hmac-md5:normal`` .. |defetypes| replace:: ``aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 des-cbc-crc des-cbc-md5 des-cbc-md4`` |