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

[tlyu@MIT.EDU]

http://mv.ezproxy.com.ezproxyberklee.flo.org/fisheye/changelog/krb5/?cs=22211
Commit By: tlyu
Log Message:
subject: clean up KDC realm referrals error handling
ticket: 6462
tags: pullup
target_version: 1.7
version_fixed: 1.7

pull up r22046, r22070 from trunk

 ------------------------------------------------------------------------
 r22070 | tsitkova | 2009-03-09 10:23:31 -0400 (Mon, 09 Mar 2009) | 2 lines
 Changed paths:
    M /trunk/src/kdc/do_tgs_req.c

 Removed unneeded  printf's

 ------------------------------------------------------------------------
 r22046 | tsitkova | 2009-02-23 13:47:28 -0500 (Mon, 23 Feb 2009) | 2 lines
 Changed paths:
    M /trunk/src/kdc/do_tgs_req.c

 Correct the return code.

 ------------------------------------------------------------------------
 Removed unneeded  printf's


Changed Files:
U   branches/krb5-1-7/src/kdc/do_tgs_req.c
Modified: branches/krb5-1-7/src/kdc/do_tgs_req.c
===================================================================
--- branches/krb5-1-7/src/kdc/do_tgs_req.c	2009-04-14 15:35:12 UTC (rev 22210)
+++ branches/krb5-1-7/src/kdc/do_tgs_req.c	2009-04-14 18:33:27 UTC (rev 22211)
@@ -1128,12 +1128,12 @@
                 goto cleanup;
             }
             if (realms == 0) {
-                printf(" (null)\n");
+                retval = KRB5KRB_AP_ERR_BADMATCH;
                 goto cleanup;
             }
             if (realms[0] == 0) {
-                printf(" (none)\n");
                 free(realms);
+                retval = KRB5KRB_AP_ERR_BADMATCH;
                 goto cleanup;
             }
             /* Modify request. 
@@ -1144,7 +1144,6 @@
                                           (*request->server).realm.length, 
                                           (*request->server).realm.data, 
                                           "krbtgt", realms[0], (char *)0);
-                         
             for (cpp = realms; *cpp; cpp++)  
                    free(*cpp);
         }