diff options
| author | Gerald Carter <jerry@samba.org> | 2004-05-27 15:38:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:49 -0500 |
| commit | 7959cba656133840c37d293ffab6831f3097016f (patch) | |
| tree | 356d488c22648f7159a9f32bbc53726645e2309a /source3/smbd | |
| parent | 73b9376e26e7e16c05cad6bc83ca1235a0436eb3 (diff) | |
| download | samba-7959cba656133840c37d293ffab6831f3097016f.tar.gz samba-7959cba656133840c37d293ffab6831f3097016f.tar.bz2 samba-7959cba656133840c37d293ffab6831f3097016f.zip | |
r925: add changes frpm trunk (r841 and r842) -- enable background queue update process and allow printers to have different sharenames from printernames
(This used to be commit 066b9c4276a968788a03709a00d4f672ac032df7)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/server.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index f25d42711d..343a835be8 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -849,12 +849,13 @@ void build_options(BOOL screen); /* Setup the main smbd so that we can get messages. */ claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); - /* - DO NOT ENABLE THIS TILL YOU COPE WITH KILLING THESE TASKS AND INETD - THIS *killed* LOTS OF BUILD FARM MACHINES. IT CREATED HUNDREDS OF - smbd PROCESSES THAT NEVER DIE - start_background_queue(); - */ + /* only start the background queue daemon if we are + running as a daemon -- bad things will happen if + smbd is launched via inetd and we fork a copy of + ourselves here */ + + if ( is_daemon ) + start_background_queue(); if (!open_sockets_smbd(is_daemon, interactive, ports)) exit(1); |