summaryrefslogtreecommitdiff
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-11-08 15:13:41 -0800
committerJeremy Allison <jra@samba.org>2007-11-08 15:13:41 -0800
commit976b0ec487720982e456f8c3634be3df64882dae (patch)
treef7a9883ae8988f42ef98aa612e433e0c9613a03b /source3/param/loadparm.c
parente501c0cd44116ee6e42c14100fea526558c37cb2 (diff)
parent128fa582a62ad3e145c2bda93e4f939d5f62885f (diff)
downloadsamba-976b0ec487720982e456f8c3634be3df64882dae.tar.gz
samba-976b0ec487720982e456f8c3634be3df64882dae.tar.bz2
samba-976b0ec487720982e456f8c3634be3df64882dae.zip
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit d9335456d23271a4b15b97d24f1b263700a3b9df)
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 19af6aa3cf..07f8dc4144 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2169,7 +2169,6 @@ FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
-FN_GLOBAL_INTEGER(lp_min_receive_file_size, &Globals.iminreceivefile);
FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping)
/* local prototypes */
@@ -6242,3 +6241,11 @@ void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val)
posix_default_lock_was_set = True;
posix_cifsx_locktype = val;
}
+
+int lp_min_receive_file_size(void)
+{
+ if (Globals.iminreceivefile < 0) {
+ return 0;
+ }
+ return MIN(Globals.iminreceivefile, BUFFER_SIZE);
+}