svn rev #22227: branches/krb5-1-7/src/kdc/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22227
Commit By: tlyu
Log Message:
ticket: 6424
version_fixed: 1.7

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.


Changed Files:
U   branches/krb5-1-7/src/kdc/kdc_util.c
U   branches/krb5-1-7/src/kdc/main.c
Modified: branches/krb5-1-7/src/kdc/kdc_util.c
===================================================================
--- branches/krb5-1-7/src/kdc/kdc_util.c	2009-04-14 21:07:37 UTC (rev 22226)
+++ branches/krb5-1-7/src/kdc/kdc_util.c	2009-04-14 21:07:39 UTC (rev 22227)
@@ -456,6 +456,7 @@
                                     &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;

Modified: branches/krb5-1-7/src/kdc/main.c
===================================================================
--- branches/krb5-1-7/src/kdc/main.c	2009-04-14 21:07:37 UTC (rev 22226)
+++ branches/krb5-1-7/src/kdc/main.c	2009-04-14 21:07:39 UTC (rev 22227)
@@ -414,7 +414,6 @@
 		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 @@
 		"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,