param: rename lp function and variable from "setprimarygroup_script" to "set_primary_...

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 75bc181e76306c21f18d18ac81b1c0d82eebdc9f..a6456f00bb1cd2b4aece4ae3c134f1294787a844 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -404,7 +404,7 @@ FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)
 FN_GLOBAL_STRING(renameuser_script, renameuser_script)
 FN_GLOBAL_STRING(rootdir, rootdir)
 FN_GLOBAL_STRING(server_string, server_string)
-FN_GLOBAL_STRING(setprimarygroup_script, setprimarygroup_script)
+FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script)
 FN_GLOBAL_STRING(set_quota_command, set_quota_command)
 FN_GLOBAL_STRING(share_backend, share_backend)
 FN_GLOBAL_STRING(shutdown_script, shutdown_script)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7b91198c1d3c89dabf1531dbde9c4dca5a1b74bb..f787007edb10a4b9d466369c33bd4e505a9b6259 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2656,7 +2656,7 @@ static struct parm_struct parm_table[] = {
                .label          = "set primary group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(setprimarygroup_script),
+               .offset         = GLOBAL_VAR(set_primary_group_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 52daa1e4bc1f1c1c7827439cf76c38116286267b..ec4c11dd43aa655b5515987f9e0127e013bea3cb 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -304,11 +304,11 @@ int smb_set_primary_group(const char *unix_group, const char* unix_user)
 
        /* defer to scripts */
 
-       if ( *lp_setprimarygroup_script(talloc_tos()) ) {
+       if ( *lp_set_primary_group_script(talloc_tos()) ) {
                TALLOC_CTX *ctx = talloc_tos();
 
                add_script = talloc_strdup(ctx,
-                               lp_setprimarygroup_script(ctx));
+                               lp_set_primary_group_script(ctx));
                if (!add_script) {
                        return -1;
                }