From: Michael Adam <obnox@samba.org>
Date: Tue, 21 Jul 2015 12:23:47 +0000 (+0200)
Subject: param: turn 'min receivefile size' into a generated function
X-Git-Tag: talloc-2.1.4~526
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=b68d13ed7b387d715904612a32abf6a5f9f59067

param: turn 'min receivefile size' into a generated function

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

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 @@
 <samba:parameter name="min receivefile size"
                  type="integer"
                  context="G"
-                 generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option changes the behavior of <citerefentry><refentrytitle>smbd</refentrytitle>
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;
 }
 
 /*******************************************************************