summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-04-15 01:50:13 +0200
committerStefan Metzmacher <metze@samba.org>2008-04-18 14:43:07 +0200
commitb7a141f8a72512302bd118ad5d4b9cf8c4c57564 (patch)
treeef1b7cd4443b945ae9e4090496f60675f41b9964
parent4f6089be35d5388695f5fcd89890756e17237e6c (diff)
downloadsamba-b7a141f8a72512302bd118ad5d4b9cf8c4c57564.tar.gz
samba-b7a141f8a72512302bd118ad5d4b9cf8c4c57564.tar.bz2
samba-b7a141f8a72512302bd118ad5d4b9cf8c4c57564.zip
smbd: merge "smbd:backgroundqueue=no" option from the v3-0-ctdb tree
metze (This used to be commit 16d295d466eb18e3bccce6fb26d53012d5f2c3e8)
-rw-r--r--source3/smbd/server.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index b71d6271f2..108a55033c 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1344,8 +1344,10 @@ extern void build_options(bool screen);
smbd is launched via inetd and we fork a copy of
ourselves here */
- if ( is_daemon && !interactive )
- start_background_queue();
+ if (is_daemon && !interactive
+ && lp_parm_bool(-1, "smbd", "backgroundqueue", true)) {
+ start_background_queue();
+ }
if (!open_sockets_smbd(is_daemon, interactive, ports))
exit(1);