From: Ralph Boehme <slow@samba.org>
Date: Mon, 4 Nov 2019 16:35:22 +0000 (+0100)
Subject: smbdotconf: mark "delete user script" with substitution="1"
X-Git-Tag: ldb-2.1.0~549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1377e66edfc1c6cdd40417a0b3b986bc106b6a3f;p=thirdparty%2Fsamba.git

smbdotconf: mark "delete user 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/logon/deleteuserscript.xml b/docs-xml/smbdotconf/logon/deleteuserscript.xml
index 128fa899120..22897cbef77 100644
--- a/docs-xml/smbdotconf/logon/deleteuserscript.xml
+++ b/docs-xml/smbdotconf/logon/deleteuserscript.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="delete user script"
-			     type="string"
+                 type="string"
                  context="G"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is the full pathname to a script that will 
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 71d2a753a5e..03aa4ff8472 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -551,6 +551,8 @@ NTSTATUS pdb_create_user(TALLOC_CTX *mem_ctx, const char *name, uint32_t flags,
 
 static int smb_delete_user(const char *unix_user)
 {
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	char *del_script = NULL;
 	int ret;
 
@@ -561,7 +563,7 @@ static int smb_delete_user(const char *unix_user)
 		return -1;
 	}
 
-	del_script = lp_delete_user_script(talloc_tos());
+	del_script = lp_delete_user_script(talloc_tos(), lp_sub);
 	if (!del_script || !*del_script) {
 		return -1;
 	}