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 c5fed6a40458b4863b2670471429bb52c9897712..60d48acc7add27719bf6608f93073ecf70b4d123 100644 (file)
--- 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 19113523c295201fe5711454e227979e87d231c3..2c40563fc8cb75b2fe0ac9f914bad7ce489d8e3a 100644 (file)
--- 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 339ab8aa53bfd0d96fddd6c28424a82ab20856a7..d19e144b6263d7e17db4af43e289a1fecdd8c74f 100644 (file)
--- 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;
 }
 
 /*******************************************************************