From 361f04c779beed3a2621e91101eca8798f7ac417 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 7 Sep 2001 11:19:24 +0000 Subject: [PATCH] * rd_req_dec.c (krb5_rd_req_decoded_opt): Pass server realm to transited-list check, not local realm, in case they're different. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13737 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 5 +++++ src/lib/krb5/krb/rd_req_dec.c | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 7f156034e..5fef9238b 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +2001-09-07 Ken Raeburn + + * rd_req_dec.c (krb5_rd_req_decoded_opt): Pass server realm to + transited-list check, not local realm, in case they're different. + 2001-08-21 Ken Raeburn * walk_rtree.c (krb5_walk_realm_tree): Initialize slen to silence diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 4e9f44ea0..31c02dd27 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -188,7 +188,6 @@ krb5_rd_req_decoded_opt(context, auth_context, req, server, keytab, /* Hierarchical Cross-Realm */ { - krb5_data lrealm; krb5_data * realm; krb5_transited * trans; @@ -200,12 +199,11 @@ krb5_rd_req_decoded_opt(context, auth_context, req, server, keytab, * transited are within the hierarchy between the client's realm * and the local realm. */ - if (trans->tr_contents.data && trans->tr_contents.data[0]) { - krb5_get_default_realm(context, &(lrealm.data)); - lrealm.length = strlen(lrealm.data); - retval = krb5_check_transited_list(context, &(trans->tr_contents), - realm, &lrealm); - free(lrealm.data); + if (trans->tr_contents.data && trans->tr_contents.data[0]) { + retval = krb5_check_transited_list(context, &(trans->tr_contents), + realm, + krb5_princ_realm (context, + server)); } } -- 2.26.2