s4:kdc: Make use of smb_krb5_data_from_blob() helper function

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

diff --git a/source4/kdc/kpasswd-service-mit.c b/source4/kdc/kpasswd-service-mit.c
index 528141640eed6b268e4cd192bbf5072ef97f6673..fe420f94cd10295042e73434843f6bccf79a8dad 100644 (file)
--- a/source4/kdc/kpasswd-service-mit.c
+++ b/source4/kdc/kpasswd-service-mit.c
@@ -172,8 +172,7 @@ static krb5_error_code kpasswd_set_password(struct kdc_server *kdc,
        struct samr_DomInfo1 *dominfo = NULL;
        NTSTATUS status;
 
-       k_dec_data.length = decoded_data->length;
-       k_dec_data.data   = (char *)decoded_data->data;
+       k_dec_data = smb_krb5_data_from_blob(*decoded_data);
 
        code = decode_krb5_setpw_req(&k_dec_data,
                                     &k_clear_data,

diff --git a/source4/kdc/kpasswd-service.c b/source4/kdc/kpasswd-service.c
index c20919b0799808bb43629a46f4d95fba51302e5b..43dd8e0d866e09cfecd1dc037a6a1adbde535787 100644 (file)
--- a/source4/kdc/kpasswd-service.c
+++ b/source4/kdc/kpasswd-service.c
@@ -329,8 +329,7 @@ reply:
                        goto done;
                }
 
-               k_dec_data.length = dec_data_blob.length;
-               k_dec_data.data   = (char *)dec_data_blob.data;
+               k_dec_data = smb_krb5_data_from_blob(dec_data_blob);
 
                principal_string = cli_credentials_get_principal(server_credentials,
                                                                 tmp_ctx);

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index d878d5c5015eb6fc15915975c865e5e5c14cb890..600ec6ac009337baee9bb89cd9ad937fa19f938a 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -521,10 +521,7 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
        krb5_error_code ret;
 #ifdef SAMBA4_USES_HEIMDAL
        char null_byte = '\0';
-       krb5_data null_data = {
-               .length = 1,
-               .data = &null_byte,
-       };
+       krb5_data null_data = smb_krb5_make_data(&null_byte, 1);
 #endif
 
        /* The user account may be set not to want the PAC */