diff options
author | Greg Hudson <ghudson@mit.edu> | 2013-05-30 11:39:54 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2013-05-31 11:05:09 -0400 |
commit | a12a5ddb9b932061bad7b83df058c7c6e2e4b044 (patch) | |
tree | a0830e47ddbc389802751d84ae5df79b3f891d4f | |
parent | 3db9bdef99ecec12a1ec3477e817381ddefc327f (diff) | |
download | krb5-a12a5ddb9b932061bad7b83df058c7c6e2e4b044.tar.gz krb5-a12a5ddb9b932061bad7b83df058c7c6e2e4b044.tar.xz krb5-a12a5ddb9b932061bad7b83df058c7c6e2e4b044.zip |
Properly handle use_master in k5_init_creds_get
If we make multiple requests in an initial creds exchange, the
krb5_sendto_kdc call in k5_init_creds_get may flip the use_master
value from 0 to 1 if it detects that the response was from a master
KDC. Don't turn this into a requirement for future requests during
the same exchange, or we may have trouble following AS referrals.
Reported by Sumit Bose.
ticket: 7650
-rw-r--r-- | src/lib/krb5/krb/get_in_tkt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 20bc68939..ff455d355 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -521,7 +521,7 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx, krb5_data reply; krb5_data realm; unsigned int flags = 0; - int tcp_only = 0; + int tcp_only = 0, master = *use_master; request.length = 0; request.data = NULL; @@ -545,8 +545,9 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx, krb5_free_data_contents(context, &reply); + master = *use_master; code = krb5_sendto_kdc(context, &request, &realm, - &reply, use_master, tcp_only); + &reply, &master, tcp_only); if (code != 0) break; @@ -558,6 +559,7 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx, krb5_free_data_contents(context, &reply); krb5_free_data_contents(context, &realm); + *use_master = master; return code; } |