param: rename lp function and variable from "addport_cmd" to "addport_command"

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 53a0dc59cc0f1349b9b3c3bacc55583b5a5489d4..f7605a097f77472939c6453b5cca94b980e49816 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -369,7 +369,7 @@ 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(add_machine_script, add_machine_script)
-FN_GLOBAL_STRING(addport_cmd, addport_cmd)
+FN_GLOBAL_STRING(addport_command, addport_command)
 FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd)
 FN_GLOBAL_STRING(add_share_command, add_share_command)
 FN_GLOBAL_STRING(add_user_script, add_user_script)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index cc7165561c7c04de9d6bfaa03ae06e7601b7e821..e49981c22953ee09e741623e8587cfdfc8c69c40 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2239,7 +2239,7 @@ static struct parm_struct parm_table[] = {
                .label          = "addport command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(addport_cmd),
+               .offset         = GLOBAL_VAR(addport_command),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index c1d4dc043552cb754362a1590e96ebbc3e19f36a..48cd17c93b1c10b0161e7d4e3806957be7d6b1c1 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -6179,7 +6179,7 @@ static bool check_printer_ok(TALLOC_CTX *mem_ctx,
 
 static WERROR add_port_hook(TALLOC_CTX *ctx, struct security_token *token, const char *portname, const char *uri)
 {
-       char *cmd = lp_addport_cmd(talloc_tos());
+       char *cmd = lp_addport_command(talloc_tos());
        char *command = NULL;
        int ret;
        bool is_print_op = false;