From a961299a406f096256b00188236d168f2ef95f43 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 30 May 2003 23:41:08 +0000 Subject: * definitions.texinfo (DefaultCcacheType, DefaultKDCTimesync, DefaultMasterKeyType): Updated for code changes. (DefaultCcacheTypeMac, DefaultKDCTimesyncMac): Deleted. * admin.texinfo (libdefaults): Update kdc_timesync and ccache_type descriptions to not separate Mac case. ticket: 1190 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15531 dc483132-0cff-0310-8789-dd5450dbe970 --- doc/ChangeLog | 3 +-- doc/admin.texinfo | 8 ++------ doc/definitions.texinfo | 10 ++++------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 2ecfce7e9d..05aa258cfe 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,8 +1,7 @@ 2003-05-30 Ken Raeburn * definitions.texinfo (DefaultCcacheType, DefaultKDCTimesync, - DefaultTktLifetime, DefaultMasterKeyType): Updated for code - changes. + DefaultMasterKeyType): Updated for code changes. (DefaultCcacheTypeMac, DefaultKDCTimesyncMac): Deleted. * admin.texinfo (libdefaults): Update kdc_timesync and ccache_type diff --git a/doc/admin.texinfo b/doc/admin.texinfo index 7f5aba45a7..b965937e09 100644 --- a/doc/admin.texinfo +++ b/doc/admin.texinfo @@ -444,9 +444,7 @@ If this is set to 1 (for true), then client machines will compute the difference between their time and the time returned by the KDC in the timestamps in the tickets and use this value to correct for an inaccurate system clock. This corrective factor is only used by the -Kerberos library. The default is @value{DefaultKDCTimesyncMac} for -Macintosh computers and @value{DefaultKDCTimesync} for all other -platforms. +Kerberos library. The default is @value{DefaultKDCTimesync}. @itemx kdc_req_checksum_type @itemx ap_req_checksum_type @@ -485,9 +483,7 @@ type of cache to be created by kinit, or when forwarded tickets are received. DCE and Kerberos can share the cache, but some versions of DCE do not support the default cache as created by this version of Kerberos. Use a value of 1 on DCE 1.0.3a systems, and a value of 2 on -DCE 1.1 systems. The default value is @value{DefaultCcacheTypeMac} -for Macintosh computers and @value{DefaultCcacheType} for other -platforms. +DCE 1.1 systems. The default value is @value{DefaultCcacheType}. @ignore @itemx tkt_lifetime diff --git a/doc/definitions.texinfo b/doc/definitions.texinfo index 8cfb8571b1..b297e98968 100644 --- a/doc/definitions.texinfo +++ b/doc/definitions.texinfo @@ -52,14 +52,12 @@ krb5/src/lib/krb5/krb/init_ctx.c @comment libdefaults, clockskew @set DefaultChecksumType RSA MD5 @comment libdefaults, kdc_req_checksum_type, ap_req_checksum_type, safe_checksum_type -@set DefaultCcacheType 3 +@set DefaultCcacheType 4 @comment DEFAULT_CCACHE_TYPE -@set DefaultCcacheTypeMac 4 -@comment DEFAULT_CCACHE_TYPE @set DefaultTktLifetime 10 hours @comment libdefaults, tkt_lifetime -@set DefaultKDCTimesyncMac 1 -@set DefaultKDCTimesync 0 +@comment -- actually, that's not implemented; see clients/kinit/kinit.c +@set DefaultKDCTimesync 1 @comment DEFAULT_KDC_TIMESYNC @set DefaultKDCDefaultOptions KDC_OPT_RENEWABLE_OK @comment line 194 @@ -68,7 +66,7 @@ krb5/src/lib/krb5/krb/init_ctx.c the following defaults should be consistent with default variables set in krb5/src/include/krb5/stock/osconf.h @end ignore -@set DefaultMasterKeyType des-cbc-crc +@set DefaultMasterKeyType des3-cbc-sha1 @comment DEFAULT_KDC_ENCTYPE @set DefaultKadmindPort 749 @comment DEFAULT_KADM5_PORT -- cgit