s4:kdc: Use smb_krb5_make_data()

smb_krb5_make_data() sets the magic field, which we were previously
ignoring. We should also not set krb5_data::length if krb5_data::data is
NULL.

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

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index fd5006736bd03e0d3a1a8413c4f0b72c8b2b5459..9b3d092ec156a89435281d27ade78a7e142e9758 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -176,11 +176,12 @@ int mit_samba_generate_random_password(krb5_data *pwd)
 {
        TALLOC_CTX *tmp_ctx;
        char *password;
+       char *data = NULL;
+       const unsigned length = 24;
 
        if (pwd == NULL) {
                return EINVAL;
        }
-       pwd->length = 24;
 
        tmp_ctx = talloc_named(NULL,
                               0,
@@ -189,18 +190,20 @@ int mit_samba_generate_random_password(krb5_data *pwd)
                return ENOMEM;
        }
 
-       password = generate_random_password(tmp_ctx, pwd->length, pwd->length);
+       password = generate_random_password(tmp_ctx, length, length);
        if (password == NULL) {
                talloc_free(tmp_ctx);
                return ENOMEM;
        }
 
-       pwd->data = strdup(password);
+       data = strdup(password);
        talloc_free(tmp_ctx);
-       if (pwd->data == NULL) {
+       if (data == NULL) {
                return ENOMEM;
        }
 
+       *pwd = smb_krb5_make_data(data, length);
+
        return 0;
 }