diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-08-23 12:09:57 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2017-02-21 16:09:22 +0100 |
| commit | 77edef9555acd6e0c843582637bc367fa0d2a203 (patch) | |
| tree | 7b83a4c929ee3f961836e89303ffc5b6305545af /source3/libnet | |
| parent | 00136940757ea6947f97c9c92b25207d9413727b (diff) | |
| download | samba-77edef9555acd6e0c843582637bc367fa0d2a203.tar.gz | |
s3:libnet_join: make use of trust_pw_new_value()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/libnet')
| -rw-r--r-- | source3/libnet/libnet_join.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 8275a7cc566..4d00ef65413 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1138,9 +1138,11 @@ static NTSTATUS libnet_join_joindomain_rpc_unsecure(TALLOC_CTX *mem_ctx, } if (!r->in.machine_password) { - r->in.machine_password = generate_random_password(mem_ctx, - DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH, - DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH); + int security = r->in.ads ? SEC_ADS : SEC_DOMAIN; + + r->in.machine_password = trust_pw_new_value(mem_ctx, + r->in.secure_channel_type, + security); if (r->in.machine_password == NULL) { TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; @@ -1233,9 +1235,11 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, } if (!r->in.machine_password) { - r->in.machine_password = generate_random_password(mem_ctx, - DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH, - DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH); + int security = r->in.ads ? SEC_ADS : SEC_DOMAIN; + + r->in.machine_password = trust_pw_new_value(mem_ctx, + r->in.secure_channel_type, + security); NT_STATUS_HAVE_NO_MEMORY(r->in.machine_password); } |