Fix automatic generation of changepw service

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

diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index a81e3349c145f007f4d459c50b171f2bee8231b4..f3ad056f03d5d764099850d8684e85c974f01b8d 100644 (file)
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Aug 25 17:40:52 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * srv_key.c - Fix automatic generation of changepw service which got
+               screwed up when the database changes went in.
+
+
 Thu Aug 17 13:50:28 EDT 1995   Paul Park       (pjpark@mit.edu)
        * srv_key.c, kadm5_defs.h - Add key_{open,close}_db().  Close database
                after initialization.

diff --git a/src/kadmin/v5server/srv_key.c b/src/kadmin/v5server/srv_key.c
index 1450f6ce3ec0cc0c6a9fc23fb647585264ca6f02..89a06023be044cb8c67b24506b99473c45945a8d 100644 (file)
--- a/src/kadmin/v5server/srv_key.c
+++ b/src/kadmin/v5server/srv_key.c
@@ -200,6 +200,7 @@ key_get_admin_entry(kcontext)
                    madmin_entry.princ = admin_principal;
                    madmin_entry.max_life = KEY_DEF_MAX_LIFE;
                    madmin_entry.max_renewable_life = KEY_DEF_MAX_RLIFE;
+                   madmin_entry.len = KRB5_KDB_V1_BASE_LENGTH;
                    number_of_entries = 1;
 
                    krb5_timeofday(kcontext, &now);
@@ -531,13 +532,6 @@ key_init(kcontext, debug_level, enc_type, key_type, master_key_name, manual,
     }
     mrand_init = 1;
 
-    /*
-     * We're almost home.  We now want to find our service entry and if there
-     * is none, then we want to create it.  This way, kadmind5 becomes just
-     * a plug in and go kind of utility.
-     */
-    kret = key_get_admin_entry(kcontext, debug_level);
-
     if (!kret) {
        if (key_num_ktents = nktent)
            key_ktents = ktents;
@@ -548,6 +542,13 @@ key_init(kcontext, debug_level, enc_type, key_type, master_key_name, manual,
        key_ktents_inited = 1;
     }
 
+    /*
+     * We're almost home.  We now want to find our service entry and if there
+     * is none, then we want to create it.  This way, kadmind5 becomes just
+     * a plug in and go kind of utility.
+     */
+    kret = key_get_admin_entry(kcontext, debug_level);
+
  cleanup:
     if (kret) {
        if (mrand_init) {