Pull up r25590 from trunk
authorTom Yu <tlyu@mit.edu>
Mon, 9 Jan 2012 21:23:40 +0000 (21:23 +0000)
committerTom Yu <tlyu@mit.edu>
Mon, 9 Jan 2012 21:23:40 +0000 (21:23 +0000)
commit6bea7ee42984ab58ea7236ac7f49ae86723f85aa
tree4009e59ded172db3d721beba39899dec6a736ecf
parent185847f507fcd9bf92ffd58c257b1c1db38fd55a
Pull up r25590 from trunk

 ------------------------------------------------------------------------
 r25590 | ghudson | 2011-12-16 18:18:54 -0500 (Fri, 16 Dec 2011) | 11 lines

 ticket: 7053
 subject: Verify acceptor's mech in SPNEGO initiator
 target_version: 1.10
 tags: pullup

 In spnego_gss_ctx_id_rec, store the set of negotiable mechanisms as
 well as the currently selected internal_mech, which becomes an alias
 into mech_set.  In init_ctx_reselect, locate the acceptor's counter-
 proposal in sc->mech_set and consider the token defective if it is not
 found.

ticket: 7053
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25627 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/gssapi/spnego/gssapiP_spnego.h
src/lib/gssapi/spnego/spnego_mech.c