From 33d1877c2101cf91d395c4c96be7b89895ec00f9 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sat, 14 May 2011 17:16:49 +0200 Subject: [PATCH] use gss_const_OID for gss_acquire_cred_ext --- lib/gssapi/gssapi/gssapi.h | 4 ++-- lib/gssapi/gssapi_mech.h | 4 ++-- lib/gssapi/krb5/acquire_cred.c | 12 ++++++------ lib/gssapi/mech/gss_acquire_cred_ext.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h index 84179fbc1..cf47c725a 100644 --- a/lib/gssapi/gssapi/gssapi.h +++ b/lib/gssapi/gssapi/gssapi.h @@ -487,10 +487,10 @@ extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_certificate_oid_desc; GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_acquire_cred_ext (OM_uint32 * /*minor_status*/, const gss_name_t /*desired_name*/, - const gss_OID /*credential_type*/, + gss_const_OID /*credential_type*/, const void * /*credential_data*/, OM_uint32 /*time_req*/, - const gss_OID /*desired_mech*/, + gss_const_OID /*desired_mech*/, gss_cred_usage_t /*cred_usage*/, gss_cred_id_t * /*output_cred_handle*/ ); diff --git a/lib/gssapi/gssapi_mech.h b/lib/gssapi/gssapi_mech.h index db739ffde..553390dd4 100644 --- a/lib/gssapi/gssapi_mech.h +++ b/lib/gssapi/gssapi_mech.h @@ -357,10 +357,10 @@ _gss_import_cred_t(OM_uint32 * minor_status, typedef OM_uint32 GSSAPI_CALLCONV _gss_acquire_cred_ext_t(OM_uint32 * /*minor_status */, const gss_name_t /* desired_name */, - const gss_OID /* credential_type */, + gss_const_OID /* credential_type */, const void * /* credential_data */, OM_uint32 /* time_req */, - const gss_OID /* desired_mech */, + gss_const_OID /* desired_mech */, gss_cred_usage_t /* cred_usage */, gss_cred_id_t * /* output_cred_handle */); diff --git a/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c index 8c8817eb1..95b99e149 100644 --- a/lib/gssapi/krb5/acquire_cred.c +++ b/lib/gssapi/krb5/acquire_cred.c @@ -104,11 +104,11 @@ get_keytab(krb5_context context, krb5_keytab *keytab) static OM_uint32 acquire_initiator_cred (OM_uint32 * minor_status, krb5_context context, - const gss_OID credential_type, + gss_const_OID credential_type, void *credential_data, const gss_name_t desired_name, OM_uint32 time_req, - const gss_OID desired_mech, + gss_const_OID desired_mech, gss_cred_usage_t cred_usage, gsskrb5_cred handle ) @@ -255,11 +255,11 @@ end: static OM_uint32 acquire_acceptor_cred (OM_uint32 * minor_status, krb5_context context, - const gss_OID credential_type, + gss_const_OID credential_type, void *credential_data, const gss_name_t desired_name, OM_uint32 time_req, - const gss_OID desired_mech, + gss_const_OID desired_mech, gss_cred_usage_t cred_usage, gsskrb5_cred handle ) @@ -367,10 +367,10 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred_ext (OM_uint32 * minor_status, const gss_name_t desired_name, - const gss_OID credential_type, + gss_const_OID credential_type, void *credential_data, OM_uint32 time_req, - const gss_OID desired_mech, + gss_const_OID desired_mech, gss_cred_usage_t cred_usage, gss_cred_id_t * output_cred_handle ) diff --git a/lib/gssapi/mech/gss_acquire_cred_ext.c b/lib/gssapi/mech/gss_acquire_cred_ext.c index 1c26aae61..2fcd15268 100644 --- a/lib/gssapi/mech/gss_acquire_cred_ext.c +++ b/lib/gssapi/mech/gss_acquire_cred_ext.c @@ -33,10 +33,10 @@ GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_acquire_cred_ext(OM_uint32 *minor_status, const gss_name_t desired_name, - const gss_OID credential_type, + gss_const_OID credential_type, const void *credential_data, OM_uint32 time_req, - const gss_OID desired_mech, + gss_const_OID desired_mech, gss_cred_usage_t cred_usage, gss_cred_id_t *output_cred_handle) { -- 2.11.4.GIT