diff options
| author | Andreas Schneider <asn@samba.org> | 2021-03-18 11:08:57 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2021-03-24 00:55:32 +0000 |
| commit | 0aeca4e5a131c38328c7768e173b845f594c3470 (patch) | |
| tree | 483ee78322e255986efed592e1b6c1b065172512 /source3/lib/netapi | |
| parent | 3506800d3effca667235eabf185a93274cc78901 (diff) | |
| download | samba-0aeca4e5a131c38328c7768e173b845f594c3470.tar.gz | |
s3:netapi: Get username/password from cli_credentials in joindomain.c
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source3/lib/netapi')
| -rw-r--r-- | source3/lib/netapi/joindomain.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c index f2d36fc00db..afb1de45a71 100644 --- a/source3/lib/netapi/joindomain.c +++ b/source3/lib/netapi/joindomain.c @@ -428,15 +428,21 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx, SAFE_FREE(ads->auth.user_name); if (r->in.account) { ads->auth.user_name = SMB_STRDUP(r->in.account); - } else if (ctx->username) { - ads->auth.user_name = SMB_STRDUP(ctx->username); + } else { + const char *username = cli_credentials_get_username(ctx->creds); + if (username != NULL) { + ads->auth.user_name = SMB_STRDUP(username); + } } SAFE_FREE(ads->auth.password); if (r->in.password) { ads->auth.password = SMB_STRDUP(r->in.password); - } else if (ctx->password) { - ads->auth.password = SMB_STRDUP(ctx->password); + } else { + const char *password = cli_credentials_get_password(ctx->creds); + if (password != NULL) { + ads->auth.password = SMB_STRDUP(password); + } } ads_status = ads_connect_user_creds(ads); |