Merge mskrb-integ onto trunk

The mskrb-integ branch includes support for the following projects:
Projects/Aliases
* Projects/PAC and principal APIs
* Projects/AEAD encryption API
* Projects/GSSAPI DCE
* Projects/RFC 3244

In addition, it includes support for enctype negotiation, and a variety of GSS-API extensions.
In the KDC it includes support for protocol transition, constrained delegation
and a new authorization data interface.
The old authorization data interface is also supported.

This commit merges the mskrb-integ branch on to the trunk.
Additional review and testing is required.

Merge commit 'mskrb-integ' into trunk

ticket: new
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21690 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 13 insertions, 9 deletions

diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c
index 2071df44a1..430b50d282 100644
--- a/src/lib/gssapi/krb5/copy_ccache.c
+++ b/src/lib/gssapi/krb5/copy_ccache.c
@@ -2,22 +2,26 @@
 #include "gssapiP_krb5.h"
 
 OM_uint32 KRB5_CALLCONV
-gss_krb5int_copy_ccache(minor_status, cred_handle, out_ccache)
-    OM_uint32 *minor_status;
-    gss_cred_id_t cred_handle;
-    krb5_ccache out_ccache;
+gss_krb5int_copy_ccache(OM_uint32 *minor_status,
+			gss_cred_id_t cred_handle,
+			const gss_OID desired_object,
+			const gss_buffer_t value)
 {
-    OM_uint32 major_status;
     krb5_gss_cred_id_t k5creds;
     krb5_cc_cursor cursor;
     krb5_creds creds;
     krb5_error_code code;
     krb5_context context;
+    krb5_ccache out_ccache;
+        
+    assert(value->length == sizeof(out_ccache));
+
+    if (value->length != sizeof(out_ccache))
+	return GSS_S_FAILURE;
+
+    out_ccache = (krb5_ccache)value->value;
 
-    /* validate the cred handle */
-    major_status = krb5_gss_validate_cred(minor_status, cred_handle);
-    if (major_status)
-        return(major_status);
+    /* cred handle will have been validated by gssspi_set_cred_option() */
 
     k5creds = (krb5_gss_cred_id_t) cred_handle;
     code = k5_mutex_lock(&k5creds->lock);