[29591] in CVS-changelog-for-Kerberos-V5
krb5 commit: Guess Samba client mutual flag using ap_options
daemon@ATHENA.MIT.EDU (Greg Hudson)
Sat Aug 27 18:24:18 2016
Date: Sat, 27 Aug 2016 18:24:14 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201608272224.u7RMOEuw012409@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/7919818c0eec534828521aed01b89aa72e5e7e81
commit 7919818c0eec534828521aed01b89aa72e5e7e81
Author: Andreas Schneider <asn@cryptomilk.org>
Date: Thu Aug 25 10:41:33 2016 +0200
Guess Samba client mutual flag using ap_options
To work correctly with older Samba clients, we should guess the mutual
flag based on the ap_options from the AP-REQ and not set it
unconditionally. Found by the Samba torture testsuite.
[ghudson@mit.edu: edited comments and commit message]
ticket: 8486 (new)
target_version: 1.14-next
tags: pullup
src/lib/gssapi/krb5/accept_sec_context.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index b7fffeb..580d08c 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -699,7 +699,10 @@ kg_accept_krb5(minor_status, context_handle,
goto fail;
}
- gss_flags = GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG;
+ /* Use ap_options from the request to guess the mutual flag. */
+ gss_flags = GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG;
+ if (ap_req_options & AP_OPTS_MUTUAL_REQUIRED)
+ gss_flags |= GSS_C_MUTUAL_FLAG;
} else {
/* gss krb5 v1 */
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
