From: Andreas Schneider <asn@samba.org>
Date: Thu, 18 Mar 2021 10:08:57 +0000 (+0100)
Subject: s3:netapi: Get username/password from cli_credentials in joindomain.c
X-Git-Tag: tevent-0.11.0~1417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0aeca4e5a131c38328c7768e173b845f594c3470;p=thirdparty%2Fsamba.git

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>
---

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);