smbdotconf: mark "delete group script" with substitution="1"
authorRalph Boehme <slow@samba.org>
Mon, 4 Nov 2019 16:25:09 +0000 (17:25 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 27 Nov 2019 10:25:34 +0000 (10:25 +0000)
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
docs-xml/smbdotconf/logon/deletegroupscript.xml
source3/groupdb/mapping.c

index cad0c2a86654c3c855c99712d86f0c888da73970..be8bb0d92271fec7b946320d02d5bde76c76ec04 100644 (file)
@@ -1,6 +1,7 @@
 <samba:parameter name="delete group script"
                  context="G"
-                                type="string"
+                 type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>This is the full pathname to a script that will 
index 26b5ad0facbbb2ef182472229a741967bb625906..ed1d5716956a20225b5ba69c92b80234f3432dd6 100644 (file)
@@ -280,16 +280,18 @@ int smb_create_group(const char *unix_group, gid_t *new_gid)
 
 int smb_delete_group(const char *unix_group)
 {
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        char *del_script = NULL;
        int ret = -1;
 
        /* defer to scripts */
 
-       if ( *lp_delete_group_script(talloc_tos()) ) {
+       if ( *lp_delete_group_script(talloc_tos(), lp_sub) ) {
                TALLOC_CTX *ctx = talloc_tos();
 
                del_script = talloc_strdup(ctx,
-                               lp_delete_group_script(ctx));
+                               lp_delete_group_script(ctx, lp_sub));
                if (!del_script) {
                        return -1;
                }