From: Michael Adam Date: Tue, 21 Jul 2015 12:21:26 +0000 (+0200) Subject: param: rename iminreceivefile -> min_receivefile_size X-Git-Tag: talloc-2.1.4~527 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=863f7b93602e297211d75dcb8297296b0d4d51a1;p=thirdparty%2Fsamba.git param: rename iminreceivefile -> min_receivefile_size Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 4ed332c7672..19113523c29 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -249,7 +249,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #define LOADPARM_EXTRA_GLOBALS \ struct parmlist_entry *param_opt; \ char *realm_original; \ - int iminreceivefile; \ + int min_receivefile_size; \ char *szPrintcapname; \ int CupsEncrypt; \ char *szIdmapUID; \ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 4edd1676e8e..02f6e56d1b0 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1314,7 +1314,7 @@ struct parm_struct parm_table[] = { .label = "min receivefile size", .type = P_BYTES, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(iminreceivefile), + .offset = GLOBAL_VAR(min_receivefile_size), .special = NULL, .enum_list = NULL, }, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ad2305acdba..339ab8aa53b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -850,7 +850,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) /* By default no shares out of the registry */ Globals.registry_shares = false; - Globals.iminreceivefile = 0; + Globals.min_receivefile_size = 0; Globals.map_untrusted_to_domain = false; Globals.multicast_dns_register = true; @@ -4287,10 +4287,10 @@ void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val) int lp_min_receive_file_size(void) { - if (Globals.iminreceivefile < 0) { + if (Globals.min_receivefile_size < 0) { return 0; } - return Globals.iminreceivefile; + return Globals.min_receivefile_size; } /*******************************************************************