From: Joseph Sutton Date: Tue, 20 Sep 2022 22:42:54 +0000 (+1200) Subject: s4:kdc: Make use of smb_krb5_data_from_blob() helper function X-Git-Tag: talloc-2.4.0~746 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ce0a0e982ed6b2cf1a0980270196c80c8eecb9;p=thirdparty%2Fsamba.git s4:kdc: Make use of smb_krb5_data_from_blob() helper function Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/source4/kdc/kpasswd-service-mit.c b/source4/kdc/kpasswd-service-mit.c index 528141640ee..fe420f94cd1 100644 --- 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 c20919b0799..43dd8e0d866 100644 --- 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 d878d5c5015..600ec6ac009 100644 --- 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 */