diff options
| author | Paul Park <pjpark@mit.edu> | 1995-08-21 21:16:51 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-08-21 21:16:51 +0000 |
| commit | 845d9ae2e790c05098105026f77b36f98670f8c9 (patch) | |
| tree | fd2fc848806d295b79d98acbcabc623121d3fdb4 | |
| parent | 40b80b8572e01834020131329366365416c9eb7e (diff) | |
| download | krb5-845d9ae2e790c05098105026f77b36f98670f8c9.tar.gz krb5-845d9ae2e790c05098105026f77b36f98670f8c9.tar.xz krb5-845d9ae2e790c05098105026f77b36f98670f8c9.zip | |
Update description of kdc.conf
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6560 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/config-files/ChangeLog | 7 | ||||
| -rw-r--r-- | src/config-files/kdc.conf.M | 51 |
2 files changed, 33 insertions, 25 deletions
diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog index 2c10f7bf24..322a1d18d1 100644 --- a/src/config-files/ChangeLog +++ b/src/config-files/ChangeLog @@ -1,4 +1,11 @@ +Mon Aug 21 16:59:00 EDT 1995 Paul Park (pjpark@mit.edu) + * kdc.conf.M - Change types of master_key_type and encryption_type to + be "key type string" and "encryption type string". Add + default_principal_expiration, default_principal_flags and + supported_keytypes. + + Wed Jul 12 12:06:10 EDT 1995 Paul Park (pjpark@mit.edu) * kdc.conf[.M] - Change syntax. KDC now has per-realm information in [realms] section and has [kdcdefaults] to contain global data. diff --git a/src/config-files/kdc.conf.M b/src/config-files/kdc.conf.M index ffe06d7aff..4b4e0cf377 100644 --- a/src/config-files/kdc.conf.M +++ b/src/config-files/kdc.conf.M @@ -104,14 +104,13 @@ specifies the name of the master key. .IP master_key_type This -.B integer -represents the master key's key type (see krb5.h for key type values). +.B key type string +represents the master key's key type. .IP encryption_type This -.B integer -represents the encryption type used for this realm (see krb5.h for -encryption type values). +.B encryption type string +represents the encryption type used for this realm. .IP key_stash_file This @@ -133,31 +132,33 @@ realm. .IP max_life This -.B string +.B delta time string specifes the maximum time period that a ticket may be valid for in -this realm. The format of this string may be one of the following: -.in +1i -.I <days>-<hours>:<minutes>:<seconds> - -.I <days>d <hours>h <minutes>m <seconds>s - -.I <hours>:<minutes>:<seconds> - -.I <hours>h <minutes>m <seconds>s - -.I <hours>:<minutes> - -.I <hours>h <minutes>m +this realm. -.I <seconds> - -.in -1i .IP max_renewable_life This -.B string +.B delta time string specifies the maximum time period that a ticket may be renewed for in -this realm. The format is the same as for -.I max_life. +this realm. + +.IP default_principal_expiration +This +.B absolute time string +specifies the default expiration date of principals created in this realm. + +.IP default_principal_flags +This +.B flag string +specifies the default attributes of principals created in this realm. + +.IP supported_keytypes +This list of +.B key +: +.B salt +strings specifies the default key/salt combinations of principals for this +realm. .SH FILES /usr/local/lib/krb5kdc/kdc.conf |