* krb524d.c: Changed krb5_db_fetch_mkey() such that it will only try

		to set the enctype of the keyblock if the keyblock had it
		set to ENCTYPE_UNKNOWN.

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

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 1c83b38669578a75627601cfa4cc17eac17b2e5e..6522e75516607d699fe686886dc94dfe9cef2daa 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -227,7 +227,9 @@ void init_master(context)
           free(realm);
      }
 
-     master_keyblock.enctype = NULL;   /* Look up the stashed enctype */
+     /* Use the stashed enctype */
+     master_keyblock.enctype = ENCTYPE_UNKNOWN;
+
      if ((ret = krb5_db_fetch_mkey(context, master_princ, &master_encblock,
                                  FALSE, /* non-manual type-in */
                                  FALSE, /* irrelevant, given prev. arg */