- renamed enum CONTEXT into KERB_CTXT to address name clashes on Windows

[mod_auth_kerb.cvs/.git] / spnegokrb5 / accept_sec_context.c

diff --git a/spnegokrb5/accept_sec_context.c b/spnegokrb5/accept_sec_context.c
index 517186f..1fcbff6 100644 (file)
--- a/spnegokrb5/accept_sec_context.c
+++ b/spnegokrb5/accept_sec_context.c
@@ -37,7 +37,7 @@ code_NegTokenArg(OM_uint32 *minor_status,
            ret = der_put_length_and_tag(buf + buf_size - buf_len - 1,
                                         buf_size - buf_len,
                                         buf_len,
-                                        CONTEXT,
+                                        KERB_CTXT,
                                         CONS,
                                         1,
                                         &tmp);
@@ -163,7 +163,7 @@ send_accept (OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_accept_sec_context_spnego
+OM_uint32 KRB5_LIB_FUNCTION gss_accept_sec_context_spnego
            (OM_uint32 * minor_status,
             gss_ctx_id_t * context_handle,
             const gss_cred_id_t acceptor_cred_handle,
@@ -194,7 +194,7 @@ OM_uint32 gss_accept_sec_context_spnego
    if (ret)
       return ret;
 
-   ret = der_match_tag_and_length(buf, buf_size, CONTEXT, CONS,
+   ret = der_match_tag_and_length(buf, buf_size, KERB_CTXT, CONS,
                                  0, &len, &taglen);
    if (ret)
       return ret;
@@ -244,13 +244,13 @@ OM_uint32 gss_accept_sec_context_spnego
                                            time_rec,
                                            delegated_cred_handle);
       if (GSS_ERROR(major_status)) {
-        send_reject (minor_status, output_token);
+        send_reject (&minor_status2, output_token);
         return major_status;
       }
       ot = &obuf;
    }
 
-   ret = send_accept (minor_status, output_token, ot);
+   ret = send_accept (&minor_status2, output_token, ot);
    if (ot != NULL)
       gss_release_buffer(&minor_status2, ot);