From b61019f37900823f213daefbfaa31262868c10fd Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 4 Feb 2014 15:09:01 +1300 Subject: [PATCH] param: rename lp function and variable from "setprimarygroup_script" to "set_primary_group_script" Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/groupdb/mapping.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 75bc181e763..a6456f00bb1 100644 --- 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 7b91198c1d3..f787007edb1 100644 --- 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 52daa1e4bc1..ec4c11dd43a 100644 --- 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; } -- 2.11.4.GIT