s4:heimdal: import lorikeet-heimdal-200909210500 (commit 290db8d23647a27c39b97c189a0b...

[amitay/samba.git] / source4 / heimdal / lib / gssapi / spnego / compat.c

diff --git a/source4/heimdal/lib/gssapi/spnego/compat.c b/source4/heimdal/lib/gssapi/spnego/compat.c
index 67d9b202a7309533dc9de724d4e624af69e1d91b..b2f535e58f456e781919fd73ae86e6484bbece60 100644 (file)
--- a/source4/heimdal/lib/gssapi/spnego/compat.c
+++ b/source4/heimdal/lib/gssapi/spnego/compat.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "spnego/spnego_locl.h"
+#include "spnego_locl.h"
 
 RCSID("$Id$");
 
@@ -142,7 +142,6 @@ OM_uint32 _gss_spnego_internal_delete_sec_context
     HEIMDAL_MUTEX_destroy(&ctx->ctx_id_mutex);
 
     free(ctx);
-    *context_handle = NULL;
 
     return ret;
 }
@@ -236,7 +235,7 @@ _gss_spnego_indicate_mechtypelist (OM_uint32 *minor_status,
                                   gss_name_t target_name,
                                   OM_uint32 (*func)(gss_name_t, gss_OID),
                                   int includeMSCompatOID,
-                                  const gssspnego_cred cred_handle,
+                                  const gss_cred_id_t cred_handle,
                                   MechTypeList *mechtypelist,
                                   gss_OID *preferred_mech)
 {
@@ -248,9 +247,9 @@ _gss_spnego_indicate_mechtypelist (OM_uint32 *minor_status,
     mechtypelist->len = 0;
     mechtypelist->val = NULL;
 
-    if (cred_handle != NULL) {
+    if (cred_handle) {
        ret = gss_inquire_cred(minor_status,
-                              cred_handle->negotiated_cred_id,
+                              cred_handle,
                               NULL,
                               NULL,
                               NULL,