param: rename lp function and variable from "ms_add_printer_wizard" to "show_add_prin...

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 1777980c173ed5fd38233f1a699acc57cfd83b92..ad105a07329066a54305245572cfc4189bcb3c7f 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -191,7 +191,7 @@ FN_GLOBAL_BOOL(load_printers, load_printers)
 FN_GLOBAL_BOOL(local_master, local_master)
 FN_GLOBAL_BOOL(log_writeable_files_on_exit, log_writeable_files_on_exit)
 FN_GLOBAL_BOOL(map_untrusted_to_domain, map_untrusted_to_domain)
-FN_GLOBAL_BOOL(ms_add_printer_wizard, ms_add_printer_wizard)
+FN_GLOBAL_BOOL(show_add_printer_wizard, show_add_printer_wizard)
 FN_GLOBAL_BOOL(multicast_dns_register, multicast_dns_register)
 FN_GLOBAL_BOOL(neutralize_nt4_emulation, neutralize_nt4_emulation)
 FN_GLOBAL_BOOL(nis_home_map, nis_home_map)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 8e6b4befc3129a3847feb07ff6b22a0401f75baa..dd1693fd89321a076523ed9ec4e8fabcf90087b4 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2275,7 +2275,7 @@ static struct parm_struct parm_table[] = {
                .label          = "show add printer wizard",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(ms_add_printer_wizard),
+               .offset         = GLOBAL_VAR(show_add_printer_wizard),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4192d10774d4453ecef8ea0cbda85999f1c83e39..66da386e06a837adbc5651794534c7bfde3e7623 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -935,7 +935,7 @@ static void init_globals(bool reinit_globals)
 
 */
 
-       Globals.ms_add_printer_wizard = true;
+       Globals.show_add_printer_wizard = true;
        Globals.os_level = 20;
        Globals.local_master = true;
        Globals._domain_master = Auto;  /* depending on _domain_logons */

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 1bc5eb0daf0f03ade53d8c31697273ad1be174de..dc90b7708edc5653741402dfe8ea8ab758b83c5b 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1804,7 +1804,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
 
                if ( r->in.access_mask & SERVER_ACCESS_ADMINISTER )
                {
-                       if (!lp_ms_add_printer_wizard()) {
+                       if (!lp_show_add_printer_wizard()) {
                                close_printer_handle(p, r->out.handle);
                                ZERO_STRUCTP(r->out.handle);
                                return WERR_ACCESS_DENIED;