svn rev #23655: branches/krb5-1-7/src/lib/gssapi/spnego/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23655
Commit By: tlyu
Log Message:
ticket: 6594
version_fixed: 1.7.1
status: resolved

pull up r23482 from trunk

 ------------------------------------------------------------------------
 r23482 | ghudson | 2009-12-21 12:58:12 -0500 (Mon, 21 Dec 2009) | 9 lines

 ticket: 6594
 target_version: 1.7.1
 tags: pullup

 Add a set_cred_option handler for SPNEGO which forwards to the
 underlying mechanism.  Fixes SPNEGO credential delegation in 1.7 and
 copying of SPNEGO initiator creds in both 1.7 and trunk.  Patch
 provided by nalin at redhat.com.


Changed Files:
U   branches/krb5-1-7/src/lib/gssapi/spnego/gssapiP_spnego.h
U   branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c
Modified: branches/krb5-1-7/src/lib/gssapi/spnego/gssapiP_spnego.h
===================================================================
--- branches/krb5-1-7/src/lib/gssapi/spnego/gssapiP_spnego.h	2010-01-12 23:04:32 UTC (rev 23654)
+++ branches/krb5-1-7/src/lib/gssapi/spnego/gssapiP_spnego.h	2010-01-13 04:35:20 UTC (rev 23655)
@@ -333,6 +333,15 @@
 );
 
 OM_uint32
+spnego_gss_set_cred_option
+(
+	OM_uint32 *minor_status,
+	gss_cred_id_t cred_handle,
+	const gss_OID desired_object,
+	const gss_buffer_t value
+);
+
+OM_uint32
 spnego_gss_set_sec_context_option
 (
 	OM_uint32 *minor_status,

Modified: branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c
===================================================================
--- branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c	2010-01-12 23:04:32 UTC (rev 23654)
+++ branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c	2010-01-13 04:35:20 UTC (rev 23655)
@@ -250,7 +250,7 @@
  	spnego_gss_inquire_sec_context_by_oid, /* gss_inquire_sec_context_by_oid */
  	NULL,				/* gss_inquire_cred_by_oid */
  	spnego_gss_set_sec_context_option, /* gss_set_sec_context_option */
- 	NULL,				/* gssspi_set_cred_option */
+	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
  	NULL,				/* gssspi_mech_invoke */
 	spnego_gss_wrap_aead,
 	spnego_gss_unwrap_aead,
@@ -2088,6 +2088,21 @@
 }
 
 OM_uint32
+spnego_gss_set_cred_option(
+		OM_uint32 *minor_status,
+		gss_cred_id_t cred_handle,
+		const gss_OID desired_object,
+		const gss_buffer_t value)
+{
+	OM_uint32 ret;
+	ret = gssspi_set_cred_option(minor_status,
+				     cred_handle,
+				     desired_object,
+				     value);
+	return (ret);
+}
+
+OM_uint32
 spnego_gss_set_sec_context_option(
 		OM_uint32 *minor_status,
 		gss_ctx_id_t *context_handle,