param: Rename variable used for lp_iprint_server szIPrintServer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 4244e477d89c3ade6f7f976d422f63540f82acc3..67e53f3e6e594f34361a87a958fafefeed8db319 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -387,7 +387,7 @@ FN_GLOBAL_STRING(deluserfromgroup_script, deluserfromgroup_script)
 FN_GLOBAL_STRING(deluser_script, deluser_script)
 FN_GLOBAL_STRING(enumports_cmd, enumports_cmd)
 FN_GLOBAL_STRING(get_quota_command, get_quota_command)
-FN_GLOBAL_STRING(iprint_server, szIPrintServer)
+FN_GLOBAL_STRING(iprint_server, iprint_server)
 FN_GLOBAL_STRING(ldap_admin_dn, szLdapAdminDn)
 FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix)
 FN_GLOBAL_STRING(logfile, logfile)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 456e48fee7f940d1284c21883a5f2317a650faef..1545670a8ed8311d4b0acb0f8480459774c3de52 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2149,7 +2149,7 @@ static struct parm_struct parm_table[] = {
                .label          = "iprint server",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szIPrintServer),
+               .offset         = GLOBAL_VAR(iprint_server),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4393cfbbf44fd9fdbc7bbc99026710b69cafca0b..1076479666e5a643ca8745a07e1567b98988d5a2 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -964,7 +964,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.winbindd_socket_directory, dyn_WINBINDD_SOCKET_DIR);
 
        string_set(&Globals.cups_server, "");
-       string_set(&Globals.szIPrintServer, "");
+       string_set(&Globals.iprint_server, "");
 
 #ifdef CLUSTER_SUPPORT
        string_set(&Globals.ctdbd_socket, CTDB_PATH);