From: Theodore Tso <tytso@mit.edu>
Date: Thu, 9 Feb 1995 22:44:51 +0000 (+0000)
Subject: Set up the keyblock's etype field correctly (after copying the
X-Git-Tag: krb5-1.0-beta5~729
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e17865e36057be4dd07bc080982d25700f1b4b93;p=krb5.git

Set up the keyblock's etype field correctly (after copying the
keyblock, so it doesn't get overwritten!)

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 31131cc1f..84a18c26c 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb  9 17:43:04 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* gc_via_tgt.c (krb5_get_cred_via_tgt): Set up the keyblock's
+		etype field correctly (after copying the keyblock, so it
+		doesn't get overwritten!)
+
 Mon Feb 06 17:19:04 1995 Chris Provenzano  (proven@mit.edu)
 
 	* get_in_tkt.c (krb5_get_in_tkt())
diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c
index 026cf30e0..1e9b8da53 100644
--- a/src/lib/krb5/krb/gc_via_tgt.c
+++ b/src/lib/krb5/krb/gc_via_tgt.c
@@ -146,13 +146,12 @@ krb5_get_cred_via_tgt (context, tgt, kdcoptions, sumtype, cred)
 	memset(&cred->keyblock.contents, 0, cred->keyblock.length);
 	krb5_xfree(cred->keyblock.contents);
     }
-    cred->keyblock.magic = KV5M_KEYBLOCK;
-    cred->keyblock.etype = dec_rep->ticket->enc_part.etype;
     if (retval = krb5_copy_keyblock_contents(context, dec_rep->enc_part2->session,
 					     &cred->keyblock)) {
 	cleanup();
 	return retval;
     }
+    cred->keyblock.etype = dec_rep->ticket->enc_part.etype;
     memset((char *)dec_rep->enc_part2->session->contents, 0,
 	  dec_rep->enc_part2->session->length);