* main.c (init_realm): Fix to use new ktkdb

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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index a2f1e14f424806868df69c427b965954203ba245..133f86372f0f1fa5e884106d9ba0289daa804a20 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 25 15:44:07 1997  Tom Yu  <tlyu@mit.edu>
+
+       * main.c (init_realm): Fix to use new ktkdb.
+
 Tue Jul 15 01:55:56 1997  Tom Yu  <tlyu@mit.edu>
 
        * kdc_preauth.c (get_sam_edata): Don't goto cleanup if SAM is not

diff --git a/src/kdc/main.c b/src/kdc/main.c
index 9fdd415ab341522fed8fa99d456830e280eb4c20..0b8bfdd0e8dbb2c8d122e5c2fee6ee896febab06 100644 (file)
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -36,7 +36,7 @@
 #include "kdc_util.h"
 #include "extern.h"
 #include "kdc5_err.h"
-#include "kdb_dbc.h"
+#include "kdb_kt.h"
 #ifdef KRB5_USE_INET
 #include <netinet/in.h>
 #endif
@@ -300,7 +300,6 @@ init_realm(progname, rdp, realm, def_dbname, def_mpname,
     char               *def_ports;
     krb5_boolean       def_manual;
 {
-    krb5_db_context    db_context;
     krb5_error_code    kret;
     krb5_boolean       manual;
     krb5_db_entry      db_entry;
@@ -530,16 +529,15 @@ init_realm(progname, rdp, realm, def_dbname, def_mpname,
        goto whoops;
     }
 
-    /* Set master encblock with db_context */
-    if ((kret = krb5_dbm_db_set_mkey(rdp->realm_context, &db_context, 
-                                    &rdp->realm_encblock))) {
+    if ((kret = krb5_db_set_mkey(rdp->realm_context, 
+                                &rdp->realm_encblock))) {
        com_err(progname, kret,
                "while setting master key for realm %s", realm);
        goto whoops;
     }
 
     /* Set up the keytab */
-    if ((kret = krb5_ktkdb_resolve(rdp->realm_context, &db_context, 
+    if ((kret = krb5_ktkdb_resolve(rdp->realm_context, 
                                   &rdp->realm_keytab))) {
        com_err(progname, kret,
                "while resolving kdb keytab for realm %s", realm);