param: Rename variable used for lp_serverstring szServerString

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 00e48999519ff29faf0adfce92a6882c3c1dfdfc..8d222431dc5350aed4e99101dab4a292c61aa380 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -404,7 +404,7 @@ FN_GLOBAL_STRING(remote_announce, remote_announce)
 FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)
 FN_GLOBAL_STRING(renameuser_script, renameuser_script)
 FN_GLOBAL_STRING(rootdir, rootdir)
-FN_GLOBAL_STRING(serverstring, szServerString)
+FN_GLOBAL_STRING(serverstring, serverstring)
 FN_GLOBAL_STRING(setprimarygroup_script, szSetPrimaryGroupScript)
 FN_GLOBAL_STRING(set_quota_command, szSetQuota)
 FN_GLOBAL_STRING(share_backend, szShareBackend)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index b25fdb20df16e877291f44d9456f225e45156586..35a75af5356361284a3d8e8438dccd6b26e68b1f 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -373,7 +373,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server string",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szServerString),
+               .offset         = GLOBAL_VAR(serverstring),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0402a131f499978e4b3ab76922c315f936c2daec..6c17b40c83648c451d3c67e56277cb9b05dd497a 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -787,7 +787,7 @@ static void init_globals(bool reinit_globals)
        if (asprintf(&s, "Samba %s", samba_version_string()) < 0) {
                smb_panic("init_globals: ENOMEM");
        }
-       string_set(&Globals.szServerString, s);
+       string_set(&Globals.serverstring, s);
        SAFE_FREE(s);
 #ifdef DEVELOPER
        string_set(&Globals.panic_action, "/bin/sleep 999999999");
@@ -1732,7 +1732,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
                return false;
 
        if (asprintf(&comment, "IPC Service (%s)",
-                               Globals.szServerString) < 0) {
+                               Globals.serverstring) < 0) {
                return false;
        }