summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:04:15 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:59 -0800
commitd57869d5246b4fe86f9008faffc5a78b0d2f064f (patch)
tree53d118bb6b6d991b42c6e9d3db3b22bdc075e774
parent1f68d3371899e78e9bed6d74ae385c761bfd3442 (diff)
downloadsamba-d57869d5246b4fe86f9008faffc5a78b0d2f064f.tar.gz
samba-d57869d5246b4fe86f9008faffc5a78b0d2f064f.tar.xz
samba-d57869d5246b4fe86f9008faffc5a78b0d2f064f.zip
param: Rename variable used for lp_maxmux max_mux
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index fa3d5a6ed9..8d1fc44eca 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -312,7 +312,7 @@ FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
FN_GLOBAL_INTEGER(max_log_size, max_log_size)
-FN_GLOBAL_INTEGER(maxmux, max_mux)
+FN_GLOBAL_INTEGER(maxmux, maxmux)
FN_GLOBAL_INTEGER(max_open_files, max_open_files)
FN_GLOBAL_INTEGER(max_smbd_processes, iMaxSmbdProcesses)
FN_GLOBAL_INTEGER(max_stat_cache_size, iMaxStatCacheSize)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 5e6be21535..baeb2f0764 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1519,7 +1519,7 @@ static struct parm_struct parm_table[] = {
.label = "max mux",
.type = P_INTEGER,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(max_mux),
+ .offset = GLOBAL_VAR(maxmux),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b6f15a9bdc..f6a39c482e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -814,7 +814,7 @@ static void init_globals(bool reinit_globals)
/* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */
/* Discovered by 2 days of pain by Don McCall @ HP :-). */
Globals.max_xmit = 0x4104;
- Globals.max_mux = 50; /* This is *needed* for profile support. */
+ Globals.maxmux = 50; /* This is *needed* for profile support. */
Globals.lpqcachetime = 30; /* changed to handle large print servers better -- jerry */
Globals._disable_spoolss = false;
Globals.iMaxSmbdProcesses = 0;/* no limit specified */