From: Tom Yu <tlyu@mit.edu>
Date: Tue, 14 Apr 2009 21:07:39 +0000 (+0000)
Subject: pull up r22093 from trunk
X-Git-Tag: krb5-1.7-beta1~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eab292166a8f5edead9c2919d27fc89ad9e153da;p=krb5.git

pull up r22093 from trunk

 ------------------------------------------------------------------------
 r22093 | hartmans | 2009-03-16 12:50:04 -0400 (Mon, 16 Mar 2009) | 7 lines
 Changed paths:
    M /trunk/src/kdc/kdc_util.c
    M /trunk/src/kdc/main.c

 ticket: 6424
 Subject: Call kdb_set_mkey_list from the KDC
 Target_version: 1.7
 tags: pullup

 In order for the kdb keytab to be used from within the KDC, the KDC
 needs to set the master key list in the context.

ticket: 6424
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22227 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index 28b4a37ca..d51365af4 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -456,6 +456,7 @@ kdc_get_server_key(krb5_ticket *ticket, unsigned int flags,
                                     &master_keyblock, 0, &tmp_mkey_list) == 0) {
             krb5_dbe_free_key_list(kdc_context, master_keylist);
             master_keylist = tmp_mkey_list;
+	    krb5_db_set_mkey_list(kdc_context, master_keylist);
             if ((retval = krb5_dbe_find_mkey(kdc_context, master_keylist,
                                              server, &mkey_ptr))) {
                 goto errout;
diff --git a/src/kdc/main.c b/src/kdc/main.c
index 4661f622a..262d9bb1b 100644
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -414,7 +414,6 @@ init_realm(kdc_realm_t *rdp, char *realm, char *def_mpname,
 		rdp->realm_mpname, realm);
 	goto whoops;
     }
-
 #if 0 /************** Begin IFDEF'ed OUT *******************************/
     /*
      * Commenting krb5_db_verify_master_key out because it requires the most
@@ -445,6 +444,7 @@ init_realm(kdc_realm_t *rdp, char *realm, char *def_mpname,
 		"while setting master key for realm %s", realm);
 	goto whoops;
     }
+    krb5_db_set_mkey_list(rdp->realm_context, rdp->mkey_list);
 
     /* Set up the keytab */
     if ((kret = krb5_ktkdb_resolve(rdp->realm_context, NULL,