commit 692433183006b8cb5f0d8b5b3014614822a4881f Author: tlyu tlyu@dc483132-0cff-0310-8789-dd5450dbe970 Date: Tue Mar 30 01:51:04 2010 +0000
ticket: 6693 version_fixed: 1.8.1 status: resolved
pull up r23844 from trunk
------------------------------------------------------------------------ r23844 | ghudson | 2010-03-29 18:08:21 -0400 (Mon, 29 Mar 2010) | 9 lines
ticket: 6693 subject: Fix backwards flag output in krb5_init_creds_step() tags: pullup target_version: 1.8.1
krb5_init_creds_step() is taken from Heimdal, which sets *flags to 1 for "continue" and 0 for "stop". Unfortunately, we got it backwards in 1.8; fix it for 1.8.1.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23845 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/krb5/krb/get_in_tkt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index ab92ee1..b1b837d 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -1083,7 +1083,7 @@ init_creds_get(krb5_context context, &flags); if (code == KRB5KRB_ERR_RESPONSE_TOO_BIG && !tcp_only) tcp_only = 1; - else if (code != 0 || (flags & KRB5_INIT_CREDS_STEP_FLAG_COMPLETE)) + else if (code != 0 || (flags & 1) == 0) break;
krb5_free_data_contents(context, &reply); @@ -2065,7 +2065,7 @@ cleanup: } }
- *flags = (ctx->flags & KRB5_INIT_CREDS_STEP_FLAG_COMPLETE); + *flags = (ctx->flags & KRB5_INIT_CREDS_STEP_FLAG_COMPLETE) ? 0 : 1;
return code; }