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

kdc: remove krb5_ prefix for KDC attribute functions

Browse Source 
We will use the kdc_ rather than krb5_kdc_ prefix for new public APIs exported
from libkdc. Amend the recently introduced
request_{get,set,copy,delete}_attribute APIs to conform.
This commit is contained in:
Luke Howard
2022-01-17 09:43:00 +11:00
committed by Jeffrey Altman
parent 5fa0b7b6ff
commit 4befd3e355
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kdc/altsecid_gss_preauth_authorizer.c
View File

@@ -452,7 +452,7 @@ authorize(void *ctx,
} while (reconnect_p);
if (requestor_sid) {
krb5_kdc_request_set_attribute((kdc_request_t)r,
kdc_request_set_attribute((kdc_request_t)r,
HSTR("org.h5l.gss-pa-requestor-sid"), requestor_sid);
heim_release(requestor_sid);
}
@@ -465,7 +465,7 @@ finalize_pac(void *ctx, astgs_request_t r)
{
heim_data_t requestor_sid;
requestor_sid = krb5_kdc_request_get_attribute((kdc_request_t)r,
requestor_sid = kdc_request_get_attribute((kdc_request_t)r,
HSTR("org.h5l.gss-pa-requestor-sid"));
if (requestor_sid == NULL)
return 0;

4
kdc/kerberos5.c
View File

@@ -594,7 +594,7 @@ pa_gss_validate(astgs_request_t r, const PA_DATA *pa)
goto out;
}
ret = krb5_kdc_request_set_attribute((kdc_request_t)r,
ret = kdc_request_set_attribute((kdc_request_t)r,
HSTR("org.h5l.pa-gss-client-params"), gcp);
if (ret)
goto out;
@@ -611,7 +611,7 @@ pa_gss_finalize_pac(astgs_request_t r)
{
gss_client_params *gcp;
gcp = krb5_kdc_request_get_attribute((kdc_request_t)r, HSTR("org.h5l.pa-gss-client-params"));
gcp = kdc_request_get_attribute((kdc_request_t)r, HSTR("org.h5l.pa-gss-client-params"));
heim_assert(gcp != NULL, "invalid GSS-API client params");

8
kdc/libkdc-exports.def
View File

@@ -17,10 +17,10 @@ EXPORTS
krb5_kdc_save_request
krb5_kdc_update_time
krb5_kdc_pk_initialize
krb5_kdc_request_set_attribute
krb5_kdc_request_get_attribute
krb5_kdc_request_copy_attribute
krb5_kdc_request_delete_attribute
kdc_request_set_attribute
kdc_request_get_attribute
kdc_request_copy_attribute
kdc_request_delete_attribute
_kdc_audit_addkv
_kdc_audit_addkv_number
_kdc_audit_addkv_object

8
kdc/process.c
View File

@@ -524,25 +524,25 @@ out:
}
KDC_LIB_FUNCTION krb5_error_code KDC_LIB_CALL
krb5_kdc_request_set_attribute(kdc_request_t r, heim_object_t key, heim_object_t value)
kdc_request_set_attribute(kdc_request_t r, heim_object_t key, heim_object_t value)
{
return heim_dict_set_value(r->attributes, key, value);
}
KDC_LIB_FUNCTION heim_object_t KDC_LIB_CALL
krb5_kdc_request_get_attribute(kdc_request_t r, heim_object_t key)
kdc_request_get_attribute(kdc_request_t r, heim_object_t key)
{
return heim_dict_get_value(r->attributes, key);
}
KDC_LIB_FUNCTION heim_object_t KDC_LIB_CALL
krb5_kdc_request_copy_attribute(kdc_request_t r, heim_object_t key)
kdc_request_copy_attribute(kdc_request_t r, heim_object_t key)
{
return heim_dict_copy_value(r->attributes, key);
}
KDC_LIB_FUNCTION void KDC_LIB_CALL
krb5_kdc_request_delete_attribute(kdc_request_t r, heim_object_t key)
kdc_request_delete_attribute(kdc_request_t r, heim_object_t key)
{
heim_dict_delete_key(r->attributes, key);
}

8
kdc/version-script.map
View File

@@ -20,10 +20,10 @@ HEIMDAL_KDC_1.0 {
krb5_kdc_save_request;
krb5_kdc_update_time;
krb5_kdc_pk_initialize;
krb5_kdc_request_set_attribute;
krb5_kdc_request_get_attribute;
krb5_kdc_request_copy_attribute;
krb5_kdc_request_delete_attribute;
kdc_request_set_attribute;
kdc_request_get_attribute;
kdc_request_copy_attribute;
kdc_request_delete_attribute;
_kdc_audit_addkv;
_kdc_audit_addkv_number;
_kdc_audit_addkv_object;

4
tests/plugin/kdc_test_plugin.c
View File

@@ -126,7 +126,7 @@ finalize_reply(void *ctx, astgs_request_t r)
if (n == NULL)
return ENOMEM;
ret = krb5_kdc_request_set_attribute((kdc_request_t)r,
ret = kdc_request_set_attribute((kdc_request_t)r,
HSTR("org.h5l.tests.kdc-plugin"), n);
heim_release(n);
@@ -143,7 +143,7 @@ audit(void *ctx, astgs_request_t r)
if (r->ret)
return 0; /* finalize_reply only called in success */
n = krb5_kdc_request_get_attribute((kdc_request_t)r,
n = kdc_request_get_attribute((kdc_request_t)r,
HSTR("org.h5l.tests.kdc-plugin"));
heim_assert(n && heim_number_get_int(n) == 1234,