From: Tom Yu <tlyu@mit.edu>
Date: Fri, 9 Feb 2001 07:01:53 +0000 (+0000)
Subject: 	* loadv4.c: Remove references to KRB_NEVERDATE
X-Git-Tag: krb5-1.3-alpha1~1665
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15f2d27e8bb929bc6efed5bdce6dd10a854a955a;p=krb5.git

	* loadv4.c: Remove references to KRB_NEVERDATE

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13003 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 2c29e4961..94745aa6c 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 7746a661e..8ce696c2f 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;