* kadm_funcs.c: Call life_to_time() and time_to_life() as

	appropriate.

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

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index a343d9a732aa8ab4331396f036e68d8fe470a027..624dbe5e212c29706869ced5c350c44e88df850d 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-10  Tom Yu  <tlyu@mit.edu>
+
+       * kadm_funcs.c: Call life_to_time() and time_to_life() as
+       appropriate.
+
 2000-07-03  Ezra Peisach  <epeisach@mit.edu>
 
        * Makefile.in: kadmin4d depends on the kdb5 lib.

diff --git a/src/kadmin/v4server/kadm_funcs.c b/src/kadmin/v4server/kadm_funcs.c
index 658d4b721cd688dcaf518e208a53f39066b7dd4e..c62ebc67075c419a194b54a8d820d5e6b38e7be6 100644 (file)
--- a/src/kadmin/v4server/kadm_funcs.c
+++ b/src/kadmin/v4server/kadm_funcs.c
@@ -83,7 +83,7 @@ kadm_entry2princ(entry, princ)
     strncpy(princ->exp_date_txt,
            ctime((const time_t *) &entry->pw_expiration), DATE_SZ);
     princ->attributes = entry->attributes;
-    princ->max_life = entry->max_life / (60 * 5);
+    princ->max_life = krb_time_to_life(0, entry->max_life);
     princ->kdc_key_ver = 1; /* entry->mkvno .... WTF??? --tlyu */
     for (i = 0; i < entry->n_key_data; i++) {
        /* XXX This assumes knowledge of the internals of krb5_key_data */
@@ -197,7 +197,7 @@ kadm_add_entry (rname, rinstance, rrealm, valsin, valsout)
     }
 
     if (IS_FIELD(KADM_MAXLIFE,valsin->fields)) {
-       newentry.max_life = data_i.max_life * (60 * 5);
+       newentry.max_life = krb_life_to_time(0, data_i.max_life);
        mask |= KADM5_MAX_LIFE;
     }
 
@@ -466,7 +466,7 @@ kadm_mod_entry (rname, rinstance, rrealm, valsin1, valsin2, valsout)
     }
 
     if (IS_FIELD(KADM_MAXLIFE,valsin2->fields)) {
-       entry.max_life = temp_key.max_life * (60 * 5);
+       entry.max_life = krb_life_to_time(0, temp_key.max_life);
        mask |= KADM5_MAX_LIFE;
     }