svn rev #22253: branches/krb5-1-7/src/kdc/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22253
Commit By: tlyu
Log Message:
ticket: 6449
version_fixed: 1.7

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.


Changed Files:
U   branches/krb5-1-7/src/kdc/do_as_req.c
Modified: branches/krb5-1-7/src/kdc/do_as_req.c
===================================================================
--- branches/krb5-1-7/src/kdc/do_as_req.c	2009-04-15 20:07:40 UTC (rev 22252)
+++ branches/krb5-1-7/src/kdc/do_as_req.c	2009-04-15 20:07:42 UTC (rev 22253)
@@ -144,9 +144,10 @@
     }
     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";