From: Ralph Boehme <slow@samba.org>
Date: Tue, 5 Nov 2019 11:11:54 +0000 (+0100)
Subject: smbdotconf: mark "username map" with substitution="1"
X-Git-Tag: ldb-2.1.0~524
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c68114e73421b5b89b57582defd53faef275ca4;p=thirdparty%2Fsamba.git

smbdotconf: mark "username map" with substitution="1"

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

diff --git a/docs-xml/smbdotconf/security/usernamemap.xml b/docs-xml/smbdotconf/security/usernamemap.xml
index 8867ea6bdec..809a54c1e2f 100644
--- a/docs-xml/smbdotconf/security/usernamemap.xml
+++ b/docs-xml/smbdotconf/security/usernamemap.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="username map"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
index a76b5d47ba2..9e7a6840160 100644
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -281,8 +281,10 @@ bool user_in_list(TALLOC_CTX *ctx, const char *user, const char * const *list)
 
 bool map_username(TALLOC_CTX *ctx, const char *user_in, char **p_user_out)
 {
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	FILE *f;
-	char *mapfile = lp_username_map(talloc_tos());
+	char *mapfile = lp_username_map(talloc_tos(), lp_sub);
 	char *s;
 	char buf[512];
 	bool mapped_user = False;