diff options
| author | Tom Yu <tlyu@mit.edu> | 2001-02-09 07:01:53 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2001-02-09 07:01:53 +0000 |
| commit | 15f2d27e8bb929bc6efed5bdce6dd10a854a955a (patch) | |
| tree | 6061f3cc281bbbedd72ac1308fc2e3a2af837820 /src/kadmin | |
| parent | 8588fcfc9fb3a68c72d57f25ad71373d1e1f1775 (diff) | |
| download | krb5-15f2d27e8bb929bc6efed5bdce6dd10a854a955a.tar.gz krb5-15f2d27e8bb929bc6efed5bdce6dd10a854a955a.tar.xz krb5-15f2d27e8bb929bc6efed5bdce6dd10a854a955a.zip | |
* loadv4.c: Remove references to KRB_NEVERDATE
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13003 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin/dbutil/loadv4.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index 2c29e49614..94745aa6c7 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,3 +1,7 @@ +2001-02-08 Tom Yu <tlyu@mit.edu> + + * loadv4.c: Remove references to KRB_NEVERDATE. + 2001-02-05 Tom Yu <tlyu@mit.edu> * kdb5_util.M: Fix some formatting nits and document new flags diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c index 7746a661ee..8ce696c2fd 100644 --- a/src/kadmin/dbutil/loadv4.c +++ b/src/kadmin/dbutil/loadv4.c @@ -530,11 +530,9 @@ Principal *princ; } mod_time = princ->mod_date; - if (!shortlife) { + if (!shortlife) entry.max_life = krb_life_to_time(0, princ->max_life); - if (entry.max_life == KRB_NEVERDATE) - entry.max_life = rblock.max_life; - } else + else entry.max_life = princ->max_life * 60 * 5; entry.max_renewable_life = rblock.max_rlife; entry.len = KRB5_KDB_V1_BASE_LENGTH; |