svn rev #25087: trunk/src/lib/gssapi/ krb5/ mechglue/ spnego/
hartmans@MIT.EDU
hartmans at MIT.EDU
Tue Aug 9 16:07:23 EDT 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=25087
Commit By: hartmans
Log Message:
Use KRB5_CALLCONV for all gss mechanism functions. Also wrap #include <unistd.h> with #ifdef HAVE_UNISTD_H in g_authorize_localname.c.
Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
Signed-off-by: Sam Hartman <hartmans at painless-security.com>
Changed Files:
U trunk/src/lib/gssapi/krb5/accept_sec_context.c
U trunk/src/lib/gssapi/krb5/acquire_cred.c
U trunk/src/lib/gssapi/krb5/compare_name.c
U trunk/src/lib/gssapi/krb5/context_time.c
U trunk/src/lib/gssapi/krb5/delete_sec_context.c
U trunk/src/lib/gssapi/krb5/disp_name.c
U trunk/src/lib/gssapi/krb5/disp_status.c
U trunk/src/lib/gssapi/krb5/duplicate_name.c
U trunk/src/lib/gssapi/krb5/export_name.c
U trunk/src/lib/gssapi/krb5/export_sec_context.c
U trunk/src/lib/gssapi/krb5/gssapiP_krb5.h
A trunk/src/lib/gssapi/krb5/gssapi_err_krb5.c
A trunk/src/lib/gssapi/krb5/gssapi_err_krb5.h
U trunk/src/lib/gssapi/krb5/gssapi_krb5.c
U trunk/src/lib/gssapi/krb5/iakerb.c
U trunk/src/lib/gssapi/krb5/import_name.c
U trunk/src/lib/gssapi/krb5/import_sec_context.c
U trunk/src/lib/gssapi/krb5/indicate_mechs.c
U trunk/src/lib/gssapi/krb5/init_sec_context.c
U trunk/src/lib/gssapi/krb5/inq_context.c
U trunk/src/lib/gssapi/krb5/inq_cred.c
U trunk/src/lib/gssapi/krb5/inq_names.c
U trunk/src/lib/gssapi/krb5/k5seal.c
U trunk/src/lib/gssapi/krb5/k5sealiov.c
U trunk/src/lib/gssapi/krb5/k5unseal.c
U trunk/src/lib/gssapi/krb5/k5unsealiov.c
U trunk/src/lib/gssapi/krb5/naming_exts.c
U trunk/src/lib/gssapi/krb5/prf.c
U trunk/src/lib/gssapi/krb5/process_context_token.c
U trunk/src/lib/gssapi/krb5/rel_cred.c
U trunk/src/lib/gssapi/krb5/rel_name.c
U trunk/src/lib/gssapi/krb5/rel_oid.c
U trunk/src/lib/gssapi/krb5/s4u_gss_glue.c
U trunk/src/lib/gssapi/krb5/store_cred.c
U trunk/src/lib/gssapi/krb5/wrap_size_limit.c
U trunk/src/lib/gssapi/mechglue/g_authorize_localname.c
U trunk/src/lib/gssapi/mechglue/g_decapsulate_token.c
U trunk/src/lib/gssapi/mechglue/g_encapsulate_token.c
U trunk/src/lib/gssapi/mechglue/g_oid_ops.c
U trunk/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
U trunk/src/lib/gssapi/mechglue/mglueP.h
U trunk/src/lib/gssapi/spnego/gssapiP_spnego.h
U trunk/src/lib/gssapi/spnego/spnego_mech.c
Modified: trunk/src/lib/gssapi/krb5/accept_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/accept_sec_context.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/accept_sec_context.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -1296,7 +1296,7 @@
#endif /* LEAN_CLIENT */
OM_uint32
-krb5_gss_accept_sec_context_ext(
+KRB5_CALLCONV krb5_gss_accept_sec_context_ext(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_cred_id_t verifier_cred_handle,
@@ -1340,7 +1340,7 @@
}
OM_uint32
-krb5_gss_accept_sec_context(minor_status, context_handle,
+KRB5_CALLCONV krb5_gss_accept_sec_context(minor_status, context_handle,
verifier_cred_handle, input_token,
input_chan_bindings, src_name, mech_type,
output_token, ret_flags, time_rec,
Modified: trunk/src/lib/gssapi/krb5/acquire_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/acquire_cred.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/acquire_cred.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -186,7 +186,7 @@
*/
static OM_uint32
-acquire_accept_cred(krb5_context context,
+KRB5_CALLCONV acquire_accept_cred(krb5_context context,
OM_uint32 *minor_status,
krb5_gss_name_t desired_name,
krb5_keytab req_keytab,
@@ -727,7 +727,7 @@
*/
OM_uint32
-krb5_gss_acquire_cred(minor_status, desired_name, time_req,
+KRB5_CALLCONV krb5_gss_acquire_cred(minor_status, desired_name, time_req,
desired_mechs, cred_usage, output_cred_handle,
actual_mechs, time_rec)
OM_uint32 *minor_status;
@@ -752,7 +752,7 @@
}
OM_uint32
-iakerb_gss_acquire_cred(minor_status, desired_name, time_req,
+KRB5_CALLCONV iakerb_gss_acquire_cred(minor_status, desired_name, time_req,
desired_mechs, cred_usage, output_cred_handle,
actual_mechs, time_rec)
OM_uint32 *minor_status;
@@ -777,7 +777,7 @@
}
OM_uint32
-krb5_gss_acquire_cred_with_password(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_acquire_cred_with_password(OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
OM_uint32 time_req,
@@ -801,7 +801,7 @@
}
OM_uint32
-iakerb_gss_acquire_cred_with_password(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_acquire_cred_with_password(OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
OM_uint32 time_req,
Modified: trunk/src/lib/gssapi/krb5/compare_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/compare_name.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/compare_name.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -28,7 +28,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_compare_name(minor_status, name1, name2, name_equal)
+KRB5_CALLCONV krb5_gss_compare_name(minor_status, name1, name2, name_equal)
OM_uint32 *minor_status;
gss_name_t name1;
gss_name_t name2;
Modified: trunk/src/lib/gssapi/krb5/context_time.c
===================================================================
--- trunk/src/lib/gssapi/krb5/context_time.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/context_time.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -28,7 +28,7 @@
*/
OM_uint32
-krb5_gss_context_time(minor_status, context_handle, time_rec)
+KRB5_CALLCONV krb5_gss_context_time(minor_status, context_handle, time_rec)
OM_uint32 *minor_status;
gss_ctx_id_t context_handle;
OM_uint32 *time_rec;
Modified: trunk/src/lib/gssapi/krb5/delete_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/delete_sec_context.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/delete_sec_context.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -28,7 +28,7 @@
*/
OM_uint32
-krb5_gss_delete_sec_context(minor_status, context_handle, output_token)
+KRB5_CALLCONV krb5_gss_delete_sec_context(minor_status, context_handle, output_token)
OM_uint32 *minor_status;
gss_ctx_id_t *context_handle;
gss_buffer_t output_token;
Modified: trunk/src/lib/gssapi/krb5/disp_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/disp_name.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/disp_name.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -24,7 +24,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_display_name(minor_status, input_name, output_name_buffer,
+KRB5_CALLCONV krb5_gss_display_name(minor_status, input_name, output_name_buffer,
output_name_type)
OM_uint32 *minor_status;
gss_name_t input_name;
Modified: trunk/src/lib/gssapi/krb5/disp_status.c
===================================================================
--- trunk/src/lib/gssapi/krb5/disp_status.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/disp_status.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -154,7 +154,7 @@
/**/
OM_uint32
-krb5_gss_display_status(minor_status, status_value, status_type,
+KRB5_CALLCONV krb5_gss_display_status(minor_status, status_value, status_type,
mech_type, message_context, status_string)
OM_uint32 *minor_status;
OM_uint32 status_value;
Modified: trunk/src/lib/gssapi/krb5/duplicate_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/duplicate_name.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/duplicate_name.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -26,7 +26,7 @@
#include "gssapiP_krb5.h"
-OM_uint32 krb5_gss_duplicate_name(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV krb5_gss_duplicate_name(OM_uint32 *minor_status,
const gss_name_t input_name,
gss_name_t *dest_name)
{
Modified: trunk/src/lib/gssapi/krb5/export_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/export_name.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/export_name.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -26,7 +26,7 @@
#include "gssapiP_krb5.h"
-OM_uint32 krb5_gss_export_name(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV krb5_gss_export_name(OM_uint32 *minor_status,
const gss_name_t input_name,
gss_buffer_t exported_name)
{
Modified: trunk/src/lib/gssapi/krb5/export_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/export_sec_context.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/export_sec_context.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -27,7 +27,7 @@
#include "gssapiP_krb5.h"
#ifndef LEAN_CLIENT
OM_uint32
-krb5_gss_export_sec_context(minor_status, context_handle, interprocess_token)
+KRB5_CALLCONV krb5_gss_export_sec_context(minor_status, context_handle, interprocess_token)
OM_uint32 *minor_status;
gss_ctx_id_t *context_handle;
gss_buffer_t interprocess_token;
Modified: trunk/src/lib/gssapi/krb5/gssapiP_krb5.h
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapiP_krb5.h 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/gssapiP_krb5.h 2011-08-09 20:07:23 UTC (rev 25087)
@@ -480,7 +480,8 @@
/** declarations of internal name mechanism functions **/
-OM_uint32 krb5_gss_acquire_cred
+OM_uint32
+KRB5_CALLCONV krb5_gss_acquire_cred
(OM_uint32*, /* minor_status */
gss_name_t, /* desired_name */
OM_uint32, /* time_req */
@@ -492,7 +493,7 @@
);
OM_uint32
-iakerb_gss_acquire_cred
+KRB5_CALLCONV iakerb_gss_acquire_cred
(OM_uint32*, /* minor_status */
gss_name_t, /* desired_name */
OM_uint32, /* time_req */
@@ -504,7 +505,7 @@
);
OM_uint32
-krb5_gss_acquire_cred_with_password(
+KRB5_CALLCONV krb5_gss_acquire_cred_with_password(
OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
@@ -516,7 +517,7 @@
OM_uint32 *time_rec);
OM_uint32
-iakerb_gss_acquire_cred_with_password(
+KRB5_CALLCONV iakerb_gss_acquire_cred_with_password(
OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
@@ -527,12 +528,13 @@
gss_OID_set *actual_mechs,
OM_uint32 *time_rec);
-OM_uint32 krb5_gss_release_cred
+OM_uint32
+KRB5_CALLCONV krb5_gss_release_cred
(OM_uint32*, /* minor_status */
gss_cred_id_t* /* cred_handle */
);
-OM_uint32 krb5_gss_init_sec_context
+OM_uint32 KRB5_CALLCONV krb5_gss_init_sec_context
(OM_uint32*, /* minor_status */
gss_cred_id_t, /* claimant_cred_handle */
gss_ctx_id_t*, /* context_handle */
@@ -568,7 +570,7 @@
);
#ifndef LEAN_CLIENT
-OM_uint32 krb5_gss_accept_sec_context
+OM_uint32 KRB5_CALLCONV krb5_gss_accept_sec_context
(OM_uint32*, /* minor_status */
gss_ctx_id_t*, /* context_handle */
gss_cred_id_t, /* verifier_cred_handle */
@@ -583,7 +585,7 @@
gss_cred_id_t* /* delegated_cred_handle */
);
-OM_uint32 krb5_gss_accept_sec_context_ext
+OM_uint32 KRB5_CALLCONV krb5_gss_accept_sec_context_ext
(OM_uint32*, /* minor_status */
gss_ctx_id_t*, /* context_handle */
gss_cred_id_t, /* verifier_cred_handle */
@@ -600,25 +602,25 @@
);
#endif /* LEAN_CLIENT */
-OM_uint32 krb5_gss_process_context_token
+OM_uint32 KRB5_CALLCONV krb5_gss_process_context_token
(OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_buffer_t /* token_buffer */
);
-OM_uint32 krb5_gss_delete_sec_context
+OM_uint32 KRB5_CALLCONV krb5_gss_delete_sec_context
(OM_uint32*, /* minor_status */
gss_ctx_id_t*, /* context_handle */
gss_buffer_t /* output_token */
);
-OM_uint32 krb5_gss_context_time
+OM_uint32 KRB5_CALLCONV krb5_gss_context_time
(OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
OM_uint32* /* time_rec */
);
-OM_uint32 krb5_gss_display_status
+OM_uint32 KRB5_CALLCONV krb5_gss_display_status
(OM_uint32*, /* minor_status */
OM_uint32, /* status_value */
int, /* status_type */
@@ -627,19 +629,19 @@
gss_buffer_t /* status_string */
);
-OM_uint32 krb5_gss_indicate_mechs
+OM_uint32 KRB5_CALLCONV krb5_gss_indicate_mechs
(OM_uint32*, /* minor_status */
gss_OID_set* /* mech_set */
);
-OM_uint32 krb5_gss_compare_name
+OM_uint32 KRB5_CALLCONV krb5_gss_compare_name
(OM_uint32*, /* minor_status */
gss_name_t, /* name1 */
gss_name_t, /* name2 */
int* /* name_equal */
);
-OM_uint32 krb5_gss_display_name
+OM_uint32 KRB5_CALLCONV krb5_gss_display_name
(OM_uint32*, /* minor_status */
gss_name_t, /* input_name */
gss_buffer_t, /* output_name_buffer */
@@ -647,19 +649,19 @@
);
-OM_uint32 krb5_gss_import_name
+OM_uint32 KRB5_CALLCONV krb5_gss_import_name
(OM_uint32*, /* minor_status */
gss_buffer_t, /* input_name_buffer */
gss_OID, /* input_name_type */
gss_name_t* /* output_name */
);
-OM_uint32 krb5_gss_release_name
+OM_uint32 KRB5_CALLCONV krb5_gss_release_name
(OM_uint32*, /* minor_status */
gss_name_t* /* input_name */
);
-OM_uint32 krb5_gss_inquire_cred
+OM_uint32 KRB5_CALLCONV krb5_gss_inquire_cred
(OM_uint32 *, /* minor_status */
gss_cred_id_t, /* cred_handle */
gss_name_t *, /* name */
@@ -668,7 +670,7 @@
gss_OID_set * /* mechanisms */
);
-OM_uint32 krb5_gss_inquire_context
+OM_uint32 KRB5_CALLCONV krb5_gss_inquire_context
(OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_name_t*, /* initiator_name */
@@ -681,7 +683,7 @@
);
/* New V2 entry points */
-OM_uint32 krb5_gss_get_mic
+OM_uint32 KRB5_CALLCONV krb5_gss_get_mic
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_qop_t, /* qop_req */
@@ -689,7 +691,7 @@
gss_buffer_t /* message_token */
);
-OM_uint32 krb5_gss_verify_mic
+OM_uint32 KRB5_CALLCONV krb5_gss_verify_mic
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_buffer_t, /* message_buffer */
@@ -697,7 +699,7 @@
gss_qop_t * /* qop_state */
);
-OM_uint32 krb5_gss_wrap
+OM_uint32 KRB5_CALLCONV krb5_gss_wrap
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
@@ -707,7 +709,7 @@
gss_buffer_t /* output_message_buffer */
);
-OM_uint32 krb5_gss_wrap_iov
+OM_uint32 KRB5_CALLCONV krb5_gss_wrap_iov
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
@@ -718,7 +720,7 @@
);
OM_uint32
-krb5_gss_wrap_iov_length
+KRB5_CALLCONV krb5_gss_wrap_iov_length
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
@@ -728,7 +730,7 @@
int /* iov_count */
);
-OM_uint32 krb5_gss_unwrap
+OM_uint32 KRB5_CALLCONV krb5_gss_unwrap
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_buffer_t, /* input_message_buffer */
@@ -737,7 +739,7 @@
gss_qop_t * /* qop_state */
);
-OM_uint32 krb5_gss_unwrap_iov
+OM_uint32 KRB5_CALLCONV krb5_gss_unwrap_iov
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int *, /* conf_state */
@@ -746,7 +748,7 @@
int /* iov_count */
);
-OM_uint32 krb5_gss_wrap_size_limit
+OM_uint32 KRB5_CALLCONV krb5_gss_wrap_size_limit
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
@@ -755,21 +757,21 @@
OM_uint32 * /* max_input_size */
);
-OM_uint32 krb5_gss_import_name_object
+OM_uint32 KRB5_CALLCONV krb5_gss_import_name_object
(OM_uint32 *, /* minor_status */
void *, /* input_name */
gss_OID, /* input_name_type */
gss_name_t * /* output_name */
);
-OM_uint32 krb5_gss_export_name_object
+OM_uint32 KRB5_CALLCONV krb5_gss_export_name_object
(OM_uint32 *, /* minor_status */
gss_name_t, /* input_name */
gss_OID, /* desired_name_type */
void * * /* output_name */
);
-OM_uint32 krb5_gss_inquire_cred_by_mech
+OM_uint32 KRB5_CALLCONV krb5_gss_inquire_cred_by_mech
(OM_uint32 *, /* minor_status */
gss_cred_id_t, /* cred_handle */
gss_OID, /* mech_type */
@@ -779,13 +781,13 @@
gss_cred_usage_t * /* cred_usage */
);
#ifndef LEAN_CLIENT
-OM_uint32 krb5_gss_export_sec_context
+OM_uint32 KRB5_CALLCONV krb5_gss_export_sec_context
(OM_uint32 *, /* minor_status */
gss_ctx_id_t *, /* context_handle */
gss_buffer_t /* interprocess_token */
);
-OM_uint32 krb5_gss_import_sec_context
+OM_uint32 KRB5_CALLCONV krb5_gss_import_sec_context
(OM_uint32 *, /* minor_status */
gss_buffer_t, /* interprocess_token */
gss_ctx_id_t * /* context_handle */
@@ -799,12 +801,12 @@
gss_OID * /* oid */
);
-OM_uint32 krb5_gss_internal_release_oid
+OM_uint32 KRB5_CALLCONV krb5_gss_internal_release_oid
(OM_uint32 *, /* minor_status */
gss_OID * /* oid */
);
-OM_uint32 krb5_gss_inquire_names_for_mech
+OM_uint32 KRB5_CALLCONV krb5_gss_inquire_names_for_mech
(OM_uint32 *, /* minor_status */
gss_OID, /* mechanism */
gss_OID_set * /* name_types */
@@ -817,13 +819,13 @@
gss_name_t * /* output_name */
);
-OM_uint32 krb5_gss_export_name
+OM_uint32 KRB5_CALLCONV krb5_gss_export_name
(OM_uint32 *, /* minor_status */
const gss_name_t, /* input_name */
gss_buffer_t /* exported_name */
);
-OM_uint32 krb5_gss_duplicate_name
+OM_uint32 KRB5_CALLCONV krb5_gss_duplicate_name
(OM_uint32 *, /* minor_status */
const gss_name_t, /* input_name */
gss_name_t * /* dest_name */
@@ -834,7 +836,7 @@
gss_cred_id_t /* cred */
);
-OM_uint32 krb5_gss_acquire_cred_impersonate_name(
+OM_uint32 KRB5_CALLCONV krb5_gss_acquire_cred_impersonate_name(
OM_uint32 *, /* minor_status */
const gss_cred_id_t, /* impersonator_cred_handle */
const gss_name_t, /* desired_name */
@@ -894,20 +896,20 @@
krb5_principal *princ_out);
OM_uint32
-krb5_gss_display_name_ext(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_display_name_ext(OM_uint32 *minor_status,
gss_name_t name,
gss_OID display_as_name_type,
gss_buffer_t display_name);
OM_uint32
-krb5_gss_inquire_name(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_name(OM_uint32 *minor_status,
gss_name_t name,
int *name_is_MN,
gss_OID *MN_mech,
gss_buffer_set_t *attrs);
OM_uint32
-krb5_gss_get_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_get_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr,
int *authenticated,
@@ -917,37 +919,37 @@
int *more);
OM_uint32
-krb5_gss_set_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_set_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
int complete,
gss_buffer_t attr,
gss_buffer_t value);
OM_uint32
-krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr);
OM_uint32
-krb5_gss_export_name_composite(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_export_name_composite(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t exp_composite_name);
OM_uint32
-krb5_gss_map_name_to_any(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_map_name_to_any(OM_uint32 *minor_status,
gss_name_t name,
int authenticated,
gss_buffer_t type_id,
gss_any_t *output);
OM_uint32
-krb5_gss_release_any_name_mapping(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_release_any_name_mapping(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t type_id,
gss_any_t *input);
OM_uint32
-krb5_gss_pseudo_random(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_pseudo_random(OM_uint32 *minor_status,
gss_ctx_id_t context,
int prf_key,
const gss_buffer_t prf_in,
@@ -955,7 +957,7 @@
gss_buffer_t prf_out);
OM_uint32
-krb5_gss_store_cred(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_store_cred(OM_uint32 *minor_status,
gss_cred_id_t input_cred_handle,
gss_cred_usage_t cred_usage,
const gss_OID desired_mech,
@@ -1140,7 +1142,7 @@
/* IAKERB */
OM_uint32
-iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_init_sec_context(OM_uint32 *minor_status,
gss_cred_id_t claimant_cred_handle,
gss_ctx_id_t *context_handle,
gss_name_t target_name,
@@ -1155,7 +1157,7 @@
OM_uint32 *time_rec);
OM_uint32
-iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handler,
gss_cred_id_t verifier_cred_handle,
gss_buffer_t input_token,
@@ -1168,7 +1170,7 @@
gss_cred_id_t *delegated_cred_handle);
OM_uint32
-iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t output_token);
Added: trunk/src/lib/gssapi/krb5/gssapi_err_krb5.c
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapi_err_krb5.c (rev 0)
+++ trunk/src/lib/gssapi/krb5/gssapi_err_krb5.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -0,0 +1,53 @@
+/*
+ * lib/gssapi/krb5/gssapi_err_krb5.c:
+ * This file is automatically generated; please do not edit it.
+ */
+#if defined(_WIN32)
+# include "win-mac.h"
+#endif
+
+#if !defined(_WIN32)
+extern void initialize_k5g_error_table (void);
+#endif
+
+#define N_(x) (x)
+
+/* Lclint doesn't handle null annotations on arrays
+ properly, so we need this typedef in each
+ generated .c file. */
+/*@-redef@*/
+typedef /*@null@*/ const char *ncptr;
+/*@=redef@*/
+
+static ncptr const text[] = {
+ N_("Principal in credential cache does not match desired name"),
+ N_("No principal in keytab matches desired name"),
+ N_("Credential cache has no TGT"),
+ N_("Authenticator has no subkey"),
+ N_("Context is already fully established"),
+ N_("Unknown signature type in token"),
+ N_("Invalid field length in token"),
+ N_("Attempt to use incomplete security context"),
+ N_("Bad magic number for krb5_gss_ctx_id_t"),
+ N_("Bad magic number for krb5_gss_cred_id_t"),
+ N_("Bad magic number for krb5_gss_enc_desc"),
+ N_("Sequence number in token is corrupt"),
+ N_("Credential cache is empty"),
+ N_("Acceptor and Initiator share no checksum types"),
+ N_("Requested lucid context version not supported"),
+ N_("PRF input too long"),
+ N_("Bad magic number for iakerb_ctx_id_t"),
+ 0
+};
+
+#include <com_err.h>
+
+const struct error_table et_k5g_error_table = { text, 39756032L, 17 };
+
+#if !defined(_WIN32)
+void initialize_k5g_error_table (void)
+ /*@modifies internalState@*/
+{
+ (void) add_error_table (&et_k5g_error_table);
+}
+#endif
Added: trunk/src/lib/gssapi/krb5/gssapi_err_krb5.h
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapi_err_krb5.h (rev 0)
+++ trunk/src/lib/gssapi/krb5/gssapi_err_krb5.h 2011-08-09 20:07:23 UTC (rev 25087)
@@ -0,0 +1,39 @@
+/*
+ * lib/gssapi/krb5/gssapi_err_krb5.h:
+ * This file is automatically generated; please do not edit it.
+ */
+
+#include <com_err.h>
+
+#define KG_CCACHE_NOMATCH (39756032L)
+#define KG_KEYTAB_NOMATCH (39756033L)
+#define KG_TGT_MISSING (39756034L)
+#define KG_NO_SUBKEY (39756035L)
+#define KG_CONTEXT_ESTABLISHED (39756036L)
+#define KG_BAD_SIGN_TYPE (39756037L)
+#define KG_BAD_LENGTH (39756038L)
+#define KG_CTX_INCOMPLETE (39756039L)
+#define KG_CONTEXT (39756040L)
+#define KG_CRED (39756041L)
+#define KG_ENC_DESC (39756042L)
+#define KG_BAD_SEQ (39756043L)
+#define KG_EMPTY_CCACHE (39756044L)
+#define KG_NO_CTYPES (39756045L)
+#define KG_LUCID_VERSION (39756046L)
+#define KG_INPUT_TOO_LONG (39756047L)
+#define KG_IAKERB_CONTEXT (39756048L)
+#define ERROR_TABLE_BASE_k5g (39756032L)
+
+extern const struct error_table et_k5g_error_table;
+
+#if !defined(_WIN32)
+/* for compatibility with older versions... */
+extern void initialize_k5g_error_table (void) /*@modifies internalState@*/;
+#else
+#define initialize_k5g_error_table()
+#endif
+
+#if !defined(_WIN32)
+#define init_k5g_err_tbl initialize_k5g_error_table
+#define k5g_err_base ERROR_TABLE_BASE_k5g
+#endif
Modified: trunk/src/lib/gssapi/krb5/gssapi_krb5.c
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapi_krb5.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/gssapi_krb5.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -346,7 +346,7 @@
};
static OM_uint32
-krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
const gss_OID desired_object,
gss_buffer_set_t *data_set)
@@ -399,7 +399,7 @@
#endif
static OM_uint32
-krb5_gss_inquire_cred_by_oid(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_cred_by_oid(OM_uint32 *minor_status,
const gss_cred_id_t cred_handle,
const gss_OID desired_object,
gss_buffer_set_t *data_set)
@@ -463,7 +463,7 @@
#endif
static OM_uint32
-krb5_gss_set_sec_context_option (OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_set_sec_context_option (OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
const gss_OID desired_object,
const gss_buffer_t value)
@@ -526,7 +526,7 @@
};
static OM_uint32
-krb5_gssspi_set_cred_option(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gssspi_set_cred_option(OM_uint32 *minor_status,
gss_cred_id_t *cred_handle,
const gss_OID desired_object,
const gss_buffer_t value)
@@ -594,7 +594,7 @@
};
static OM_uint32
-krb5_gssspi_mech_invoke (OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gssspi_mech_invoke (OM_uint32 *minor_status,
const gss_OID desired_mech,
const gss_OID desired_object,
gss_buffer_t value)
@@ -634,7 +634,7 @@
#define GS2_IAKERB_SASL_NAME_LEN (sizeof(GS2_IAKERB_SASL_NAME) - 1)
static OM_uint32
-krb5_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
const gss_buffer_t sasl_mech_name,
gss_OID *mech_type)
{
@@ -658,7 +658,7 @@
}
static OM_uint32
-krb5_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
const gss_OID desired_mech,
gss_buffer_t sasl_mech_name,
gss_buffer_t mech_name,
@@ -687,7 +687,7 @@
}
static OM_uint32
-krb5_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
gss_const_OID mech,
gss_OID_set *mech_attrs,
gss_OID_set *known_mech_attrs)
@@ -739,7 +739,7 @@
#ifndef NO_PASSWORD
static OM_uint32
-krb5_gss_pname_to_uid(OM_uint32 *minor,
+KRB5_CALLCONV krb5_gss_pname_to_uid(OM_uint32 *minor,
const gss_name_t pname,
const gss_OID mech_type,
uid_t *uid)
@@ -779,7 +779,7 @@
#endif /* !NO_PASSWORD */
static OM_uint32
-krb5_gss_authorize_localname(OM_uint32 *minor,
+KRB5_CALLCONV krb5_gss_authorize_localname(OM_uint32 *minor,
const gss_name_t pname,
gss_const_buffer_t local_user,
gss_const_OID name_type)
Modified: trunk/src/lib/gssapi/krb5/iakerb.c
===================================================================
--- trunk/src/lib/gssapi/krb5/iakerb.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/iakerb.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -733,7 +733,7 @@
* handles. The heuristic is similar to SPNEGO's delete_sec_context.
*/
OM_uint32
-iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t output_token)
{
@@ -789,7 +789,7 @@
}
OM_uint32
-iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_cred_id_t verifier_cred_handle,
gss_buffer_t input_token,
@@ -879,7 +879,7 @@
}
OM_uint32
-iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+KRB5_CALLCONV iakerb_gss_init_sec_context(OM_uint32 *minor_status,
gss_cred_id_t claimant_cred_handle,
gss_ctx_id_t *context_handle,
gss_name_t target_name,
Modified: trunk/src/lib/gssapi/krb5/import_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/import_name.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/import_name.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -117,7 +117,7 @@
}
OM_uint32
-krb5_gss_import_name(minor_status, input_name_buffer,
+KRB5_CALLCONV krb5_gss_import_name(minor_status, input_name_buffer,
input_name_type, output_name)
OM_uint32 *minor_status;
gss_buffer_t input_name_buffer;
Modified: trunk/src/lib/gssapi/krb5/import_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/import_sec_context.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/import_sec_context.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -65,7 +65,7 @@
}
OM_uint32
-krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle)
+KRB5_CALLCONV krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle)
OM_uint32 *minor_status;
gss_buffer_t interprocess_token;
gss_ctx_id_t *context_handle;
Modified: trunk/src/lib/gssapi/krb5/indicate_mechs.c
===================================================================
--- trunk/src/lib/gssapi/krb5/indicate_mechs.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/indicate_mechs.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -29,7 +29,7 @@
#include "mglueP.h"
OM_uint32
-krb5_gss_indicate_mechs(minor_status, mech_set)
+KRB5_CALLCONV krb5_gss_indicate_mechs(minor_status, mech_set)
OM_uint32 *minor_status;
gss_OID_set *mech_set;
{
Modified: trunk/src/lib/gssapi/krb5/init_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/init_sec_context.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/init_sec_context.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -1097,7 +1097,7 @@
#endif
OM_uint32
-krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
+KRB5_CALLCONV krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
context_handle, target_name, mech_type,
req_flags, time_req, input_chan_bindings,
input_token, actual_mech_type, output_token,
Modified: trunk/src/lib/gssapi/krb5/inq_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/inq_context.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/inq_context.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -78,7 +78,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_inquire_context(minor_status, context_handle, initiator_name,
+KRB5_CALLCONV krb5_gss_inquire_context(minor_status, context_handle, initiator_name,
acceptor_name, lifetime_rec, mech_type, ret_flags,
locally_initiated, opened)
OM_uint32 *minor_status;
Modified: trunk/src/lib/gssapi/krb5/inq_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/inq_cred.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/inq_cred.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -73,7 +73,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
+KRB5_CALLCONV krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
cred_usage, mechanisms)
OM_uint32 *minor_status;
gss_cred_id_t cred_handle;
@@ -221,7 +221,7 @@
/* V2 interface */
OM_uint32
-krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
+KRB5_CALLCONV krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
mech_type, name, initiator_lifetime,
acceptor_lifetime, cred_usage)
OM_uint32 *minor_status;
Modified: trunk/src/lib/gssapi/krb5/inq_names.c
===================================================================
--- trunk/src/lib/gssapi/krb5/inq_names.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/inq_names.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -27,7 +27,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
+KRB5_CALLCONV krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
OM_uint32 *minor_status;
gss_OID mechanism;
gss_OID_set *name_types;
Modified: trunk/src/lib/gssapi/krb5/k5seal.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5seal.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/k5seal.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -388,7 +388,7 @@
}
OM_uint32
-krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+KRB5_CALLCONV krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
qop_req, input_message_buffer, conf_state,
output_message_buffer)
OM_uint32 *minor_status;
@@ -405,7 +405,7 @@
}
OM_uint32
-krb5_gss_get_mic(minor_status, context_handle, qop_req,
+KRB5_CALLCONV krb5_gss_get_mic(minor_status, context_handle, qop_req,
message_buffer, message_token)
OM_uint32 *minor_status;
gss_ctx_id_t context_handle;
Modified: trunk/src/lib/gssapi/krb5/k5sealiov.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5sealiov.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/k5sealiov.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -491,7 +491,7 @@
}
OM_uint32
-krb5_gss_wrap_iov(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_wrap_iov(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
gss_qop_t qop_req,
@@ -509,7 +509,7 @@
}
OM_uint32
-krb5_gss_wrap_iov_length(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_wrap_iov_length(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
gss_qop_t qop_req,
Modified: trunk/src/lib/gssapi/krb5/k5unseal.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5unseal.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/k5unseal.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -546,7 +546,7 @@
}
OM_uint32
-krb5_gss_unwrap(minor_status, context_handle,
+KRB5_CALLCONV krb5_gss_unwrap(minor_status, context_handle,
input_message_buffer, output_message_buffer,
conf_state, qop_state)
OM_uint32 *minor_status;
@@ -565,7 +565,7 @@
}
OM_uint32
-krb5_gss_verify_mic(minor_status, context_handle,
+KRB5_CALLCONV krb5_gss_verify_mic(minor_status, context_handle,
message_buffer, token_buffer,
qop_state)
OM_uint32 *minor_status;
Modified: trunk/src/lib/gssapi/krb5/k5unsealiov.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5unsealiov.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/k5unsealiov.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -641,7 +641,7 @@
}
OM_uint32
-krb5_gss_unwrap_iov(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_unwrap_iov(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int *conf_state,
gss_qop_t *qop_state,
Modified: trunk/src/lib/gssapi/krb5/naming_exts.c
===================================================================
--- trunk/src/lib/gssapi/krb5/naming_exts.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/naming_exts.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -251,7 +251,7 @@
}
OM_uint32
-krb5_gss_inquire_name(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_inquire_name(OM_uint32 *minor_status,
gss_name_t name,
int *name_is_MN,
gss_OID *MN_mech,
@@ -308,7 +308,7 @@
}
OM_uint32
-krb5_gss_get_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_get_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr,
int *authenticated,
@@ -392,7 +392,7 @@
}
OM_uint32
-krb5_gss_set_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_set_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
int complete,
gss_buffer_t attr,
@@ -450,7 +450,7 @@
}
OM_uint32
-krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr)
{
@@ -500,7 +500,7 @@
}
OM_uint32
-krb5_gss_map_name_to_any(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_map_name_to_any(OM_uint32 *minor_status,
gss_name_t name,
int authenticated,
gss_buffer_t type_id,
@@ -558,7 +558,7 @@
}
OM_uint32
-krb5_gss_release_any_name_mapping(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_release_any_name_mapping(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t type_id,
gss_any_t *input)
@@ -617,7 +617,7 @@
}
OM_uint32
-krb5_gss_export_name_composite(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_export_name_composite(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t exp_composite_name)
{
Modified: trunk/src/lib/gssapi/krb5/prf.c
===================================================================
--- trunk/src/lib/gssapi/krb5/prf.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/prf.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -34,7 +34,7 @@
#endif
OM_uint32
-krb5_gss_pseudo_random(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_pseudo_random(OM_uint32 *minor_status,
gss_ctx_id_t context,
int prf_key,
const gss_buffer_t prf_in,
Modified: trunk/src/lib/gssapi/krb5/process_context_token.c
===================================================================
--- trunk/src/lib/gssapi/krb5/process_context_token.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/process_context_token.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -28,7 +28,7 @@
*/
OM_uint32
-krb5_gss_process_context_token(minor_status, context_handle,
+KRB5_CALLCONV krb5_gss_process_context_token(minor_status, context_handle,
token_buffer)
OM_uint32 *minor_status;
gss_ctx_id_t context_handle;
Modified: trunk/src/lib/gssapi/krb5/rel_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/rel_cred.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/rel_cred.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -24,7 +24,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_release_cred(minor_status, cred_handle)
+KRB5_CALLCONV krb5_gss_release_cred(minor_status, cred_handle)
OM_uint32 *minor_status;
gss_cred_id_t *cred_handle;
{
Modified: trunk/src/lib/gssapi/krb5/rel_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/rel_name.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/rel_name.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -24,7 +24,7 @@
#include "gssapiP_krb5.h"
OM_uint32
-krb5_gss_release_name(minor_status, input_name)
+KRB5_CALLCONV krb5_gss_release_name(minor_status, input_name)
OM_uint32 *minor_status;
gss_name_t *input_name;
{
Modified: trunk/src/lib/gssapi/krb5/rel_oid.c
===================================================================
--- trunk/src/lib/gssapi/krb5/rel_oid.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/rel_oid.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -26,7 +26,7 @@
#include "gssapiP_krb5.h"
-OM_uint32 krb5_gss_internal_release_oid (OM_uint32 *, /* minor_status */
+OM_uint32 KRB5_CALLCONV krb5_gss_internal_release_oid (OM_uint32 *, /* minor_status */
gss_OID * /* oid */
);
@@ -56,7 +56,7 @@
}
OM_uint32
-krb5_gss_internal_release_oid(minor_status, oid)
+KRB5_CALLCONV krb5_gss_internal_release_oid(minor_status, oid)
OM_uint32 *minor_status;
gss_OID *oid;
{
Modified: trunk/src/lib/gssapi/krb5/s4u_gss_glue.c
===================================================================
--- trunk/src/lib/gssapi/krb5/s4u_gss_glue.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/s4u_gss_glue.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -105,7 +105,7 @@
/* The mechglue always passes null desired_mechs and actual_mechs. */
OM_uint32
-krb5_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status,
const gss_cred_id_t impersonator_cred_handle,
const gss_name_t desired_name,
OM_uint32 time_req,
Modified: trunk/src/lib/gssapi/krb5/store_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/store_cred.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/store_cred.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -131,7 +131,7 @@
}
OM_uint32
-krb5_gss_store_cred(OM_uint32 *minor_status,
+KRB5_CALLCONV krb5_gss_store_cred(OM_uint32 *minor_status,
gss_cred_id_t input_cred_handle,
gss_cred_usage_t cred_usage,
const gss_OID desired_mech,
Modified: trunk/src/lib/gssapi/krb5/wrap_size_limit.c
===================================================================
--- trunk/src/lib/gssapi/krb5/wrap_size_limit.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/krb5/wrap_size_limit.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -74,7 +74,7 @@
/* V2 interface */
OM_uint32
-krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
+KRB5_CALLCONV krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
qop_req, req_output_size, max_input_size)
OM_uint32 *minor_status;
gss_ctx_id_t context_handle;
Modified: trunk/src/lib/gssapi/mechglue/g_authorize_localname.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/g_authorize_localname.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/mechglue/g_authorize_localname.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -39,7 +39,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <mglueP.h>
#include <gssapi/gssapi.h>
@@ -154,7 +156,7 @@
return (status);
}
-OM_uint32
+OM_uint32 KRB5_CALLCONV
gss_authorize_localname(OM_uint32 *minor,
const gss_name_t name,
const gss_name_t user)
@@ -203,7 +205,7 @@
}
int
-gss_userok(const gss_name_t name,
+KRB5_CALLCONV gss_userok(const gss_name_t name,
const char *user)
{
OM_uint32 major, minor;
Modified: trunk/src/lib/gssapi/mechglue/g_decapsulate_token.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/g_decapsulate_token.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/mechglue/g_decapsulate_token.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -32,7 +32,7 @@
#include "mglueP.h"
-OM_uint32
+OM_uint32 KRB5_CALLCONV
gss_decapsulate_token(gss_const_buffer_t input_token,
gss_const_OID token_oid,
gss_buffer_t output_token)
Modified: trunk/src/lib/gssapi/mechglue/g_encapsulate_token.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/g_encapsulate_token.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/mechglue/g_encapsulate_token.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -32,7 +32,7 @@
#include "mglueP.h"
-OM_uint32
+OM_uint32 KRB5_CALLCONV
gss_encapsulate_token(gss_const_buffer_t input_token,
gss_const_OID token_oid,
gss_buffer_t output_token)
Modified: trunk/src/lib/gssapi/mechglue/g_oid_ops.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/g_oid_ops.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/mechglue/g_oid_ops.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -103,7 +103,7 @@
return generic_gss_copy_oid_set(minor_status, oidset, new_oidset);
}
-int
+int KRB5_CALLCONV
gss_oid_equal(
gss_const_OID first_oid,
gss_const_OID second_oid)
Modified: trunk/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/gssd_pname_to_uid.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/mechglue/gssd_pname_to_uid.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -130,7 +130,7 @@
return major;
}
-OM_uint32
+OM_uint32 KRB5_CALLCONV
gss_pname_to_uid(OM_uint32 *minor,
const gss_name_t pname,
const gss_OID mech_type,
Modified: trunk/src/lib/gssapi/mechglue/mglueP.h
===================================================================
--- trunk/src/lib/gssapi/mechglue/mglueP.h 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/mechglue/mglueP.h 2011-08-09 20:07:23 UTC (rev 25087)
@@ -76,7 +76,7 @@
gss_union_cred_auxinfo auxinfo;
} gss_union_cred_desc, *gss_union_cred_t;
-typedef OM_uint32 (*gss_acquire_cred_with_password_sfct)(
+typedef OM_uint32 (KRB5_CALLCONV *gss_acquire_cred_with_password_sfct)(
OM_uint32 *, /* minor_status */
const gss_name_t, /* desired_name */
const gss_buffer_t, /* password */
@@ -119,7 +119,7 @@
typedef struct gss_config {
gss_OID_desc mech_type;
void * context;
- OM_uint32 (*gss_acquire_cred)
+ OM_uint32 (KRB5_CALLCONV *gss_acquire_cred)
(
OM_uint32*, /* minor_status */
gss_name_t, /* desired_name */
@@ -130,12 +130,12 @@
gss_OID_set*, /* actual_mechs */
OM_uint32* /* time_rec */
);
- OM_uint32 (*gss_release_cred)
+ OM_uint32 (KRB5_CALLCONV *gss_release_cred)
(
OM_uint32*, /* minor_status */
gss_cred_id_t* /* cred_handle */
);
- OM_uint32 (*gss_init_sec_context)
+ OM_uint32 (KRB5_CALLCONV *gss_init_sec_context)
(
OM_uint32*, /* minor_status */
gss_cred_id_t, /* claimant_cred_handle */
@@ -151,7 +151,7 @@
OM_uint32*, /* ret_flags */
OM_uint32* /* time_rec */
);
- OM_uint32 (*gss_accept_sec_context)
+ OM_uint32 (KRB5_CALLCONV *gss_accept_sec_context)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t*, /* context_handle */
@@ -165,25 +165,25 @@
OM_uint32*, /* time_rec */
gss_cred_id_t* /* delegated_cred_handle */
);
- OM_uint32 (*gss_process_context_token)
+ OM_uint32 (KRB5_CALLCONV *gss_process_context_token)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
gss_buffer_t /* token_buffer */
);
- OM_uint32 (*gss_delete_sec_context)
+ OM_uint32 (KRB5_CALLCONV *gss_delete_sec_context)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t*, /* context_handle */
gss_buffer_t /* output_token */
);
- OM_uint32 (*gss_context_time)
+ OM_uint32 (KRB5_CALLCONV *gss_context_time)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
OM_uint32* /* time_rec */
);
- OM_uint32 (*gss_get_mic)
+ OM_uint32 (KRB5_CALLCONV *gss_get_mic)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -191,7 +191,7 @@
gss_buffer_t, /* message_buffer */
gss_buffer_t /* message_token */
);
- OM_uint32 (*gss_verify_mic)
+ OM_uint32 (KRB5_CALLCONV *gss_verify_mic)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -199,7 +199,7 @@
gss_buffer_t, /* token_buffer */
gss_qop_t* /* qop_state */
);
- OM_uint32 (*gss_wrap)
+ OM_uint32 (KRB5_CALLCONV *gss_wrap)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -209,7 +209,7 @@
int*, /* conf_state */
gss_buffer_t /* output_message_buffer */
);
- OM_uint32 (*gss_unwrap)
+ OM_uint32 (KRB5_CALLCONV *gss_unwrap)
(
OM_uint32*, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -218,7 +218,7 @@
int*, /* conf_state */
gss_qop_t* /* qop_state */
);
- OM_uint32 (*gss_display_status)
+ OM_uint32 (KRB5_CALLCONV *gss_display_status)
(
OM_uint32*, /* minor_status */
OM_uint32, /* status_value */
@@ -227,38 +227,38 @@
OM_uint32*, /* message_context */
gss_buffer_t /* status_string */
);
- OM_uint32 (*gss_indicate_mechs)
+ OM_uint32 (KRB5_CALLCONV *gss_indicate_mechs)
(
OM_uint32*, /* minor_status */
gss_OID_set* /* mech_set */
);
- OM_uint32 (*gss_compare_name)
+ OM_uint32 (KRB5_CALLCONV *gss_compare_name)
(
OM_uint32*, /* minor_status */
gss_name_t, /* name1 */
gss_name_t, /* name2 */
int* /* name_equal */
);
- OM_uint32 (*gss_display_name)
+ OM_uint32 (KRB5_CALLCONV *gss_display_name)
(
OM_uint32*, /* minor_status */
gss_name_t, /* input_name */
gss_buffer_t, /* output_name_buffer */
gss_OID* /* output_name_type */
);
- OM_uint32 (*gss_import_name)
+ OM_uint32 (KRB5_CALLCONV *gss_import_name)
(
OM_uint32*, /* minor_status */
gss_buffer_t, /* input_name_buffer */
gss_OID, /* input_name_type */
gss_name_t* /* output_name */
);
- OM_uint32 (*gss_release_name)
+ OM_uint32 (KRB5_CALLCONV *gss_release_name)
(
OM_uint32*, /* minor_status */
gss_name_t* /* input_name */
);
- OM_uint32 (*gss_inquire_cred)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_cred)
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* cred_handle */
@@ -267,7 +267,7 @@
int *, /* cred_usage */
gss_OID_set * /* mechanisms */
);
- OM_uint32 (*gss_add_cred)
+ OM_uint32 (KRB5_CALLCONV *gss_add_cred)
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* input_cred_handle */
@@ -281,19 +281,19 @@
OM_uint32 *, /* initiator_time_rec */
OM_uint32 * /* acceptor_time_rec */
);
- OM_uint32 (*gss_export_sec_context)
+ OM_uint32 (KRB5_CALLCONV *gss_export_sec_context)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t *, /* context_handle */
gss_buffer_t /* interprocess_token */
);
- OM_uint32 (*gss_import_sec_context)
+ OM_uint32 (KRB5_CALLCONV *gss_import_sec_context)
(
OM_uint32 *, /* minor_status */
gss_buffer_t, /* interprocess_token */
gss_ctx_id_t * /* context_handle */
);
- OM_uint32 (*gss_inquire_cred_by_mech)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_cred_by_mech)
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* cred_handle */
@@ -303,13 +303,13 @@
OM_uint32 *, /* acceptor_lifetime */
gss_cred_usage_t * /* cred_usage */
);
- OM_uint32 (*gss_inquire_names_for_mech)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_names_for_mech)
(
OM_uint32 *, /* minor_status */
gss_OID, /* mechanism */
gss_OID_set * /* name_types */
);
- OM_uint32 (*gss_inquire_context)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_context)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -321,12 +321,12 @@
int *, /* locally_initiated */
int * /* open */
);
- OM_uint32 (*gss_internal_release_oid)
+ OM_uint32 (KRB5_CALLCONV *gss_internal_release_oid)
(
OM_uint32 *, /* minor_status */
gss_OID * /* OID */
);
- OM_uint32 (*gss_wrap_size_limit)
+ OM_uint32 (KRB5_CALLCONV *gss_wrap_size_limit)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -335,33 +335,33 @@
OM_uint32, /* req_output_size */
OM_uint32 * /* max_input_size */
);
- OM_uint32 (*gss_pname_to_uid)
+ OM_uint32 (KRB5_CALLCONV *gss_pname_to_uid)
(
OM_uint32 *, /* minor */
const gss_name_t, /* name */
const gss_OID, /* mech_type */
uid_t * /* uid */
);
- OM_uint32 (*gssspi_authorize_localname)
+ OM_uint32 (KRB5_CALLCONV *gssspi_authorize_localname)
(
OM_uint32 *, /* minor_status */
const gss_name_t, /* pname */
gss_const_buffer_t, /* local user */
gss_const_OID /* local nametype */
/* */);
- OM_uint32 (*gss_export_name)
+ OM_uint32 (KRB5_CALLCONV *gss_export_name)
(
OM_uint32 *, /* minor_status */
const gss_name_t, /* input_name */
gss_buffer_t /* exported_name */
/* */);
- OM_uint32 (*gss_duplicate_name)
+ OM_uint32 (KRB5_CALLCONV *gss_duplicate_name)
(
OM_uint32*, /* minor_status */
const gss_name_t, /* input_name */
gss_name_t * /* output_name */
/* */);
- OM_uint32 (*gss_store_cred)
+ OM_uint32 (KRB5_CALLCONV *gss_store_cred)
(
OM_uint32 *, /* minor_status */
const gss_cred_id_t, /* input_cred */
@@ -376,35 +376,35 @@
/* GGF extensions */
- OM_uint32 (*gss_inquire_sec_context_by_oid)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_sec_context_by_oid)
(
OM_uint32 *, /* minor_status */
const gss_ctx_id_t, /* context_handle */
const gss_OID, /* OID */
gss_buffer_set_t * /* data_set */
);
- OM_uint32 (*gss_inquire_cred_by_oid)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_cred_by_oid)
(
OM_uint32 *, /* minor_status */
const gss_cred_id_t, /* cred_handle */
const gss_OID, /* OID */
gss_buffer_set_t * /* data_set */
);
- OM_uint32 (*gss_set_sec_context_option)
+ OM_uint32 (KRB5_CALLCONV *gss_set_sec_context_option)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t *, /* context_handle */
const gss_OID, /* OID */
const gss_buffer_t /* value */
);
- OM_uint32 (*gssspi_set_cred_option)
+ OM_uint32 (KRB5_CALLCONV *gssspi_set_cred_option)
(
OM_uint32 *, /* minor_status */
gss_cred_id_t *, /* cred_handle */
const gss_OID, /* OID */
const gss_buffer_t /* value */
);
- OM_uint32 (*gssspi_mech_invoke)
+ OM_uint32 (KRB5_CALLCONV *gssspi_mech_invoke)
(
OM_uint32*, /* minor_status */
const gss_OID, /* mech OID */
@@ -413,7 +413,7 @@
);
/* AEAD extensions */
- OM_uint32 (*gss_wrap_aead)
+ OM_uint32 (KRB5_CALLCONV *gss_wrap_aead)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -425,7 +425,7 @@
gss_buffer_t /* output_message_buffer */
/* */);
- OM_uint32 (*gss_unwrap_aead)
+ OM_uint32 (KRB5_CALLCONV *gss_unwrap_aead)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -437,7 +437,7 @@
/* */);
/* SSPI extensions */
- OM_uint32 (*gss_wrap_iov)
+ OM_uint32 (KRB5_CALLCONV *gss_wrap_iov)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -448,7 +448,7 @@
int /* iov_count */
/* */);
- OM_uint32 (*gss_unwrap_iov)
+ OM_uint32 (KRB5_CALLCONV *gss_unwrap_iov)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -458,7 +458,7 @@
int /* iov_count */
/* */);
- OM_uint32 (*gss_wrap_iov_length)
+ OM_uint32 (KRB5_CALLCONV *gss_wrap_iov_length)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
@@ -469,7 +469,7 @@
int /* iov_count */
/* */);
- OM_uint32 (*gss_complete_auth_token)
+ OM_uint32 (KRB5_CALLCONV *gss_complete_auth_token)
(
OM_uint32*, /* minor_status */
const gss_ctx_id_t, /* context_handle */
@@ -478,7 +478,7 @@
/* New for 1.8 */
- OM_uint32 (*gss_acquire_cred_impersonate_name)
+ OM_uint32 (KRB5_CALLCONV *gss_acquire_cred_impersonate_name)
(
OM_uint32 *, /* minor_status */
const gss_cred_id_t, /* impersonator_cred_handle */
@@ -491,7 +491,7 @@
OM_uint32 * /* time_rec */
/* */);
- OM_uint32 (*gss_add_cred_impersonate_name)
+ OM_uint32 (KRB5_CALLCONV *gss_add_cred_impersonate_name)
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* input_cred_handle */
@@ -507,7 +507,7 @@
OM_uint32 * /* acceptor_time_rec */
/* */);
- OM_uint32 (*gss_display_name_ext)
+ OM_uint32 (KRB5_CALLCONV *gss_display_name_ext)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
@@ -515,7 +515,7 @@
gss_buffer_t /* display_name */
/* */);
- OM_uint32 (*gss_inquire_name)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_name)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
@@ -524,7 +524,7 @@
gss_buffer_set_t * /* attrs */
/* */);
- OM_uint32 (*gss_get_name_attribute)
+ OM_uint32 (KRB5_CALLCONV *gss_get_name_attribute)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
@@ -536,7 +536,7 @@
int * /* more */
/* */);
- OM_uint32 (*gss_set_name_attribute)
+ OM_uint32 (KRB5_CALLCONV *gss_set_name_attribute)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
@@ -545,21 +545,21 @@
gss_buffer_t /* value */
/* */);
- OM_uint32 (*gss_delete_name_attribute)
+ OM_uint32 (KRB5_CALLCONV *gss_delete_name_attribute)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
gss_buffer_t /* attr */
/* */);
- OM_uint32 (*gss_export_name_composite)
+ OM_uint32 (KRB5_CALLCONV *gss_export_name_composite)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
gss_buffer_t /* exp_composite_name */
/* */);
- OM_uint32 (*gss_map_name_to_any)
+ OM_uint32 (KRB5_CALLCONV *gss_map_name_to_any)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
@@ -568,7 +568,7 @@
gss_any_t * /* output */
/* */);
- OM_uint32 (*gss_release_any_name_mapping)
+ OM_uint32 (KRB5_CALLCONV *gss_release_any_name_mapping)
(
OM_uint32 *, /* minor_status */
gss_name_t, /* name */
@@ -576,7 +576,7 @@
gss_any_t * /* input */
/* */);
- OM_uint32 (*gss_pseudo_random)
+ OM_uint32 (KRB5_CALLCONV *gss_pseudo_random)
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context */
@@ -586,14 +586,14 @@
gss_buffer_t /* prf_out */
/* */);
- OM_uint32 (*gss_set_neg_mechs)
+ OM_uint32 (KRB5_CALLCONV *gss_set_neg_mechs)
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* cred_handle */
const gss_OID_set /* mech_set */
/* */);
- OM_uint32 (*gss_inquire_saslname_for_mech)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_saslname_for_mech)
(
OM_uint32 *, /* minor_status */
const gss_OID, /* desired_mech */
@@ -602,14 +602,14 @@
gss_buffer_t /* mech_description */
/* */);
- OM_uint32 (*gss_inquire_mech_for_saslname)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_mech_for_saslname)
(
OM_uint32 *, /* minor_status */
const gss_buffer_t, /* sasl_mech_name */
gss_OID * /* mech_type */
/* */);
- OM_uint32 (*gss_inquire_attrs_for_mech)
+ OM_uint32 (KRB5_CALLCONV *gss_inquire_attrs_for_mech)
(
OM_uint32 *, /* minor_status */
gss_const_OID, /* mech */
Modified: trunk/src/lib/gssapi/spnego/gssapiP_spnego.h
===================================================================
--- trunk/src/lib/gssapi/spnego/gssapiP_spnego.h 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/spnego/gssapiP_spnego.h 2011-08-09 20:07:23 UTC (rev 25087)
@@ -127,7 +127,7 @@
* declarations of internal name mechanism functions
*/
-OM_uint32 spnego_gss_acquire_cred
+OM_uint32 KRB5_CALLCONV spnego_gss_acquire_cred
(
OM_uint32 *, /* minor_status */
gss_name_t, /* desired_name */
@@ -139,14 +139,14 @@
OM_uint32 * /* time_rec */
);
-OM_uint32 spnego_gss_release_cred
+OM_uint32 KRB5_CALLCONV spnego_gss_release_cred
(
OM_uint32 *, /* minor_status */
/* CSTYLED */
gss_cred_id_t * /* cred_handle */
);
-OM_uint32 spnego_gss_init_sec_context
+OM_uint32 KRB5_CALLCONV spnego_gss_init_sec_context
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* claimant_cred_handle */
@@ -164,7 +164,7 @@
);
#ifndef LEAN_CLIENT
-OM_uint32 spnego_gss_accept_sec_context
+OM_uint32 KRB5_CALLCONV spnego_gss_accept_sec_context
(
OM_uint32 *, /* minor_status */
gss_ctx_id_t *, /* context_handle */
@@ -181,7 +181,7 @@
);
#endif /* LEAN_CLIENT */
-OM_uint32 spnego_gss_compare_name
+OM_uint32 KRB5_CALLCONV spnego_gss_compare_name
(
OM_uint32 *, /* minor_status */
const gss_name_t, /* name1 */
@@ -189,7 +189,7 @@
int * /* name_equal */
);
-OM_uint32 spnego_gss_display_name
+OM_uint32 KRB5_CALLCONV spnego_gss_display_name
(
OM_uint32 *, /* minor_status */
gss_name_t, /* input_name */
@@ -197,7 +197,7 @@
gss_OID * /* output_name_type */
);
-OM_uint32 spnego_gss_display_status
+OM_uint32 KRB5_CALLCONV spnego_gss_display_status
(
OM_uint32 *, /* minor_status */
OM_uint32, /* status_value */
@@ -207,7 +207,7 @@
gss_buffer_t /* status_string */
);
-OM_uint32 spnego_gss_import_name
+OM_uint32 KRB5_CALLCONV spnego_gss_import_name
(
OM_uint32 *, /* minor_status */
gss_buffer_t, /* input_name_buffer */
@@ -216,14 +216,14 @@
gss_name_t * /* output_name */
);
-OM_uint32 spnego_gss_release_name
+OM_uint32 KRB5_CALLCONV spnego_gss_release_name
(
OM_uint32 *, /* minor_status */
/* CSTYLED */
gss_name_t * /* input_name */
);
-OM_uint32 spnego_gss_duplicate_name
+OM_uint32 KRB5_CALLCONV spnego_gss_duplicate_name
(
OM_uint32 *, /* minor_status */
/* CSTYLED */
@@ -231,7 +231,7 @@
gss_name_t * /* output_name */
);
-OM_uint32 spnego_gss_inquire_cred
+OM_uint32 KRB5_CALLCONV spnego_gss_inquire_cred
(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* cred_handle */
@@ -241,14 +241,14 @@
gss_OID_set * /* mechanisms */
);
-OM_uint32 spnego_gss_inquire_names_for_mech
+OM_uint32 KRB5_CALLCONV spnego_gss_inquire_names_for_mech
(
OM_uint32 *, /* minor_status */
gss_OID, /* mechanism */
gss_OID_set * /* name_types */
);
-OM_uint32 spnego_gss_unwrap
+OM_uint32 KRB5_CALLCONV spnego_gss_unwrap
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -258,7 +258,7 @@
gss_qop_t *qop_state
);
-OM_uint32 spnego_gss_wrap
+OM_uint32 KRB5_CALLCONV spnego_gss_wrap
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -269,35 +269,35 @@
gss_buffer_t output_message_buffer
);
-OM_uint32 spnego_gss_process_context_token
+OM_uint32 KRB5_CALLCONV spnego_gss_process_context_token
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
const gss_buffer_t token_buffer
);
-OM_uint32 spnego_gss_delete_sec_context
+OM_uint32 KRB5_CALLCONV spnego_gss_delete_sec_context
(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t output_token
);
-OM_uint32 spnego_gss_context_time
+OM_uint32 KRB5_CALLCONV spnego_gss_context_time
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
OM_uint32 *time_rec
);
#ifndef LEAN_CLIENT
-OM_uint32 spnego_gss_export_sec_context
+OM_uint32 KRB5_CALLCONV spnego_gss_export_sec_context
(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t interprocess_token
);
-OM_uint32 spnego_gss_import_sec_context
+OM_uint32 KRB5_CALLCONV spnego_gss_import_sec_context
(
OM_uint32 *minor_status,
const gss_buffer_t interprocess_token,
@@ -305,7 +305,7 @@
);
#endif /* LEAN_CLIENT */
-OM_uint32 spnego_gss_inquire_context
+OM_uint32 KRB5_CALLCONV spnego_gss_inquire_context
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -318,7 +318,7 @@
int *opened
);
-OM_uint32 spnego_gss_wrap_size_limit
+OM_uint32 KRB5_CALLCONV spnego_gss_wrap_size_limit
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -328,7 +328,7 @@
OM_uint32 *max_input_size
);
-OM_uint32 spnego_gss_get_mic
+OM_uint32 KRB5_CALLCONV spnego_gss_get_mic
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -337,7 +337,7 @@
gss_buffer_t message_token
);
-OM_uint32 spnego_gss_verify_mic
+OM_uint32 KRB5_CALLCONV spnego_gss_verify_mic
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -347,7 +347,7 @@
);
OM_uint32
-spnego_gss_inquire_sec_context_by_oid
+KRB5_CALLCONV spnego_gss_inquire_sec_context_by_oid
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -356,7 +356,7 @@
);
OM_uint32
-spnego_gss_inquire_cred_by_oid
+KRB5_CALLCONV spnego_gss_inquire_cred_by_oid
(
OM_uint32 *minor_status,
const gss_cred_id_t cred_handle,
@@ -365,7 +365,7 @@
);
OM_uint32
-spnego_gss_set_cred_option
+KRB5_CALLCONV spnego_gss_set_cred_option
(
OM_uint32 *minor_status,
gss_cred_id_t *cred_handle,
@@ -374,7 +374,7 @@
);
OM_uint32
-spnego_gss_set_sec_context_option
+KRB5_CALLCONV spnego_gss_set_sec_context_option
(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
@@ -389,7 +389,7 @@
gss_mechanism KRB5_CALLCONV gss_mech_initialize(void);
#endif /* _GSS_STATIC_LINK */
-OM_uint32 spnego_gss_wrap_aead
+OM_uint32 KRB5_CALLCONV spnego_gss_wrap_aead
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -401,7 +401,7 @@
gss_buffer_t output_message_buffer
);
-OM_uint32 spnego_gss_unwrap_aead
+OM_uint32 KRB5_CALLCONV spnego_gss_unwrap_aead
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -412,7 +412,7 @@
gss_qop_t *qop_state
);
-OM_uint32 spnego_gss_wrap_iov
+OM_uint32 KRB5_CALLCONV spnego_gss_wrap_iov
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -423,7 +423,7 @@
int iov_count
);
-OM_uint32 spnego_gss_unwrap_iov
+OM_uint32 KRB5_CALLCONV spnego_gss_unwrap_iov
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -433,7 +433,7 @@
int iov_count
);
-OM_uint32 spnego_gss_wrap_iov_length
+OM_uint32 KRB5_CALLCONV spnego_gss_wrap_iov_length
(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
@@ -445,7 +445,7 @@
);
OM_uint32
-spnego_gss_complete_auth_token
+KRB5_CALLCONV spnego_gss_complete_auth_token
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -453,7 +453,7 @@
);
OM_uint32
-spnego_gss_acquire_cred_impersonate_name(
+KRB5_CALLCONV spnego_gss_acquire_cred_impersonate_name(
OM_uint32 *, /* minor_status */
const gss_cred_id_t, /* impersonator_cred_handle */
const gss_name_t, /* desired_name */
@@ -465,7 +465,7 @@
OM_uint32 *); /* time_rec */
OM_uint32
-spnego_gss_acquire_cred_with_password(
+KRB5_CALLCONV spnego_gss_acquire_cred_with_password(
OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
@@ -477,7 +477,7 @@
OM_uint32 *time_rec);
OM_uint32
-spnego_gss_display_name_ext
+KRB5_CALLCONV spnego_gss_display_name_ext
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -486,7 +486,7 @@
);
OM_uint32
-spnego_gss_inquire_name
+KRB5_CALLCONV spnego_gss_inquire_name
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -496,7 +496,7 @@
);
OM_uint32
-spnego_gss_get_name_attribute
+KRB5_CALLCONV spnego_gss_get_name_attribute
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -509,7 +509,7 @@
);
OM_uint32
-spnego_gss_set_name_attribute
+KRB5_CALLCONV spnego_gss_set_name_attribute
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -519,7 +519,7 @@
);
OM_uint32
-spnego_gss_delete_name_attribute
+KRB5_CALLCONV spnego_gss_delete_name_attribute
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -527,7 +527,7 @@
);
OM_uint32
-spnego_gss_export_name_composite
+KRB5_CALLCONV spnego_gss_export_name_composite
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -535,7 +535,7 @@
);
OM_uint32
-spnego_gss_map_name_to_any
+KRB5_CALLCONV spnego_gss_map_name_to_any
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -545,7 +545,7 @@
);
OM_uint32
-spnego_gss_release_any_name_mapping
+KRB5_CALLCONV spnego_gss_release_any_name_mapping
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -554,7 +554,7 @@
);
OM_uint32
-spnego_gss_pseudo_random
+KRB5_CALLCONV spnego_gss_pseudo_random
(
OM_uint32 *minor_status,
gss_ctx_id_t context,
@@ -565,7 +565,7 @@
);
OM_uint32
-spnego_gss_set_neg_mechs
+KRB5_CALLCONV spnego_gss_set_neg_mechs
(
OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
@@ -573,7 +573,7 @@
);
OM_uint32
-spnego_gss_inquire_mech_for_saslname
+KRB5_CALLCONV spnego_gss_inquire_mech_for_saslname
(
OM_uint32 *minor_status,
const gss_buffer_t sasl_mech_name,
@@ -581,7 +581,7 @@
);
OM_uint32
-spnego_gss_inquire_saslname_for_mech
+KRB5_CALLCONV spnego_gss_inquire_saslname_for_mech
(
OM_uint32 *minor_status,
const gss_OID desired_mech,
@@ -591,7 +591,7 @@
);
OM_uint32
-spnego_gss_inquire_attrs_for_mech
+KRB5_CALLCONV spnego_gss_inquire_attrs_for_mech
(
OM_uint32 *minor_status,
gss_const_OID mech,
Modified: trunk/src/lib/gssapi/spnego/spnego_mech.c
===================================================================
--- trunk/src/lib/gssapi/spnego/spnego_mech.c 2011-08-09 20:07:16 UTC (rev 25086)
+++ trunk/src/lib/gssapi/spnego/spnego_mech.c 2011-08-09 20:07:23 UTC (rev 25087)
@@ -323,7 +323,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_acquire_cred(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_acquire_cred(OM_uint32 *minor_status,
gss_name_t desired_name,
OM_uint32 time_req,
gss_OID_set desired_mechs,
@@ -394,7 +394,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_release_cred(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_release_cred(OM_uint32 *minor_status,
gss_cred_id_t *cred_handle)
{
spnego_gss_cred_id_t spcred = NULL;
@@ -888,7 +888,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_init_sec_context(
+KRB5_CALLCONV spnego_gss_init_sec_context(
OM_uint32 *minor_status,
gss_cred_id_t claimant_cred_handle,
gss_ctx_id_t *context_handle,
@@ -1584,7 +1584,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_accept_sec_context(
+KRB5_CALLCONV spnego_gss_accept_sec_context(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_cred_id_t verifier_cred_handle,
@@ -1778,7 +1778,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_display_status(
+KRB5_CALLCONV spnego_gss_display_status(
OM_uint32 *minor_status,
OM_uint32 status_value,
int status_type,
@@ -1828,7 +1828,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_import_name(
+KRB5_CALLCONV spnego_gss_import_name(
OM_uint32 *minor_status,
gss_buffer_t input_name_buffer,
gss_OID input_name_type,
@@ -1847,7 +1847,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_release_name(
+KRB5_CALLCONV spnego_gss_release_name(
OM_uint32 *minor_status,
gss_name_t *input_name)
{
@@ -1863,7 +1863,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_duplicate_name(
+KRB5_CALLCONV spnego_gss_duplicate_name(
OM_uint32 *minor_status,
const gss_name_t input_name,
gss_name_t *output_name)
@@ -1879,7 +1879,7 @@
}
OM_uint32
-spnego_gss_inquire_cred(
+KRB5_CALLCONV spnego_gss_inquire_cred(
OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
gss_name_t *name,
@@ -1952,7 +1952,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_compare_name(
+KRB5_CALLCONV spnego_gss_compare_name(
OM_uint32 *minor_status,
const gss_name_t name1,
const gss_name_t name2,
@@ -1970,7 +1970,7 @@
/*ARGSUSED*/
/*ARGSUSED*/
OM_uint32
-spnego_gss_display_name(
+KRB5_CALLCONV spnego_gss_display_name(
OM_uint32 *minor_status,
gss_name_t input_name,
gss_buffer_t output_name_buffer,
@@ -1989,7 +1989,7 @@
/*ARGSUSED*/
OM_uint32
-spnego_gss_inquire_names_for_mech(
+KRB5_CALLCONV spnego_gss_inquire_names_for_mech(
OM_uint32 *minor_status,
gss_OID mechanism,
gss_OID_set *name_types)
@@ -2032,7 +2032,7 @@
}
OM_uint32
-spnego_gss_unwrap(
+KRB5_CALLCONV spnego_gss_unwrap(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer,
@@ -2052,7 +2052,7 @@
}
OM_uint32
-spnego_gss_wrap(
+KRB5_CALLCONV spnego_gss_wrap(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
@@ -2074,7 +2074,7 @@
}
OM_uint32
-spnego_gss_process_context_token(
+KRB5_CALLCONV spnego_gss_process_context_token(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
const gss_buffer_t token_buffer)
@@ -2088,7 +2088,7 @@
}
OM_uint32
-spnego_gss_delete_sec_context(
+KRB5_CALLCONV spnego_gss_delete_sec_context(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t output_token)
@@ -2123,7 +2123,7 @@
}
OM_uint32
-spnego_gss_context_time(
+KRB5_CALLCONV spnego_gss_context_time(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
OM_uint32 *time_rec)
@@ -2136,7 +2136,7 @@
}
#ifndef LEAN_CLIENT
OM_uint32
-spnego_gss_export_sec_context(
+KRB5_CALLCONV spnego_gss_export_sec_context(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t interprocess_token)
@@ -2149,7 +2149,7 @@
}
OM_uint32
-spnego_gss_import_sec_context(
+KRB5_CALLCONV spnego_gss_import_sec_context(
OM_uint32 *minor_status,
const gss_buffer_t interprocess_token,
gss_ctx_id_t *context_handle)
@@ -2163,7 +2163,7 @@
#endif /* LEAN_CLIENT */
OM_uint32
-spnego_gss_inquire_context(
+KRB5_CALLCONV spnego_gss_inquire_context(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_name_t *src_name,
@@ -2190,7 +2190,7 @@
}
OM_uint32
-spnego_gss_wrap_size_limit(
+KRB5_CALLCONV spnego_gss_wrap_size_limit(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
int conf_req_flag,
@@ -2209,7 +2209,7 @@
}
OM_uint32
-spnego_gss_get_mic(
+KRB5_CALLCONV spnego_gss_get_mic(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_qop_t qop_req,
@@ -2226,7 +2226,7 @@
}
OM_uint32
-spnego_gss_verify_mic(
+KRB5_CALLCONV spnego_gss_verify_mic(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
const gss_buffer_t msg_buffer,
@@ -2243,7 +2243,7 @@
}
OM_uint32
-spnego_gss_inquire_sec_context_by_oid(
+KRB5_CALLCONV spnego_gss_inquire_sec_context_by_oid(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
const gss_OID desired_object,
@@ -2258,7 +2258,7 @@
}
OM_uint32
-spnego_gss_inquire_cred_by_oid(
+KRB5_CALLCONV spnego_gss_inquire_cred_by_oid(
OM_uint32 *minor_status,
const gss_cred_id_t cred_handle,
const gss_OID desired_object,
@@ -2276,7 +2276,7 @@
}
OM_uint32
-spnego_gss_set_cred_option(
+KRB5_CALLCONV spnego_gss_set_cred_option(
OM_uint32 *minor_status,
gss_cred_id_t *cred_handle,
const gss_OID desired_object,
@@ -2313,7 +2313,7 @@
}
OM_uint32
-spnego_gss_set_sec_context_option(
+KRB5_CALLCONV spnego_gss_set_sec_context_option(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
const gss_OID desired_object,
@@ -2328,7 +2328,7 @@
}
OM_uint32
-spnego_gss_wrap_aead(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_wrap_aead(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
gss_qop_t qop_req,
@@ -2351,7 +2351,7 @@
}
OM_uint32
-spnego_gss_unwrap_aead(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_unwrap_aead(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer,
gss_buffer_t input_assoc_buffer,
@@ -2371,7 +2371,7 @@
}
OM_uint32
-spnego_gss_wrap_iov(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_wrap_iov(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
gss_qop_t qop_req,
@@ -2391,7 +2391,7 @@
}
OM_uint32
-spnego_gss_unwrap_iov(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_unwrap_iov(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int *conf_state,
gss_qop_t *qop_state,
@@ -2409,7 +2409,7 @@
}
OM_uint32
-spnego_gss_wrap_iov_length(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_wrap_iov_length(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
gss_qop_t qop_req,
@@ -2430,7 +2430,7 @@
OM_uint32
-spnego_gss_complete_auth_token(
+KRB5_CALLCONV spnego_gss_complete_auth_token(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer)
@@ -2443,7 +2443,7 @@
}
OM_uint32
-spnego_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status,
const gss_cred_id_t impersonator_cred_handle,
const gss_name_t desired_name,
OM_uint32 time_req,
@@ -2503,7 +2503,7 @@
}
OM_uint32
-spnego_gss_acquire_cred_with_password(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_acquire_cred_with_password(OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
OM_uint32 time_req,
@@ -2561,7 +2561,7 @@
}
OM_uint32
-spnego_gss_display_name_ext(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_display_name_ext(OM_uint32 *minor_status,
gss_name_t name,
gss_OID display_as_name_type,
gss_buffer_t display_name)
@@ -2576,7 +2576,7 @@
OM_uint32
-spnego_gss_inquire_name(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_inquire_name(OM_uint32 *minor_status,
gss_name_t name,
int *name_is_MN,
gss_OID *MN_mech,
@@ -2592,7 +2592,7 @@
}
OM_uint32
-spnego_gss_get_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_get_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr,
int *authenticated,
@@ -2614,7 +2614,7 @@
}
OM_uint32
-spnego_gss_set_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_set_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
int complete,
gss_buffer_t attr,
@@ -2630,7 +2630,7 @@
}
OM_uint32
-spnego_gss_delete_name_attribute(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_delete_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr)
{
@@ -2642,7 +2642,7 @@
}
OM_uint32
-spnego_gss_export_name_composite(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_export_name_composite(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t exp_composite_name)
{
@@ -2654,7 +2654,7 @@
}
OM_uint32
-spnego_gss_map_name_to_any(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_map_name_to_any(OM_uint32 *minor_status,
gss_name_t name,
int authenticated,
gss_buffer_t type_id,
@@ -2670,7 +2670,7 @@
}
OM_uint32
-spnego_gss_release_any_name_mapping(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_release_any_name_mapping(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t type_id,
gss_any_t *input)
@@ -2684,7 +2684,7 @@
}
OM_uint32
-spnego_gss_pseudo_random(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_pseudo_random(OM_uint32 *minor_status,
gss_ctx_id_t context,
int prf_key,
const gss_buffer_t prf_in,
@@ -2702,7 +2702,7 @@
}
OM_uint32
-spnego_gss_set_neg_mechs(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_set_neg_mechs(OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
const gss_OID_set mech_list)
{
@@ -2720,7 +2720,7 @@
#define SPNEGO_SASL_NAME_LEN (sizeof(SPNEGO_SASL_NAME) - 1)
OM_uint32
-spnego_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
const gss_buffer_t sasl_mech_name,
gss_OID *mech_type)
{
@@ -2736,7 +2736,7 @@
}
OM_uint32
-spnego_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
const gss_OID desired_mech,
gss_buffer_t sasl_mech_name,
gss_buffer_t mech_name,
@@ -2761,7 +2761,7 @@
}
OM_uint32
-spnego_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
+KRB5_CALLCONV spnego_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
gss_const_OID mech,
gss_OID_set *mech_attrs,
gss_OID_set *known_mech_attrs)
More information about the cvs-krb5
mailing list