param: rename lp function and variable from "addmachine_script" to "add_machine_script"
authorGarming Sam <garming@catalyst.net.nz>
Tue, 4 Feb 2014 02:09:00 +0000 (15:09 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 8 Feb 2014 00:19:12 +0000 (16:19 -0800)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/param_functions.c
lib/param/param_table.c
source3/libnet/libnet_dssync_passdb.c
source3/libnet/libnet_samsync_passdb.c
source3/passdb/pdb_interface.c

index ba33b04..250053c 100644 (file)
@@ -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)
index 543a2c9..5f7e06e 100644 (file)
@@ -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,
index edadddb..6fadcef 100644 (file)
@@ -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)));
index c09474e..fd5388a 100644 (file)
@@ -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)));
index 8529aa2..12b2f6e 100644 (file)
@@ -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') {