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

gss: Constify gss_str_to_oid()

Browse Source
This commit is contained in:
Nicolas Williams
2026-01-07 13:04:31 -06:00
parent d67e0b6d39
commit 10732be94c
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -781,7 +781,7 @@ gss_release_oid
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_oid_to_str(
OM_uint32 * /*minor_status*/,
gss_OID /* oid */,
gss_const_OID /* oid */,
gss_buffer_t /* str */
);

3
lib/gssapi/krb5/authorize_localname.c
View File

@@ -58,8 +58,7 @@ _gsskrb5_authorize_localname(OM_uint32 *minor_status,
user[user_name->length] = '\0';
*minor_status = 0;
/* XXX krb5_kuserok should take krb5_const_principal */
user_ok = krb5_kuserok(context, rk_UNCONST(princ), user);
user_ok = krb5_kuserok(context, princ, user);
free(user);

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

@@ -34,7 +34,7 @@
#include "mech_locl.h"
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_oid_to_str(OM_uint32 *minor_status, gss_OID oid, gss_buffer_t oid_str)
gss_oid_to_str(OM_uint32 *minor_status, gss_const_OID oid, gss_buffer_t oid_str)
{
int ret;
size_t size;

3
lib/gssapi/spnego/compat.c
View File

@@ -540,9 +540,8 @@ _gss_spnego_log_mech(const char *prefix, gss_const_OID oid)
if (!_gss_mg_log_level(10))
return;
/* XXX gss_oid_to_str should take gss_const_OID */
if (oid == GSS_C_NO_OID ||
gss_oid_to_str(&junk, rk_UNCONST(oid), &oidbuf) != GSS_S_COMPLETE) {
gss_oid_to_str(&junk, oid, &oidbuf) != GSS_S_COMPLETE) {
_gss_mg_log(10, "spnego: %s (null)", prefix);
return;
}

3
lib/gssapi/spnego/negoex_util.c
View File

@@ -923,8 +923,7 @@ _gss_negoex_add_auth_mech(OM_uint32 *minor,
return GSS_S_FAILURE;
}
/* XXX gss_duplicate_oid should take gss_const_OID */
major = gss_duplicate_oid(minor, (gss_OID)rk_UNCONST(oid), &mech->oid);
major = gss_duplicate_oid(minor, oid, &mech->oid);
if (major != GSS_S_COMPLETE) {
free(mech);
return major;

2
lib/gssapi/test_names.c
View File

@@ -280,7 +280,7 @@ check_name_attrs(void)
assert_attr(n, GSS_KRB5_NAME_ATTRIBUTE_BASE_URN "ticket-authz-data",
GSS_S_COMPLETE, &v, NULL, 0, 1, 0);
free(v.value); /* XXX !!! ??? */
free(v.value);
attr_set.count = 7;
assert_attr_set(n, &attr_set);