svn rev #21533: branches/mskrb-integ/src/kdc/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21533
Commit By: lhoward
Log Message:
cleanup referral server reply name path


Changed Files:
U   branches/mskrb-integ/src/kdc/do_tgs_req.c
Modified: branches/mskrb-integ/src/kdc/do_tgs_req.c
===================================================================
--- branches/mskrb-integ/src/kdc/do_tgs_req.c	2008-12-18 04:03:53 UTC (rev 21532)
+++ branches/mskrb-integ/src/kdc/do_tgs_req.c	2008-12-18 04:05:38 UTC (rev 21533)
@@ -384,7 +384,10 @@
 
     authtime = header_enc_tkt->times.authtime;
 
-    ticket_reply.server = request->server; /* XXX careful for realm... */
+    if (is_referral)
+	ticket_reply.server = server.princ;
+    else
+	ticket_reply.server = request->server; /* XXX careful for realm... */
 
     enc_tkt_reply.flags = 0;
     enc_tkt_reply.times.starttime = 0;
@@ -680,14 +683,6 @@
 	goto cleanup;
     }
 
-    if (reply_encpart.enc_padata != NULL) {
-	/*
-	 * Backend should not have returned referrals if canonicalize
-	 * flag was absent
-	 */
-	ticket_reply.server = server.princ;
-    }
-
     /* assemble any authorization data */
     if (request->authorization_data.ciphertext.data != NULL) {
 	krb5_data scratch;