svn rev #21548: branches/mskrb-integ/src/kdc/
lhoward@MIT.EDU
lhoward at MIT.EDU
Thu Dec 18 18:49:26 EST 2008
http://src.mit.edu/fisheye/changelog/krb5/?cs=21548
Commit By: lhoward
Log Message:
cleanup
Changed Files:
U branches/mskrb-integ/src/kdc/do_as_req.c
Modified: branches/mskrb-integ/src/kdc/do_as_req.c
===================================================================
--- branches/mskrb-integ/src/kdc/do_as_req.c 2008-12-18 23:14:28 UTC (rev 21547)
+++ branches/mskrb-integ/src/kdc/do_as_req.c 2008-12-18 23:49:24 UTC (rev 21548)
@@ -286,12 +286,13 @@
* still be issued a ticket granting ticket.
*/
if (isflagset(request->kdc_options, KDC_OPT_CANONICALIZE) &&
- !isflagset(server.attributes, KRB5_KDB_PWCHANGE_SERVICE))
+ !isflagset(server.attributes, KRB5_KDB_PWCHANGE_SERVICE)) {
server_princ = *(server.princ);
- else
+ } else {
server_princ = *(request->server);
- /* The realm is always canonicalized */
- server_princ.realm = *(krb5_princ_realm(context, server.princ));
+ /* The realm is always canonicalized */
+ server_princ.realm = *(krb5_princ_realm(context, server.princ));
+ }
ticket_reply.server = &server_princ;
enc_tkt_reply.flags = 0;
@@ -311,12 +312,13 @@
setflag(enc_tkt_reply.flags, TKT_FLG_MAY_POSTDATE);
enc_tkt_reply.session = &session_key;
- if (isflagset(c_flags, KRB5_KDB_FLAG_CANONICALIZE))
+ if (isflagset(c_flags, KRB5_KDB_FLAG_CANONICALIZE)) {
client_princ = *(client.princ);
- else
+ } else {
client_princ = *(request->client);
- /* The realm is always canonicalized */
- client_princ.realm = *(krb5_princ_realm(context, client.princ));
+ /* The realm is always canonicalized */
+ client_princ.realm = *(krb5_princ_realm(context, client.princ));
+ }
enc_tkt_reply.client = &client_princ;
enc_tkt_reply.transited.tr_type = KRB5_DOMAIN_X500_COMPRESS;
enc_tkt_reply.transited.tr_contents = empty_string; /* equivalent of "" */
More information about the cvs-krb5
mailing list