Module Name:	krb5
Committed By:	raeburn
Date:		Mon Jan  5 21:12:24 UTC 2004

Modified Files:
	 krb5/src/lib/gssapi/krb5/ChangeLog
		krb5/src/lib/gssapi/krb5/accept_sec_context.c
		krb5/src/lib/gssapi/krb5/init_sec_context.c
Added Files:

Removed Files:


Log Message
ticket: 2079
tags: pullup

* init_sec_context.c: Include auth_con.h if CFX_EXERCISE is defined.
(make_gss_checksum) [CFX_EXERCISE]: If the key enctype is aes256, insert some
stuff after the delegation slot.
(new_connection) [CFX_EXERCISE]: Don't send messages with bogus token ids.

* accept_sec_context.c (krb5_gss_accept_sec_context): Don't discard the
delegation flag; only look for a delegation if the flag is set, and only look
for delegation, not other options.  Ignore any other data there.


To generate a diff of this commit:
	cvs diff -r1.233 -r1.234 krb5/src/lib/gssapi/krb5/ChangeLog
	cvs diff -r1.82 -r1.83
		krb5/src/lib/gssapi/krb5/accept_sec_context.c
	cvs diff -r1.74 -r1.75 krb5/src/lib/gssapi/krb5/init_sec_context.c