Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) From: tlyu@mit.edu Subject: git commit RT-Send-CC: X-RT-Original-Encoding: iso-8859-1 Content-Length: 939 Properly reflect MS krb5 mech in SPNEGO acceptor r25590 changed negotiate_mech() to return an alias into the acceptor's mech set, with the unfortunate side effect of transforming the erroneous Microsoft krb5 mech OID into the correct krb5 mech OID, meaning that we answer with a different OID than the requested one. Return an alias into the initiator's mech set instead, and store that in mech_set field the SPNEGO context. The acceptor code only uses mech_set to hold the allocated storage pointed into by internal_mech, so this change is safe. (cherry picked from commit 8255613476d4c1583a5e810b50444f188fde871f) https://github.com/krb5/krb5/commit/dc31efaeec2c10dfd87951b9298c187f4c65bb39 Author: Greg Hudson Committer: Tom Yu Commit: dc31efaeec2c10dfd87951b9298c187f4c65bb39 Branch: krb5-1.12 src/lib/gssapi/spnego/spnego_mech.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)