diff options
| author | Tom Yu <tlyu@mit.edu> | 2000-10-17 03:14:56 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2000-10-17 03:14:56 +0000 |
| commit | 33e34488cae8e4569fddef55aeb00fcf5644bcdc (patch) | |
| tree | 95c7e074cf41ec5225df34c0fb0e620d9793041e /src/kadmin/dbutil/kdb5_util.M | |
| parent | eb5810d21c15b9ae51c481d913d07a87a8cf7fa0 (diff) | |
| download | krb5-33e34488cae8e4569fddef55aeb00fcf5644bcdc.zip krb5-33e34488cae8e4569fddef55aeb00fcf5644bcdc.tar.gz krb5-33e34488cae8e4569fddef55aeb00fcf5644bcdc.tar.bz2 | |
* kdb5_util.M: Update manpage
* kdb5_util.c (usage): Update usage message.
* dumpv4.c (dump_v4_iterator): Add logic to deal with long
lifetimes, as well as optionally using short lifetimes.
* loadv4.c (load_v4db): Add logic to deal with long lifetimes, as
well as optionally using short lifetimes.
* kadm5_create.c (kadm5_create_magic_princs): Add calls to
krb5_klog_init() and krb5_klog_close() to avoid coredumping if
kadm5_init() calls krb5_klog_syslog().
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12763 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/dbutil/kdb5_util.M')
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.M | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/kadmin/dbutil/kdb5_util.M b/src/kadmin/dbutil/kdb5_util.M index 829e55a..c096537 100644 --- a/src/kadmin/dbutil/kdb5_util.M +++ b/src/kadmin/dbutil/kdb5_util.M @@ -156,10 +156,11 @@ is optional and is derived from if not specified. .RE .TP -\fBdump_v4\fP [\fIfilename\fP] +\fBdump_v4\fP [\fB\-S\fP] [\fIfilename\fP] Dumps the current database into the Kerberos 4 database dump format. +The \-S option specifies the short lifetime algorithm. .TP -\fBload_v4\fP [\fB\-t\fP] [\fB-n\fP] [\fB\-K\fP] [\fB-s \fIstashfile\fP] \fIinputfile\fP +\fBload_v4\fP [\fB\-S\fP] [\fB\-t\fP] [\fB-n\fP] [\fB\-K\fP] [\fB-s \fIstashfile\fP] \fIinputfile\fP Loads a Kerberos 4 database dump file. Options: .RS .TP @@ -183,6 +184,9 @@ lists each principal as it is converted or ignored. .B \-t uses a temporary database, then moves that into place, instead of adding the keys to the current database. +.TP +.B \-S +Uses the short lifetime algorithm for conversion. .PP Note: if the Kerberos 4 database had a default expiration date of 12/31/1999 or 12/31/2009 (the compiled in defaults for older or newer Kerberos |