From: Andreas Schneider <asn@samba.org>
Date: Thu, 18 Mar 2021 10:36:37 +0000 (+0100)
Subject: s3:netapi: Remove username from 'struct libnetapi_ctx'
X-Git-Tag: tevent-0.11.0~1415
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d94053f9d8b1fdce61e90d3942e75b02e2d3209c;p=thirdparty%2Fsamba.git

s3:netapi: Remove username from 'struct libnetapi_ctx'

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index 21890ecfabc..8d5c8c85f5a 100644
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -131,17 +131,6 @@ NET_API_STATUS libnetapi_net_init(struct libnetapi_ctx **context)
 
 	cli_credentials_guess(ctx->creds, lp_ctx);
 
-	if (getenv("USER")) {
-		ctx->username = talloc_strdup(ctx, getenv("USER"));
-	} else {
-		ctx->username = talloc_strdup(ctx, "");
-	}
-	if (!ctx->username) {
-		TALLOC_FREE(frame);
-		fprintf(stderr, "libnetapi_init: out of memory\n");
-		return W_ERROR_V(WERR_NOT_ENOUGH_MEMORY);
-	}
-
 	status = libnetapi_init_private_context(ctx);
 	if (status != 0) {
 		TALLOC_FREE(frame);
@@ -291,13 +280,6 @@ NET_API_STATUS libnetapi_set_username(struct libnetapi_ctx *ctx,
 		return W_ERROR_V(WERR_INVALID_PARAMETER);
 	}
 
-	TALLOC_FREE(ctx->username);
-	ctx->username = talloc_strdup(ctx, username ? username : "");
-
-	if (!ctx->username) {
-		return W_ERROR_V(WERR_NOT_ENOUGH_MEMORY);
-	}
-
 	cli_credentials_parse_string(ctx->creds, username, CRED_SPECIFIED);
 
 	return NET_API_STATUS_SUCCESS;
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
index ba2f8bb2651..3a1f8c48846 100644
--- a/source3/lib/netapi/netapi_private.h
+++ b/source3/lib/netapi/netapi_private.h
@@ -57,7 +57,6 @@ struct libnetapi_private_ctx {
 struct libnetapi_ctx {
 	char *debuglevel;
 	char *error_string;
-	char *username;
 	char *workgroup;
 	char *password;
 	int use_kerberos;