X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=spnegokrb5%2Finit_sec_context.c;h=70724a4a2eb89e3e988818ea3d460dcdfc2c632c;hb=HEAD;hp=9f79deee64fc2b748c2d11c29f564845dcabba3f;hpb=d1645cde73a6a91ca183e628cd0cffb0e2e36313;p=mod_auth_kerb.git

diff --git a/spnegokrb5/init_sec_context.c b/spnegokrb5/init_sec_context.c
index 9f79dee..70724a4 100644
--- a/spnegokrb5/init_sec_context.c
+++ b/spnegokrb5/init_sec_context.c
@@ -1,12 +1,11 @@
 /*
  *  SPNEGO wrapper for Kerberos5 GSS-API
  *  kouril@ics.muni.cz, 2003
+ *  (mostly based on Heimdal code)
  */
 
 #include "spnegokrb5_locl.h"
 
-#define ALLOC(X) (X) = calloc(1, sizeof(*(X)))
-
 static int
 add_mech(MechTypeList *mech_list, gss_OID mech)
 {
@@ -27,6 +26,7 @@ add_mech(MechTypeList *mech_list, gss_OID mech)
    return 0;
 }
 
+#if 0
 static int
 set_context_flags(OM_uint32 req_flags, ContextFlags *flags)
 {
@@ -46,8 +46,9 @@ set_context_flags(OM_uint32 req_flags, ContextFlags *flags)
       flags->integFlag = 1;
    return 0;
 }
+#endif
 
-OM_uint32 gss_init_sec_context_spnego(
+OM_uint32 KRB5_LIB_FUNCTION gss_init_sec_context_spnego(
 	    OM_uint32 * minor_status,
             const gss_cred_id_t initiator_cred_handle,
             gss_ctx_id_t * context_handle,
@@ -141,7 +142,7 @@ OM_uint32 gss_init_sec_context_spnego(
 	    ret = der_put_length_and_tag(buf + buf_size - len - 1,
 					 buf_size - len,
 					 len,
-					 CONTEXT,
+					 KERB_CTXT,
 					 CONS,
 					 0,
 					 &tmp);
@@ -170,7 +171,7 @@ OM_uint32 gss_init_sec_context_spnego(
 
     ret = gssapi_spnego_encapsulate(minor_status,
 	                            buf + buf_size - len, len,
-				    output_token, "\x01\x00");
+				    output_token, GSS_SPNEGO_MECH);
 
    ret = major_status;