param: rename lp function and variable from "renameuser_script" to "rename_user_script"

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 0483c1461d3fec6fe39dbc7785d3950a0d3d6976..bc6746b25b3104b5e33c0310ed0672c69d72e280 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -401,7 +401,7 @@ FN_GLOBAL_STRING(passwd_program, passwd_program)
 FN_GLOBAL_STRING(perfcount_module, perfcount_module)
 FN_GLOBAL_STRING(remote_announce, remote_announce)
 FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)
 FN_GLOBAL_STRING(perfcount_module, perfcount_module)
 FN_GLOBAL_STRING(remote_announce, remote_announce)
 FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)

-FN_GLOBAL_STRING(renameuser_script, renameuser_script)
+FN_GLOBAL_STRING(rename_user_script, rename_user_script)

 FN_GLOBAL_STRING(rootdir, rootdir)
 FN_GLOBAL_STRING(server_string, server_string)
 FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script)
 FN_GLOBAL_STRING(rootdir, rootdir)
 FN_GLOBAL_STRING(server_string, server_string)
 FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7616bbefb4ec272abeb5584a88800b0d22607863..746d8e4ad8de2c160c31767871f76f2b8cf29e08 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2602,7 +2602,7 @@ static struct parm_struct parm_table[] = {
                .label          = "rename user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
                .label          = "rename user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,

-               .offset         = GLOBAL_VAR(renameuser_script),
+               .offset         = GLOBAL_VAR(rename_user_script),

                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index bb0d3b3de90b6ede8f2a39fd713f4dd6f843ef2a..6be5fb62f5cfa095ca9a04a9f7791320980151fb 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1975,7 +1975,7 @@ static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods,
        oldname = pdb_get_username(old_acct);
 
        /* rename the posix user */
        oldname = pdb_get_username(old_acct);
 
        /* rename the posix user */

-       rename_script = lp_renameuser_script(talloc_tos());
+       rename_script = lp_rename_user_script(talloc_tos());

        if (rename_script == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
        if (rename_script == NULL) {
                return NT_STATUS_NO_MEMORY;
        }

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 8b0cd7aa360a7a407d3790028b05172acd2d5b1e..6e6fb5687e8bb241eaa303bfd214855a9d39a852 100644 (file)
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -1449,7 +1449,7 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods,
        TALLOC_CTX *ctx = talloc_tos();
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
 
        TALLOC_CTX *ctx = talloc_tos();
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
 

-       if (!*(lp_renameuser_script(talloc_tos())))
+       if (!*(lp_rename_user_script(talloc_tos())))

                goto done;
 
        if ( !(new_acct = samu_new( NULL )) ) {
                goto done;
 
        if ( !(new_acct = samu_new( NULL )) ) {


@@ -1469,7 +1469,7 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods,
        interim_account = True;
 
        /* rename the posix user */
        interim_account = True;
 
        /* rename the posix user */

-       rename_script = lp_renameuser_script(ctx);
+       rename_script = lp_rename_user_script(ctx);

        if (!rename_script) {
                ret = NT_STATUS_NO_MEMORY;
                goto done;
        if (!rename_script) {
                ret = NT_STATUS_NO_MEMORY;
                goto done;

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 162083f9c705ee34240134d6bf199a48b9db49f1..9dd445103df6361e8856df05a1e06b019b421d79 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -1002,7 +1002,7 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
                return NT_STATUS_NO_MEMORY;
        }
 
                return NT_STATUS_NO_MEMORY;
        }
 

-       rename_script = lp_renameuser_script(new_acct);
+       rename_script = lp_rename_user_script(new_acct);

        if (!rename_script) {
                TALLOC_FREE(new_acct);
                return NT_STATUS_NO_MEMORY;
        if (!rename_script) {
                TALLOC_FREE(new_acct);
                return NT_STATUS_NO_MEMORY;