From: Sam Hartman <hartmans@mit.edu>
Date: Wed, 28 Jan 2009 01:28:25 +0000 (+0000)
Subject: return correct kvno in TGS case
X-Git-Tag: krb5-1.7-alpha1~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d560dd8addeff2f8d872444038b6ccc87fe7b29;p=krb5.git

return correct kvno in TGS case

krb5_c_encrypt sets the kvno of ciphertext to 0.
So fill it in after the call to encrypt_tkt_part.

ticket: 6352

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

diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index 517befb41..6063b7393 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -128,6 +128,7 @@ process_tgs_req(krb5_data *pkt, const krb5_fulladdr *from,
     const char *emsg = NULL;
     krb5_data *tgs_1 =NULL, *server_1 = NULL;
     krb5_principal krbtgt_princ;
+    krb5_kvno ticket_kvno = 0;
 
     session_key.contents = NULL;
     
@@ -795,11 +796,11 @@ tgt_again:
             goto cleanup;
         }
             
-        ticket_reply.enc_part.kvno = 0;
+        ticket_kvno = 0;
         ticket_reply.enc_part.enctype = t2enc->session->enctype;
         st_idx++;
     } else {
-        ticket_reply.enc_part.kvno = server_key->key_data_kvno;
+        ticket_kvno = server_key->key_data_kvno;
     }
 
     errcode = krb5_encrypt_tkt_part(kdc_context, &encrypting_key,
@@ -810,7 +811,7 @@ tgt_again:
         status = "TKT_ENCRYPT";
         goto cleanup;
     }
-
+    ticket_reply.enc_part.kvno = ticket_kvno;
     /* Start assembling the response */
     reply.msg_type = KRB5_TGS_REP;
     reply.padata = 0;/* always */