param: rename lp function and variable from "deluserfromgroup_script" to "delete_user...

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 5d41356818798e07079883cb47821ecbae20ea26..dbfbe6d2f769ef48aa4084ec23ad16cb38d71361 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -382,7 +382,7 @@ FN_GLOBAL_STRING(defaultservice, defaultservice)
 FN_GLOBAL_STRING(deleteprinter_cmd, deleteprinter_cmd)
 FN_GLOBAL_STRING(delete_share_cmd, delete_share_cmd)
 FN_GLOBAL_STRING(delete_group_script, delete_group_script)
-FN_GLOBAL_STRING(deluserfromgroup_script, deluserfromgroup_script)
+FN_GLOBAL_STRING(delete_user_from_group_script, delete_user_from_group_script)
 FN_GLOBAL_STRING(deluser_script, deluser_script)
 FN_GLOBAL_STRING(enumports_cmd, enumports_cmd)
 FN_GLOBAL_STRING(get_quota_command, get_quota_command)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index c4306280ded8095254b6ff8f9b00215cfed45a10..dba7701d7d146a5d64e5b1c6b34bccabd9896cc2 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2647,7 +2647,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete user from group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(deluserfromgroup_script),
+               .offset         = GLOBAL_VAR(delete_user_from_group_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index d99f8d59bad668f5feaad07072e121c8467e56cb..52daa1e4bc1f1c1c7827439cf76c38116286267b 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -386,11 +386,11 @@ int smb_delete_user_group(const char *unix_group, const char *unix_user)
 
        /* defer to scripts */
 
-       if ( *lp_deluserfromgroup_script(talloc_tos()) ) {
+       if ( *lp_delete_user_from_group_script(talloc_tos()) ) {
                TALLOC_CTX *ctx = talloc_tos();
 
                del_script = talloc_strdup(ctx,
-                               lp_deluserfromgroup_script(ctx));
+                               lp_delete_user_from_group_script(ctx));
                if (!del_script) {
                        return -1;
                }