From: Richard Basch <probe@mit.edu>
Date: Tue, 12 Dec 1995 19:45:23 +0000 (+0000)
Subject: 	* krb524d.c: Changed krb5_db_fetch_mkey() such that it will only try
X-Git-Tag: krb5-1.0-beta6~703
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c270f13fd2bb5509be8e8427dc7f3ea28ea0805;p=krb5.git

	* 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 1c83b3866..6522e7551 100644
--- 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 */