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

smbdotconf: mark "username map script" 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/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml
index 0edd4eb25c3..86118f305bc 100644
--- a/docs-xml/smbdotconf/security/usernamemapscript.xml
+++ b/docs-xml/smbdotconf/security/usernamemapscript.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="username map script"
                  context="G"
                  type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This script is a mutually exclusive alternative to the 
diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
index 9e7a6840160..f4bdd2d323e 100644
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -288,7 +288,7 @@ bool map_username(TALLOC_CTX *ctx, const char *user_in, char **p_user_out)
 	char *s;
 	char buf[512];
 	bool mapped_user = False;
-	char *cmd = lp_username_map_script(talloc_tos());
+	char *cmd = lp_username_map_script(talloc_tos(), lp_sub);
 
 	*p_user_out = NULL;