summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-01-08 09:58:17 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-01-28 17:26:42 +1300
commit61a18071466e6973f0c366f4a6fd03ab5f18ecbd (patch)
tree9e05277af0b6f6fde60c41add3bfcf5f79f002fe
parent1f568678d6a0ccd6c2e89d40844451cb53b577d3 (diff)
downloadsamba-61a18071466e6973f0c366f4a6fd03ab5f18ecbd.tar.gz
samba-61a18071466e6973f0c366f4a6fd03ab5f18ecbd.tar.xz
samba-61a18071466e6973f0c366f4a6fd03ab5f18ecbd.zip
lib/param: add default for cups connection timeout
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
-rw-r--r--lib/param/loadparm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index c2ff7a5eaea..e3fbb512b80 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2242,6 +2242,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "max open files", "16384");
+ lpcfg_do_global_parameter(lp_ctx, "cups connection timeout", "30");
+
for (i = 0; parm_table[i].label; i++) {
if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
lp_ctx->flags[i] |= FLAG_DEFAULT;