param: rename lp function and variable from "addmachine_script" to "add_machine_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 ba33b0482917c15c8098617f6f81a9fcc9080e48..250053c6d5f358397cc27518f63fb22840a1c67e 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -368,7 +368,7 @@ FN_GLOBAL_LIST(winbind_nss_info, winbind_nss_info)
 FN_GLOBAL_LIST(wins_server_list, wins_server_list)
 FN_GLOBAL_STRING(abort_shutdown_script, abort_shutdown_script)
 FN_GLOBAL_STRING(add_group_script, add_group_script)
-FN_GLOBAL_STRING(addmachine_script, addmachine_script)
+FN_GLOBAL_STRING(add_machine_script, add_machine_script)
 FN_GLOBAL_STRING(addport_cmd, addport_cmd)
 FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd)
 FN_GLOBAL_STRING(add_share_cmd, add_share_cmd)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 543a2c9707fcdbd3c588560a135eea4936cf2e1e..5f7e06e24306cdc43bda669d867d7e40e1cc2967 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2665,7 +2665,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add machine script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(addmachine_script),
+               .offset         = GLOBAL_VAR(add_machine_script),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index edadddbb282863ba452fd304f83cb5faa11fbe8b..6fadcef8a80a003ea6f98c6a775ba761bab7584f 100644 (file)
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -674,7 +674,7 @@ static NTSTATUS smb_create_user(TALLOC_CTX *mem_ctx,
        } else if ( (acct_flags & ACB_WSTRUST) ||
                    (acct_flags & ACB_SVRTRUST) ||
                    (acct_flags & ACB_DOMTRUST) ) {
-               add_script = lp_addmachine_script(mem_ctx);
+               add_script = lp_add_machine_script(mem_ctx);
        } else {
                DEBUG(1, ("Unknown user type: %s\n",
                          pdb_encode_acct_ctrl(acct_flags, NEW_PW_FORMAT_SPACE_PADDED_LEN)));

diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index c09474e9b7f14b6d83ff5b5adf3466aa64f4ccc2..fd5388a2ccfc2c808745f4e97a54319555bcfe96 100644 (file)
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -254,7 +254,7 @@ static NTSTATUS smb_create_user(TALLOC_CTX *mem_ctx,
        } else if ( (acct_flags & ACB_WSTRUST) ||
                    (acct_flags & ACB_SVRTRUST) ||
                    (acct_flags & ACB_DOMTRUST) ) {
-               add_script = lp_addmachine_script(mem_ctx);
+               add_script = lp_add_machine_script(mem_ctx);
        } else {
                DEBUG(1, ("Unknown user type: %s\n",
                          pdb_encode_acct_ctrl(acct_flags, NEW_PW_FORMAT_SPACE_PADDED_LEN)));

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 8529aa24402e8514688cf64188ac536f223760e5..12b2f6e16deca30c7d48c3716b321c8335b953da 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -461,7 +461,7 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
                if ((acb_info & ACB_NORMAL) && name[strlen(name)-1] != '$') {
                        add_script = lp_adduser_script(tmp_ctx);
                } else {
-                       add_script = lp_addmachine_script(tmp_ctx);
+                       add_script = lp_add_machine_script(tmp_ctx);
                }
 
                if (!add_script || add_script[0] == '\0') {