From: Tom Yu <tlyu@mit.edu>
Date: Wed, 15 Apr 2009 20:07:42 +0000 (+0000)
Subject: pull up r22183 from trunk
X-Git-Tag: krb5-1.7-beta1~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=895b4ec97d2f1d8c49db600fa3280b55ddd270c2;p=krb5.git

pull up r22183 from trunk

 ------------------------------------------------------------------------
 r22183 | epeisach | 2009-04-08 11:25:43 -0400 (Wed, 08 Apr 2009) | 11 lines
 Changed paths:
    M /trunk/src/kdc/do_as_req.c

 ticket: 6449
 subject: Fall through on error return

 If decoding the encoded_req_body fails, proceed goto errout instead of falling
 through to fast handling.

 Looks like a merge error.

 Reindented code.

ticket: 6449
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22253 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 4f1715d67..0c4c92359 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -144,9 +144,10 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
     }
     if (fetch_asn1_field((unsigned char *) req_pkt->data,
 			 1, 4, &encoded_req_body) != 0) {
-    errcode = ASN1_BAD_ID;
-    status = "Finding req_body";
-}
+        errcode = ASN1_BAD_ID;
+        status = "Finding req_body";
+	goto errout;
+    }
     errcode = kdc_find_fast(&request, &encoded_req_body, NULL /*TGS key*/, NULL, state);
     if (errcode) {
 	status = "error decoding FAST";