param: rename lp function and variable from "setprimarygroup_script" to "set_primary_...
authorGarming Sam <garming@catalyst.net.nz>
Tue, 4 Feb 2014 02:09:01 +0000 (15:09 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 8 Feb 2014 00:19:12 +0000 (16:19 -0800)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/param_functions.c
lib/param/param_table.c
source3/groupdb/mapping.c

index 75bc181..a6456f0 100644 (file)
@@ -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)
index 7b91198..f787007 100644 (file)
@@ -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,
index 52daa1e..ec4c11d 100644 (file)
@@ -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;
                }