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 128fa899120e64b664607db590d73960f2c0d102..22897cbef77f1b9bead20fb833e62286676c3bd7 100644 (file)
--- 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 71d2a753a5ec2f3d57823bd59330ce7ba505a678..03aa4ff8472198a4600797073cbcc97b5ac93467 100644 (file)
--- 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;
        }