From: Ralph Boehme <slow@samba.org>
Date: Thu, 31 Oct 2019 14:12:35 +0000 (+0100)
Subject: s3:param: rename lp_string() argument ctx to mem_ctx
X-Git-Tag: ldb-2.1.0~599
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c36dd5931850ae7ed6290718ecae7c3ebf257eb4;p=thirdparty%2Fsamba.git

s3:param: rename lp_string() argument ctx to mem_ctx

Minimizes diff of subsequent patch.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ff11146fe98..9a1c6107520 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -991,7 +991,7 @@ static struct loadparm_context *setup_lp_context(TALLOC_CTX *mem_ctx)
  callers without affecting the source string.
 ********************************************************************/
 
-char *lp_string(TALLOC_CTX *ctx, const char *s)
+char *lp_string(TALLOC_CTX *mem_ctx, const char *s)
 {
 	char *ret;
 
@@ -1007,14 +1007,14 @@ char *lp_string(TALLOC_CTX *ctx, const char *s)
 		return NULL;
 	}
 
-	ret = talloc_sub_basic(ctx,
+	ret = talloc_sub_basic(mem_ctx,
 			get_current_username(),
 			current_user_info.domain,
 			s);
 	if (trim_char(ret, '\"', '\"')) {
 		if (strchr(ret,'\"') != NULL) {
 			TALLOC_FREE(ret);
-			ret = talloc_sub_basic(ctx,
+			ret = talloc_sub_basic(mem_ctx,
 					get_current_username(),
 					current_user_info.domain,
 					s);