oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

s/acquire_cred_ex/acquire_cred_ext/g

Browse Source
This commit is contained in:
Luke Howard
2011-04-08 09:03:25 +10:00
parent f79f005783
commit 41de6c92f5
10 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gssapi/Makefile.am
View File

@@ -80,7 +80,7 @@ mechsrc = \
mech/doxygen.c \ mech/doxygen.c \
mech/gss_accept_sec_context.c \ mech/gss_accept_sec_context.c \
mech/gss_acquire_cred.c \ mech/gss_acquire_cred.c \
mech/gss_acquire_cred_ex.c \ mech/gss_acquire_cred_ext.c \
mech/gss_acquire_cred_with_password.c \ mech/gss_acquire_cred_with_password.c \
mech/gss_add_cred.c \ mech/gss_add_cred.c \
mech/gss_add_oid_set_member.c \ mech/gss_add_oid_set_member.c \

2
lib/gssapi/gssapi/gssapi.h
View File

@@ -479,7 +479,7 @@ extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_password_oid_desc;
extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_certificate_oid_desc; extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_certificate_oid_desc;
#define GSS_C_CRED_CERTIFICATE (&__gss_c_cred_certificate_oid_desc) #define GSS_C_CRED_CERTIFICATE (&__gss_c_cred_certificate_oid_desc)
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_acquire_cred_ex GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_acquire_cred_ext
(OM_uint32 * /*minor_status*/, (OM_uint32 * /*minor_status*/,
const gss_name_t /*desired_name*/, const gss_name_t /*desired_name*/,
const gss_OID /*credential_type*/, const gss_OID /*credential_type*/,

18
lib/gssapi/gssapi_mech.h
View File

@@ -355,14 +355,14 @@ _gss_import_cred_t(OM_uint32 * minor_status,
typedef OM_uint32 GSSAPI_CALLCONV typedef OM_uint32 GSSAPI_CALLCONV
_gss_acquire_cred_ex_t(OM_uint32 * /*minor_status */, _gss_acquire_cred_ext_t(OM_uint32 * /*minor_status */,
const gss_name_t /* desired_name */, const gss_name_t /* desired_name */,
const gss_OID /* credential_type */, const gss_OID /* credential_type */,
const void * /* credential_data */, const void * /* credential_data */,
OM_uint32 /* time_req */, OM_uint32 /* time_req */,
const gss_OID /* desired_mech */, const gss_OID /* desired_mech */,
gss_cred_usage_t /* cred_usage */, gss_cred_usage_t /* cred_usage */,
gss_cred_id_t * /* output_cred_handle */); gss_cred_id_t * /* output_cred_handle */);
typedef void GSSAPI_CALLCONV typedef void GSSAPI_CALLCONV
_gss_iter_creds_t(OM_uint32 /* flags */, _gss_iter_creds_t(OM_uint32 /* flags */,
@@ -512,7 +512,7 @@ typedef struct gssapi_mech_interface_desc {
_gss_store_cred_t *gm_store_cred; _gss_store_cred_t *gm_store_cred;
_gss_export_cred_t *gm_export_cred; _gss_export_cred_t *gm_export_cred;
_gss_import_cred_t *gm_import_cred; _gss_import_cred_t *gm_import_cred;
_gss_acquire_cred_ex_t *gm_acquire_cred_ex; _gss_acquire_cred_ext_t *gm_acquire_cred_ext;
_gss_iter_creds_t *gm_iter_creds; _gss_iter_creds_t *gm_iter_creds;
_gss_destroy_cred_t *gm_destroy_cred; _gss_destroy_cred_t *gm_destroy_cred;
_gss_cred_hold_t *gm_cred_hold; _gss_cred_hold_t *gm_cred_hold;

18
lib/gssapi/krb5/acquire_cred.c
View File

@@ -342,14 +342,14 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred
} }
} }
ret = _gsskrb5_acquire_cred_ex(minor_status, ret = _gsskrb5_acquire_cred_ext(minor_status,
desired_name, desired_name,
GSS_C_NO_OID, GSS_C_NO_OID,
NULL, NULL,
time_req, time_req,
GSS_KRB5_MECHANISM, GSS_KRB5_MECHANISM,
cred_usage, cred_usage,
output_cred_handle); output_cred_handle);
if (ret) if (ret)
return ret; return ret;
@@ -364,7 +364,7 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred
return ret; return ret;
} }
OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred_ex OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred_ext
(OM_uint32 * minor_status, (OM_uint32 * minor_status,
const gss_name_t desired_name, const gss_name_t desired_name,
const gss_OID credential_type, const gss_OID credential_type,

2
lib/gssapi/krb5/external.c
View File

@@ -315,7 +315,7 @@ static gssapi_mech_interface_desc krb5_mech = {
_gsskrb5_store_cred, _gsskrb5_store_cred,
_gsskrb5_export_cred, _gsskrb5_export_cred,
_gsskrb5_import_cred, _gsskrb5_import_cred,
_gsskrb5_acquire_cred_ex, _gsskrb5_acquire_cred_ext,
NULL, NULL,
NULL, NULL,
NULL, NULL,

22
lib/gssapi/mech/gss_acquire_cred_ex.c → lib/gssapi/mech/gss_acquire_cred_ext.c
View File

@@ -31,7 +31,7 @@
#include "mech_locl.h" #include "mech_locl.h"
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_acquire_cred_ex(OM_uint32 *minor_status, gss_acquire_cred_ext(OM_uint32 *minor_status,
const gss_name_t desired_name, const gss_name_t desired_name,
const gss_OID credential_type, const gss_OID credential_type,
const void *credential_data, const void *credential_data,
@@ -50,7 +50,7 @@ gss_acquire_cred_ex(OM_uint32 *minor_status,
*minor_status = 0; *minor_status = 0;
if (output_cred_handle == NULL) if (output_cred_handle == NULL)
return GSS_S_CALL_INACCESSIBLE_READ; return GSS_S_CALL_INACCESSIBLE_READ;
_gss_load_mech(); _gss_load_mech();
@@ -100,15 +100,15 @@ gss_acquire_cred_ex(OM_uint32 *minor_status,
mc->gmc_mech = m; mc->gmc_mech = m;
mc->gmc_mech_oid = &m->gm_mech_oid; mc->gmc_mech_oid = &m->gm_mech_oid;
if (m->gm_acquire_cred_ex) { if (m->gm_acquire_cred_ext) {
major_status = m->gm_acquire_cred_ex(minor_status, major_status = m->gm_acquire_cred_ext(minor_status,
desired_mech_name, desired_mech_name,
credential_type, credential_type,
credential_data, credential_data,
time_req, time_req,
mc->gmc_mech_oid, mc->gmc_mech_oid,
cred_usage, cred_usage,
&mc->gmc_cred); &mc->gmc_cred);
} else if (credential_type != GSS_C_NO_OID) { } else if (credential_type != GSS_C_NO_OID) {
gss_OID_set_desc set2; gss_OID_set_desc set2;

32
lib/gssapi/mech/gss_acquire_cred_with_password.c
View File

@@ -46,14 +46,14 @@ gss_acquire_cred_with_password(OM_uint32 *minor_status,
OM_uint32 major_status, tmp_minor; OM_uint32 major_status, tmp_minor;
if (desired_mechs == GSS_C_NO_OID_SET) { if (desired_mechs == GSS_C_NO_OID_SET) {
major_status = gss_acquire_cred_ex(minor_status, major_status = gss_acquire_cred_ext(minor_status,
desired_name, desired_name,
GSS_C_CRED_PASSWORD, GSS_C_CRED_PASSWORD,
password, password,
time_req, time_req,
GSS_C_NO_OID, GSS_C_NO_OID,
cred_usage, cred_usage,
output_cred_handle); output_cred_handle);
if (GSS_ERROR(major_status)) if (GSS_ERROR(major_status))
return major_status; return major_status;
} else { } else {
@@ -71,14 +71,14 @@ gss_acquire_cred_with_password(OM_uint32 *minor_status,
struct _gss_cred *tmp_cred = NULL; struct _gss_cred *tmp_cred = NULL;
struct _gss_mechanism_cred *mc; struct _gss_mechanism_cred *mc;
major_status = gss_acquire_cred_ex(minor_status, major_status = gss_acquire_cred_ext(minor_status,
desired_name, desired_name,
GSS_C_CRED_PASSWORD, GSS_C_CRED_PASSWORD,
password, password,
time_req, time_req,
&desired_mechs->elements[i], &desired_mechs->elements[i],
cred_usage, cred_usage,
(gss_cred_id_t *)&tmp_cred); (gss_cred_id_t *)&tmp_cred);
if (GSS_ERROR(major_status)) if (GSS_ERROR(major_status))
continue; continue;

2
lib/gssapi/mech/gss_mech_switch.c
View File

@@ -346,7 +346,7 @@ _gss_load_mech(void)
OPTSYM(store_cred); OPTSYM(store_cred);
OPTSYM(export_cred); OPTSYM(export_cred);
OPTSYM(import_cred); OPTSYM(import_cred);
OPTSYM(acquire_cred_ex); OPTSYM(acquire_cred_ext);
OPTSYM(iter_creds); OPTSYM(iter_creds);
OPTSYM(destroy_cred); OPTSYM(destroy_cred);
OPTSYM(cred_hold); OPTSYM(cred_hold);

6
lib/gssapi/test_context.c
View File

@@ -573,9 +573,9 @@ main(int argc, char **argv)
errx(1, "gss_import_name: %s", errx(1, "gss_import_name: %s",
gssapi_err(maj_stat, min_stat, GSS_C_NO_OID)); gssapi_err(maj_stat, min_stat, GSS_C_NO_OID));
maj_stat = gss_acquire_cred_ex(&min_stat, cname, maj_stat = gss_acquire_cred_ext(&min_stat, cname,
credential_type, &credential_data, credential_type, &credential_data,
0, GSS_C_NO_OID, GSS_C_INITIATE, &client_cred); 0, GSS_C_NO_OID, GSS_C_INITIATE, &client_cred);
if (GSS_ERROR(maj_stat)) if (GSS_ERROR(maj_stat))
errx(1, "gss_acquire_cred_ex: %s", errx(1, "gss_acquire_cred_ex: %s",
gssapi_err(maj_stat, min_stat, GSS_C_NO_OID)); gssapi_err(maj_stat, min_stat, GSS_C_NO_OID));

2
lib/gssapi/version-script.map
View File

@@ -15,7 +15,7 @@ HEIMDAL_GSS_2.0 {
__gss_c_cred_certificate_oid_desc; __gss_c_cred_certificate_oid_desc;
gss_accept_sec_context; gss_accept_sec_context;
gss_acquire_cred; gss_acquire_cred;
gss_acquire_cred_ex; gss_acquire_cred_ext;
gss_acquire_cred_with_password; gss_acquire_cred_with_password;
gss_add_buffer_set_member; gss_add_buffer_set_member;
gss_add_cred; gss_add_cred;