From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 5 Sep 2023 04:46:08 +0000 (+1200)
Subject: s4:kdc: Switch to using smb_krb5_princ_component()
X-Git-Tag: tevent-0.16.0~573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec4ebbec8b07cd3643ab013980b926654cf77b9;p=thirdparty%2Fsamba.git

s4:kdc: Switch to using smb_krb5_princ_component()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

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;
 	}