diff options
author | Tom Yu <tlyu@mit.edu> | 2010-03-30 01:51:04 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2010-03-30 01:51:04 +0000 |
commit | f443efc98ad96f0e383dd3d064df6e15ab1a9c80 (patch) | |
tree | 4418680e801d4cc51cf2ce8aa35ebabc41b132d3 | |
parent | a3f9d949164617adfbdf5935871446a57c8752e0 (diff) | |
download | krb5-f443efc98ad96f0e383dd3d064df6e15ab1a9c80.zip krb5-f443efc98ad96f0e383dd3d064df6e15ab1a9c80.tar.gz krb5-f443efc98ad96f0e383dd3d064df6e15ab1a9c80.tar.bz2 |
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.
ticket: 6693
version_fixed: 1.8.1
status: resolved
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23845 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | 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; } |