diff options
| author | Günther Deschner <gd@samba.org> | 2021-05-11 15:22:55 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2021-07-14 16:49:30 +0000 |
| commit | de3296203914df6240e146aa114ef2e1ae3d6315 (patch) | |
| tree | 080757bf6ae4de4884b27e5d2ee5d3b6e07ea79f /source3/libnet | |
| parent | 1581d63bfe09dcd0fd9d7a2e07686a071e5dc3e3 (diff) | |
| download | samba-de3296203914df6240e146aa114ef2e1ae3d6315.tar.gz | |
s3-libnet_join: use joinprov3 struct in libnet_DomainOfflineJoin()
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'source3/libnet')
| -rw-r--r-- | source3/libnet/libnet_join.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index ce837e730e2..f6a1990db1b 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -2830,6 +2830,7 @@ static WERROR libnet_DomainOfflineJoin(TALLOC_CTX *mem_ctx, NTSTATUS status; WERROR werr; struct ODJ_WIN7BLOB win7blob; + struct OP_JOINPROV3_PART joinprov3; const char *dc_name; if (!r->in.request_offline_join) { @@ -2862,6 +2863,13 @@ static WERROR libnet_DomainOfflineJoin(TALLOC_CTX *mem_ctx, win7blob.DnsDomainInfo.Sid); W_ERROR_HAVE_NO_MEMORY(r->out.domain_sid); + werr = libnet_odj_find_joinprov3(r->in.odj_provision_data, &joinprov3); + if (!W_ERROR_IS_OK(werr)) { + return werr; + } + + r->out.account_rid = joinprov3.Rid; + dc_name = strip_hostname(win7blob.DcInfo.dc_address); if (dc_name == NULL) { return WERR_DOMAIN_CONTROLLER_NOT_FOUND; @@ -2885,7 +2893,6 @@ static WERROR libnet_DomainOfflineJoin(TALLOC_CTX *mem_ctx, const char * dn; uint32_t set_encryption_types; const char * krb5_salt; - uint32_t account_rid; #endif } |