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 ea90f9e21852618fe7e9d26c62a79a58232460a1..d421e6ead614744f8021805a9b82e5f92f9dddec 100644 (file)
--- 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;
        }