svn rev #25116: trunk/src/lib/gssapi/ krb5/ mechglue/ spnego/
ghudson@MIT.EDU
ghudson at MIT.EDU
Mon Aug 29 13:20:37 EDT 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=25116
Commit By: ghudson
Log Message:
Fix style issues in r25087.
* Function names should be at the beginning of lines in definitions.
* Changes should not create lines >79 characters.
* Continuation lines should align after left parens when appropriate.
Also, krb5_gss_accept_sec_context_ext and acquire_accept_cred are
not gss mechanism functions and should not have been tagged.
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
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/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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/accept_sec_context.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -1296,7 +1296,7 @@
#endif /* LEAN_CLIENT */
OM_uint32
-KRB5_CALLCONV krb5_gss_accept_sec_context_ext(
+krb5_gss_accept_sec_context_ext(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_cred_id_t verifier_cred_handle,
@@ -1339,8 +1339,8 @@
delegated_cred_handle, exts);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_accept_sec_context(minor_status, context_handle,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/acquire_cred.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -186,7 +186,7 @@
*/
static OM_uint32
-KRB5_CALLCONV acquire_accept_cred(krb5_context context,
+acquire_accept_cred(krb5_context context,
OM_uint32 *minor_status,
krb5_gss_name_t desired_name,
krb5_keytab req_keytab,
@@ -726,8 +726,8 @@
* desired_mechs and actual_mechs, so we ignore those parameters.
*/
-OM_uint32
-KRB5_CALLCONV krb5_gss_acquire_cred(minor_status, desired_name, time_req,
+OM_uint32 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;
@@ -751,8 +751,8 @@
return acquire_cred(minor_status, &args, output_cred_handle, time_rec);
}
-OM_uint32
-KRB5_CALLCONV iakerb_gss_acquire_cred(minor_status, desired_name, time_req,
+OM_uint32 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;
@@ -776,8 +776,8 @@
return acquire_cred(minor_status, &args, output_cred_handle, time_rec);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_acquire_cred_with_password(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -800,8 +800,8 @@
return acquire_cred(minor_status, &args, output_cred_handle, time_rec);
}
-OM_uint32
-KRB5_CALLCONV iakerb_gss_acquire_cred_with_password(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/compare_name.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -27,8 +27,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_compare_name(minor_status, name1, name2, name_equal)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/context_time.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -27,8 +27,8 @@
* $Id$
*/
-OM_uint32
-KRB5_CALLCONV krb5_gss_context_time(minor_status, context_handle, time_rec)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/delete_sec_context.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -27,8 +27,8 @@
* $Id$
*/
-OM_uint32
-KRB5_CALLCONV krb5_gss_delete_sec_context(minor_status, context_handle, output_token)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/disp_name.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -23,8 +23,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_display_name(minor_status, input_name, output_name_buffer,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/disp_status.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -153,8 +153,8 @@
/**/
-OM_uint32
-KRB5_CALLCONV krb5_gss_display_status(minor_status, status_value, status_type,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/duplicate_name.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -26,9 +26,9 @@
#include "gssapiP_krb5.h"
-OM_uint32 KRB5_CALLCONV krb5_gss_duplicate_name(OM_uint32 *minor_status,
- const gss_name_t input_name,
- gss_name_t *dest_name)
+OM_uint32 KRB5_CALLCONV
+krb5_gss_duplicate_name(OM_uint32 *minor_status, const gss_name_t input_name,
+ gss_name_t *dest_name)
{
krb5_context context;
krb5_error_code code;
Modified: trunk/src/lib/gssapi/krb5/export_name.c
===================================================================
--- trunk/src/lib/gssapi/krb5/export_name.c 2011-08-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/export_name.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -26,9 +26,9 @@
#include "gssapiP_krb5.h"
-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_CALLCONV
+krb5_gss_export_name(OM_uint32 *minor_status, const gss_name_t input_name,
+ gss_buffer_t exported_name)
{
krb5_context context;
krb5_error_code code;
Modified: trunk/src/lib/gssapi/krb5/export_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/export_sec_context.c 2011-08-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/export_sec_context.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -26,8 +26,8 @@
#include "gssapiP_krb5.h"
#ifndef LEAN_CLIENT
-OM_uint32
-KRB5_CALLCONV krb5_gss_export_sec_context(minor_status, context_handle, interprocess_token)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/gssapiP_krb5.h 2011-08-29 17:20:37 UTC (rev 25116)
@@ -480,8 +480,7 @@
/** declarations of internal name mechanism functions **/
-OM_uint32
-KRB5_CALLCONV 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,8 +491,7 @@
OM_uint32* /* time_rec */
);
-OM_uint32
-KRB5_CALLCONV iakerb_gss_acquire_cred
+OM_uint32 KRB5_CALLCONV iakerb_gss_acquire_cred
(OM_uint32*, /* minor_status */
gss_name_t, /* desired_name */
OM_uint32, /* time_req */
@@ -504,8 +502,8 @@
OM_uint32* /* time_rec */
);
-OM_uint32
-KRB5_CALLCONV krb5_gss_acquire_cred_with_password(
+OM_uint32 KRB5_CALLCONV
+krb5_gss_acquire_cred_with_password(
OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
@@ -516,8 +514,8 @@
gss_OID_set *actual_mechs,
OM_uint32 *time_rec);
-OM_uint32
-KRB5_CALLCONV iakerb_gss_acquire_cred_with_password(
+OM_uint32 KRB5_CALLCONV
+iakerb_gss_acquire_cred_with_password(
OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
@@ -528,8 +526,7 @@
gss_OID_set *actual_mechs,
OM_uint32 *time_rec);
-OM_uint32
-KRB5_CALLCONV krb5_gss_release_cred
+OM_uint32 KRB5_CALLCONV krb5_gss_release_cred
(OM_uint32*, /* minor_status */
gss_cred_id_t* /* cred_handle */
);
@@ -719,8 +716,7 @@
int /* iov_count */
);
-OM_uint32
-KRB5_CALLCONV krb5_gss_wrap_iov_length
+OM_uint32 KRB5_CALLCONV krb5_gss_wrap_iov_length
(OM_uint32 *, /* minor_status */
gss_ctx_id_t, /* context_handle */
int, /* conf_req_flag */
@@ -895,21 +891,21 @@
kg_acceptor_princ(krb5_context context, krb5_gss_name_t name,
krb5_principal *princ_out);
-OM_uint32
-KRB5_CALLCONV krb5_gss_display_name_ext(OM_uint32 *minor_status,
+OM_uint32 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_CALLCONV krb5_gss_inquire_name(OM_uint32 *minor_status,
+OM_uint32 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_CALLCONV krb5_gss_get_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_get_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr,
int *authenticated,
@@ -918,46 +914,46 @@
gss_buffer_t display_value,
int *more);
-OM_uint32
-KRB5_CALLCONV krb5_gss_set_name_attribute(OM_uint32 *minor_status,
+OM_uint32 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_CALLCONV krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr);
-OM_uint32
-KRB5_CALLCONV krb5_gss_export_name_composite(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_export_name_composite(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t exp_composite_name);
-OM_uint32
-KRB5_CALLCONV krb5_gss_map_name_to_any(OM_uint32 *minor_status,
+OM_uint32 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_CALLCONV krb5_gss_release_any_name_mapping(OM_uint32 *minor_status,
+OM_uint32 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_CALLCONV krb5_gss_pseudo_random(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_pseudo_random(OM_uint32 *minor_status,
gss_ctx_id_t context,
int prf_key,
const gss_buffer_t prf_in,
ssize_t desired_output_len,
gss_buffer_t prf_out);
-OM_uint32
-KRB5_CALLCONV krb5_gss_store_cred(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -1141,8 +1137,8 @@
/* IAKERB */
-OM_uint32
-KRB5_CALLCONV iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -1156,8 +1152,8 @@
OM_uint32 *ret_flags,
OM_uint32 *time_rec);
-OM_uint32
-KRB5_CALLCONV iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -1169,8 +1165,8 @@
OM_uint32 *time_rec,
gss_cred_id_t *delegated_cred_handle);
-OM_uint32
-KRB5_CALLCONV iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t output_token);
Modified: trunk/src/lib/gssapi/krb5/gssapi_krb5.c
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapi_krb5.c 2011-08-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/gssapi_krb5.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -345,8 +345,8 @@
}
};
-static OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status,
+static OM_uint32 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)
@@ -398,8 +398,8 @@
};
#endif
-static OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_cred_by_oid(OM_uint32 *minor_status,
+static OM_uint32 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)
@@ -462,8 +462,8 @@
};
#endif
-static OM_uint32
-KRB5_CALLCONV krb5_gss_set_sec_context_option (OM_uint32 *minor_status,
+static OM_uint32 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)
@@ -525,8 +525,8 @@
},
};
-static OM_uint32
-KRB5_CALLCONV krb5_gssspi_set_cred_option(OM_uint32 *minor_status,
+static OM_uint32 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)
@@ -593,8 +593,8 @@
#endif
};
-static OM_uint32
-KRB5_CALLCONV krb5_gssspi_mech_invoke (OM_uint32 *minor_status,
+static OM_uint32 KRB5_CALLCONV
+krb5_gssspi_mech_invoke (OM_uint32 *minor_status,
const gss_OID desired_mech,
const gss_OID desired_object,
gss_buffer_t value)
@@ -633,8 +633,8 @@
#define GS2_IAKERB_SASL_NAME "GS2-IAKERB"
#define GS2_IAKERB_SASL_NAME_LEN (sizeof(GS2_IAKERB_SASL_NAME) - 1)
-static OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
+static OM_uint32 KRB5_CALLCONV
+krb5_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
const gss_buffer_t sasl_mech_name,
gss_OID *mech_type)
{
@@ -657,8 +657,8 @@
return GSS_S_BAD_MECH;
}
-static OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
+static OM_uint32 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,
@@ -686,8 +686,8 @@
return GSS_S_FAILURE;
}
-static OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
+static OM_uint32 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)
@@ -738,8 +738,8 @@
}
#ifndef NO_PASSWORD
-static OM_uint32
-KRB5_CALLCONV krb5_gss_pname_to_uid(OM_uint32 *minor,
+static OM_uint32 KRB5_CALLCONV
+krb5_gss_pname_to_uid(OM_uint32 *minor,
const gss_name_t pname,
const gss_OID mech_type,
uid_t *uid)
@@ -778,8 +778,8 @@
}
#endif /* !NO_PASSWORD */
-static OM_uint32
-KRB5_CALLCONV krb5_gss_authorize_localname(OM_uint32 *minor,
+static OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/iakerb.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -732,8 +732,8 @@
* Delete an IAKERB context. This can also accept Kerberos context
* handles. The heuristic is similar to SPNEGO's delete_sec_context.
*/
-OM_uint32
-KRB5_CALLCONV iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_buffer_t output_token)
{
@@ -788,8 +788,8 @@
exts->iakerb.conv = &ctx->conv;
}
-OM_uint32
-KRB5_CALLCONV iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -878,8 +878,8 @@
return major_status;
}
-OM_uint32
-KRB5_CALLCONV iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/import_name.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -116,8 +116,8 @@
return 0;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_import_name(minor_status, input_name_buffer,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/import_sec_context.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -64,8 +64,8 @@
return 0;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/indicate_mechs.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -28,8 +28,8 @@
#include "gssapiP_krb5.h"
#include "mglueP.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_indicate_mechs(minor_status, mech_set)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/init_sec_context.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -1096,8 +1096,8 @@
}
#endif
-OM_uint32
-KRB5_CALLCONV krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/inq_context.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -77,8 +77,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_context(minor_status, context_handle, initiator_name,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/inq_cred.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -72,8 +72,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
+OM_uint32 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;
@@ -220,8 +220,8 @@
}
/* V2 interface */
-OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/inq_names.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -26,8 +26,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/k5seal.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -387,8 +387,8 @@
return(GSS_S_COMPLETE);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+OM_uint32 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;
@@ -404,8 +404,8 @@
output_message_buffer, KG_TOK_WRAP_MSG));
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_get_mic(minor_status, context_handle, qop_req,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/k5sealiov.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -490,8 +490,8 @@
return GSS_S_COMPLETE;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_wrap_iov(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -508,8 +508,8 @@
return major_status;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_wrap_iov_length(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/k5unseal.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -545,8 +545,8 @@
return ret;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_unwrap(minor_status, context_handle,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_unwrap(minor_status, context_handle,
input_message_buffer, output_message_buffer,
conf_state, qop_state)
OM_uint32 *minor_status;
@@ -564,8 +564,8 @@
return(rstat);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_verify_mic(minor_status, context_handle,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/k5unsealiov.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -640,8 +640,8 @@
return code;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_unwrap_iov(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/naming_exts.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -250,8 +250,8 @@
return 0;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_inquire_name(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_inquire_name(OM_uint32 *minor_status,
gss_name_t name,
int *name_is_MN,
gss_OID *MN_mech,
@@ -307,8 +307,8 @@
return kg_map_name_error(minor_status, code);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_get_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_get_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr,
int *authenticated,
@@ -391,8 +391,8 @@
return kg_map_name_error(minor_status, code);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_set_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_set_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
int complete,
gss_buffer_t attr,
@@ -449,8 +449,8 @@
return kg_map_name_error(minor_status, code);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_delete_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr)
{
@@ -499,8 +499,8 @@
return kg_map_name_error(minor_status, code);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_map_name_to_any(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+krb5_gss_map_name_to_any(OM_uint32 *minor_status,
gss_name_t name,
int authenticated,
gss_buffer_t type_id,
@@ -557,8 +557,8 @@
return kg_map_name_error(minor_status, code);
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_release_any_name_mapping(OM_uint32 *minor_status,
+OM_uint32 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)
@@ -616,8 +616,8 @@
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_export_name_composite(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/prf.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -33,8 +33,8 @@
#define MIN(_a,_b) ((_a)<(_b)?(_a):(_b))
#endif
-OM_uint32
-KRB5_CALLCONV krb5_gss_pseudo_random(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/process_context_token.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -27,8 +27,8 @@
* $Id$
*/
-OM_uint32
-KRB5_CALLCONV krb5_gss_process_context_token(minor_status, context_handle,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/rel_cred.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -23,8 +23,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_release_cred(minor_status, cred_handle)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/rel_name.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -23,8 +23,8 @@
#include "gssapiP_krb5.h"
-OM_uint32
-KRB5_CALLCONV krb5_gss_release_name(minor_status, input_name)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/rel_oid.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -26,10 +26,6 @@
#include "gssapiP_krb5.h"
-OM_uint32 KRB5_CALLCONV krb5_gss_internal_release_oid (OM_uint32 *, /* minor_status */
- gss_OID * /* oid */
-);
-
OM_uint32
krb5_gss_release_oid(minor_status, oid)
OM_uint32 *minor_status;
@@ -55,8 +51,8 @@
}
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_internal_release_oid(minor_status, oid)
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/s4u_gss_glue.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -104,8 +104,8 @@
}
/* The mechglue always passes null desired_mechs and actual_mechs. */
-OM_uint32
-KRB5_CALLCONV krb5_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status,
+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,
OM_uint32 time_req,
Modified: trunk/src/lib/gssapi/krb5/store_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/store_cred.c 2011-08-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/store_cred.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -130,8 +130,8 @@
return major_status;
}
-OM_uint32
-KRB5_CALLCONV krb5_gss_store_cred(OM_uint32 *minor_status,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/krb5/wrap_size_limit.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -73,8 +73,8 @@
#include "gssapiP_krb5.h"
/* V2 interface */
-OM_uint32
-KRB5_CALLCONV krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/mechglue/g_authorize_localname.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -204,8 +204,8 @@
return (major);
}
-int
-KRB5_CALLCONV gss_userok(const gss_name_t name,
+int KRB5_CALLCONV
+gss_userok(const gss_name_t name,
const char *user)
{
OM_uint32 major, minor;
Modified: trunk/src/lib/gssapi/mechglue/mglueP.h
===================================================================
--- trunk/src/lib/gssapi/mechglue/mglueP.h 2011-08-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/mechglue/mglueP.h 2011-08-29 17:20:37 UTC (rev 25116)
@@ -76,7 +76,7 @@
gss_union_cred_auxinfo auxinfo;
} gss_union_cred_desc, *gss_union_cred_t;
-typedef OM_uint32 (KRB5_CALLCONV *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 */
Modified: trunk/src/lib/gssapi/spnego/gssapiP_spnego.h
===================================================================
--- trunk/src/lib/gssapi/spnego/gssapiP_spnego.h 2011-08-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/spnego/gssapiP_spnego.h 2011-08-29 17:20:37 UTC (rev 25116)
@@ -346,8 +346,8 @@
gss_qop_t *qop_state
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_sec_context_by_oid
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_sec_context_by_oid
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
@@ -355,8 +355,8 @@
gss_buffer_set_t *data_set
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_cred_by_oid
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_cred_by_oid
(
OM_uint32 *minor_status,
const gss_cred_id_t cred_handle,
@@ -364,8 +364,8 @@
gss_buffer_set_t *data_set
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_cred_option
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_cred_option
(
OM_uint32 *minor_status,
gss_cred_id_t *cred_handle,
@@ -373,8 +373,8 @@
const gss_buffer_t value
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_sec_context_option
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_sec_context_option
(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
@@ -444,16 +444,16 @@
int iov_count
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_complete_auth_token
+OM_uint32 KRB5_CALLCONV
+spnego_gss_complete_auth_token
(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_acquire_cred_impersonate_name(
+OM_uint32 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 */
@@ -464,8 +464,8 @@
gss_OID_set *, /* actual_mechs */
OM_uint32 *); /* time_rec */
-OM_uint32
-KRB5_CALLCONV spnego_gss_acquire_cred_with_password(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_acquire_cred_with_password(
OM_uint32 *minor_status,
const gss_name_t desired_name,
const gss_buffer_t password,
@@ -476,8 +476,8 @@
gss_OID_set *actual_mechs,
OM_uint32 *time_rec);
-OM_uint32
-KRB5_CALLCONV spnego_gss_display_name_ext
+OM_uint32 KRB5_CALLCONV
+spnego_gss_display_name_ext
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -485,8 +485,8 @@
gss_buffer_t display_name
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_name
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_name
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -495,8 +495,8 @@
gss_buffer_set_t *attrs
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_get_name_attribute
+OM_uint32 KRB5_CALLCONV
+spnego_gss_get_name_attribute
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -508,8 +508,8 @@
int *more
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_name_attribute
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_name_attribute
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -518,24 +518,24 @@
gss_buffer_t value
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_delete_name_attribute
+OM_uint32 KRB5_CALLCONV
+spnego_gss_delete_name_attribute
(
OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_export_name_composite
+OM_uint32 KRB5_CALLCONV
+spnego_gss_export_name_composite
(
OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t exp_composite_name
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_map_name_to_any
+OM_uint32 KRB5_CALLCONV
+spnego_gss_map_name_to_any
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -544,8 +544,8 @@
gss_any_t *output
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_release_any_name_mapping
+OM_uint32 KRB5_CALLCONV
+spnego_gss_release_any_name_mapping
(
OM_uint32 *minor_status,
gss_name_t name,
@@ -553,8 +553,8 @@
gss_any_t *input
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_pseudo_random
+OM_uint32 KRB5_CALLCONV
+spnego_gss_pseudo_random
(
OM_uint32 *minor_status,
gss_ctx_id_t context,
@@ -564,24 +564,24 @@
gss_buffer_t prf_out
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_neg_mechs
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_neg_mechs
(
OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
const gss_OID_set mech_list
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_mech_for_saslname
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_mech_for_saslname
(
OM_uint32 *minor_status,
const gss_buffer_t sasl_mech_name,
gss_OID *mech_type
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_saslname_for_mech
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_saslname_for_mech
(
OM_uint32 *minor_status,
const gss_OID desired_mech,
@@ -590,8 +590,8 @@
gss_buffer_t mech_description
);
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_attrs_for_mech
+OM_uint32 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-26 17:56:44 UTC (rev 25115)
+++ trunk/src/lib/gssapi/spnego/spnego_mech.c 2011-08-29 17:20:37 UTC (rev 25116)
@@ -322,8 +322,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_acquire_cred(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_acquire_cred(OM_uint32 *minor_status,
gss_name_t desired_name,
OM_uint32 time_req,
gss_OID_set desired_mechs,
@@ -393,8 +393,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_release_cred(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_release_cred(OM_uint32 *minor_status,
gss_cred_id_t *cred_handle)
{
spnego_gss_cred_id_t spcred = NULL;
@@ -887,8 +887,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV 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,
gss_ctx_id_t *context_handle,
@@ -1583,8 +1583,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_accept_sec_context(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_accept_sec_context(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
gss_cred_id_t verifier_cred_handle,
@@ -1777,8 +1777,8 @@
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_display_status(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_display_status(
OM_uint32 *minor_status,
OM_uint32 status_value,
int status_type,
@@ -1827,8 +1827,8 @@
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_import_name(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_import_name(
OM_uint32 *minor_status,
gss_buffer_t input_name_buffer,
gss_OID input_name_type,
@@ -1846,8 +1846,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_release_name(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_release_name(
OM_uint32 *minor_status,
gss_name_t *input_name)
{
@@ -1862,8 +1862,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_duplicate_name(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_duplicate_name(
OM_uint32 *minor_status,
const gss_name_t input_name,
gss_name_t *output_name)
@@ -1878,8 +1878,8 @@
return (status);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_cred(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_cred(
OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
gss_name_t *name,
@@ -1951,8 +1951,8 @@
}
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_compare_name(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_compare_name(
OM_uint32 *minor_status,
const gss_name_t name1,
const gss_name_t name2,
@@ -1969,8 +1969,8 @@
/*ARGSUSED*/
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV spnego_gss_display_name(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_display_name(
OM_uint32 *minor_status,
gss_name_t input_name,
gss_buffer_t output_name_buffer,
@@ -1988,8 +1988,8 @@
/*ARGSUSED*/
-OM_uint32
-KRB5_CALLCONV 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)
@@ -2031,8 +2031,8 @@
return (major);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_unwrap(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_unwrap(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer,
@@ -2051,8 +2051,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_wrap(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_wrap(
OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int conf_req_flag,
@@ -2073,8 +2073,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV 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)
@@ -2087,8 +2087,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV 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)
@@ -2122,8 +2122,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV 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)
@@ -2135,8 +2135,8 @@
return (ret);
}
#ifndef LEAN_CLIENT
-OM_uint32
-KRB5_CALLCONV 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)
@@ -2148,8 +2148,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_import_sec_context(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_import_sec_context(
OM_uint32 *minor_status,
const gss_buffer_t interprocess_token,
gss_ctx_id_t *context_handle)
@@ -2162,8 +2162,8 @@
}
#endif /* LEAN_CLIENT */
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_context(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_context(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_name_t *src_name,
@@ -2189,8 +2189,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV 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,
int conf_req_flag,
@@ -2208,8 +2208,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_get_mic(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_get_mic(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_qop_t qop_req,
@@ -2225,8 +2225,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_verify_mic(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_verify_mic(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
const gss_buffer_t msg_buffer,
@@ -2242,8 +2242,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_sec_context_by_oid(
+OM_uint32 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,
@@ -2257,8 +2257,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_cred_by_oid(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_cred_by_oid(
OM_uint32 *minor_status,
const gss_cred_id_t cred_handle,
const gss_OID desired_object,
@@ -2275,8 +2275,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_cred_option(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_cred_option(
OM_uint32 *minor_status,
gss_cred_id_t *cred_handle,
const gss_OID desired_object,
@@ -2312,8 +2312,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_sec_context_option(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_sec_context_option(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
const gss_OID desired_object,
@@ -2327,8 +2327,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_wrap_aead(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2350,8 +2350,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_unwrap_aead(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2370,8 +2370,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_wrap_iov(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2390,8 +2390,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_unwrap_iov(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_unwrap_iov(OM_uint32 *minor_status,
gss_ctx_id_t context_handle,
int *conf_state,
gss_qop_t *qop_state,
@@ -2408,8 +2408,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_wrap_iov_length(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2429,8 +2429,8 @@
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_complete_auth_token(
+OM_uint32 KRB5_CALLCONV
+spnego_gss_complete_auth_token(
OM_uint32 *minor_status,
const gss_ctx_id_t context_handle,
gss_buffer_t input_message_buffer)
@@ -2442,8 +2442,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2500,8 +2500,8 @@
return (status);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_acquire_cred_with_password(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2558,8 +2558,8 @@
return (status);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_display_name_ext(OM_uint32 *minor_status,
+OM_uint32 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)
@@ -2573,8 +2573,8 @@
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_name(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_name(OM_uint32 *minor_status,
gss_name_t name,
int *name_is_MN,
gss_OID *MN_mech,
@@ -2589,8 +2589,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_get_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_get_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr,
int *authenticated,
@@ -2611,8 +2611,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
int complete,
gss_buffer_t attr,
@@ -2627,8 +2627,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_delete_name_attribute(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_delete_name_attribute(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t attr)
{
@@ -2639,8 +2639,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_export_name_composite(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_export_name_composite(OM_uint32 *minor_status,
gss_name_t name,
gss_buffer_t exp_composite_name)
{
@@ -2651,8 +2651,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_map_name_to_any(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_map_name_to_any(OM_uint32 *minor_status,
gss_name_t name,
int authenticated,
gss_buffer_t type_id,
@@ -2667,8 +2667,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_release_any_name_mapping(OM_uint32 *minor_status,
+OM_uint32 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)
@@ -2681,8 +2681,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_pseudo_random(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_pseudo_random(OM_uint32 *minor_status,
gss_ctx_id_t context,
int prf_key,
const gss_buffer_t prf_in,
@@ -2699,8 +2699,8 @@
return (ret);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_set_neg_mechs(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_set_neg_mechs(OM_uint32 *minor_status,
gss_cred_id_t cred_handle,
const gss_OID_set mech_list)
{
@@ -2717,8 +2717,8 @@
#define SPNEGO_SASL_NAME "SPNEGO"
#define SPNEGO_SASL_NAME_LEN (sizeof(SPNEGO_SASL_NAME) - 1)
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
+OM_uint32 KRB5_CALLCONV
+spnego_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
const gss_buffer_t sasl_mech_name,
gss_OID *mech_type)
{
@@ -2733,8 +2733,8 @@
return (GSS_S_BAD_MECH);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
+OM_uint32 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,
@@ -2758,8 +2758,8 @@
return (GSS_S_FAILURE);
}
-OM_uint32
-KRB5_CALLCONV spnego_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
+OM_uint32 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