From b68d13ed7b387d715904612a32abf6a5f9f59067 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 21 Jul 2015 14:23:47 +0200 Subject: [PATCH] param: turn 'min receivefile size' into a generated function Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- docs-xml/smbdotconf/protocol/minreceivefilesize.xml | 1 - lib/param/loadparm.h | 1 - source3/param/loadparm.c | 6 ++++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml index c5fed6a4045..60d48acc7ad 100644 --- a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml +++ b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml @@ -1,7 +1,6 @@ This option changes the behavior of smbd diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 19113523c29..2c40563fc8c 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -249,7 +249,6 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #define LOADPARM_EXTRA_GLOBALS \ struct parmlist_entry *param_opt; \ char *realm_original; \ - int min_receivefile_size; \ char *szPrintcapname; \ int CupsEncrypt; \ char *szIdmapUID; \ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 339ab8aa53b..d19e144b626 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4287,10 +4287,12 @@ void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val) int lp_min_receive_file_size(void) { - if (Globals.min_receivefile_size < 0) { + int min_receivefile_size = lp_min_receivefile_size(); + + if (min_receivefile_size < 0) { return 0; } - return Globals.min_receivefile_size; + return min_receivefile_size; } /******************************************************************* -- 2.34.1