smbdotconf: mark "add user to group 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/addusertogroupscript.xml b/docs-xml/smbdotconf/logon/addusertogroupscript.xml
index d871ead05d2229d2f8794657be10149f5ac66be5..f6e9cc2d967721831dc155304dfcde4c12e14864 100644 (file)
--- a/docs-xml/smbdotconf/logon/addusertogroupscript.xml
+++ b/docs-xml/smbdotconf/logon/addusertogroupscript.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="add user to group script"
                  context="G"
-                                type="string"
+                 type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 634f94dc37eff47a4e2be47eaa2ef7fc7c6720bb..26b5ad0facbbb2ef182472229a741967bb625906 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -357,16 +357,18 @@ int smb_set_primary_group(const char *unix_group, const char* unix_user)
 
 int smb_add_user_group(const char *unix_group, const char *unix_user)
 {
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        char *add_script = NULL;
        int ret = -1;
 
        /* defer to scripts */
 
-       if ( *lp_add_user_to_group_script(talloc_tos()) ) {
+       if ( *lp_add_user_to_group_script(talloc_tos(), lp_sub) ) {
                TALLOC_CTX *ctx = talloc_tos();
 
                add_script = talloc_strdup(ctx,
-                               lp_add_user_to_group_script(ctx));
+                               lp_add_user_to_group_script(ctx, lp_sub));
                if (!add_script) {
                        return -1;
                }