svn rev #18419: branches/krb5-1-5/ src/lib/gssapi/krb5/ src/lib/gssapi/mechglue/

[tlyu@MIT.EDU]

Commit By: tlyu
Log Message: 
ticket: 4063
version_fixed: 1.5.1

	* src/lib/gssapi/krb5/accept_sec_context.c
	(krb5_gss_accept_sec_context): Apply single fix from ticket
	#4057.

	* src/lib/gssapi/mechglue/g_glue.c
	(gssint_convert_name_to_union_name): Fix up merge botch.

	* src/lib/gssapi/mechglue/mglueP.h: Fix up struct name differences
	between trunk and 1.5-branch.



Changed Files:
_U  branches/krb5-1-5/
U   branches/krb5-1-5/src/lib/gssapi/krb5/accept_sec_context.c
U   branches/krb5-1-5/src/lib/gssapi/mechglue/g_glue.c
U   branches/krb5-1-5/src/lib/gssapi/mechglue/mglueP.h