summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-04 15:09:00 +1300
committerJeremy Allison <jra@samba.org>2014-02-07 16:19:12 -0800
commitae64a8ecd977d894e6ada253289d6369eec2f905 (patch)
tree65222a635b29fab08089cba9d55e1b5d3215a69f
parent216d9691803ce58da97458466fd0d2f964c26b83 (diff)
downloadsamba-ae64a8ecd977d894e6ada253289d6369eec2f905.tar.gz
param: rename lp function and variable from "addusertogroup_script" to "add_user_to_group_script"
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/groupdb/mapping.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 686484e0192..4c79b066c66 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -373,7 +373,7 @@ FN_GLOBAL_STRING(addport_cmd, addport_cmd)
FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd)
FN_GLOBAL_STRING(add_share_cmd, add_share_cmd)
FN_GLOBAL_STRING(add_user_script, add_user_script)
-FN_GLOBAL_STRING(addusertogroup_script, addusertogroup_script)
+FN_GLOBAL_STRING(add_user_to_group_script, add_user_to_group_script)
FN_GLOBAL_STRING(auto_services, auto_services)
FN_GLOBAL_STRING(change_share_cmd, change_share_cmd)
FN_GLOBAL_STRING(check_password_script, check_password_script)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 85ef490e4ef..48d7a8dfb07 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2638,7 +2638,7 @@ static struct parm_struct parm_table[] = {
.label = "add user to group script",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(addusertogroup_script),
+ .offset = GLOBAL_VAR(add_user_to_group_script),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index dfa825792da..f4313602abf 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -346,11 +346,11 @@ int smb_add_user_group(const char *unix_group, const char *unix_user)
/* defer to scripts */
- if ( *lp_addusertogroup_script(talloc_tos()) ) {
+ if ( *lp_add_user_to_group_script(talloc_tos()) ) {
TALLOC_CTX *ctx = talloc_tos();
add_script = talloc_strdup(ctx,
- lp_addusertogroup_script(ctx));
+ lp_add_user_to_group_script(ctx));
if (!add_script) {
return -1;
}