From cec4ebbec8b07cd3643ab013980b926654cf77b9 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Tue, 5 Sep 2023 16:46:08 +1200 Subject: [PATCH] s4:kdc: Switch to using smb_krb5_princ_component() Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- source4/kdc/db-glue.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index ea90f9e2185..d421e6ead61 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -888,17 +888,18 @@ static int principal_comp_strcmp_int(krb5_context context, } #else size_t len; - krb5_data *d; + krb5_data d; + krb5_error_code ret = 0; if (component >= krb5_princ_size(context, principal)) { return -1; } - d = krb5_princ_component(context, principal, component); - if (d == NULL) { + ret = smb_krb5_princ_component(context, principal, component, &d); + if (ret) { return -1; } - p = d->data; + p = d.data; len = strlen(string); @@ -907,9 +908,9 @@ static int principal_comp_strcmp_int(krb5_context context, * give the wrong result if the result overflows or loses data when * narrowed to int. */ - if (d->length < len) { + if (d.length < len) { return -1; - } else if (d->length > len) { + } else if (d.length > len) { return 1; } -- 2.47.3