diff options
| author | Christian Ambach <ambi@samba.org> | 2012-09-23 08:39:49 +0200 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2012-09-23 17:10:29 -0700 |
| commit | 9f589ea4066099ed50e7f2323f572b3a8c98c60e (patch) | |
| tree | dac7e77acab58cbf48b23b61a662bdabc7d84af1 | |
| parent | 5f973631b6ba6666ecf5f026d07dded9da15650e (diff) | |
| download | samba-9f589ea4066099ed50e7f2323f572b3a8c98c60e.tar.gz samba-9f589ea4066099ed50e7f2323f572b3a8c98c60e.tar.bz2 samba-9f589ea4066099ed50e7f2323f572b3a8c98c60e.zip | |
s3:printing only do printing_subsystem_update when printing is enabled
no point in calling this if printing was disabled and no spoolss service was started
this hurts CTDB clusters as the smbds on the cluster nodes will fight for the single record in the TDB
This fixes Bug 9197 - Disabling printing still makes smbd create and access printer_list.tdb
| -rw-r--r-- | source3/smbd/server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index d53b19a57f..15762d84e9 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1529,7 +1529,10 @@ extern void build_options(bool screen); /* do a printer update now that all messaging has been set up, * before we allow clients to start connecting */ - printing_subsystem_update(ev_ctx, msg_ctx, false); + if (!lp__disable_spoolss() && + (rpc_spoolss_daemon() != RPC_DAEMON_DISABLED)) { + printing_subsystem_update(ev_ctx, msg_ctx, false); + } TALLOC_FREE(frame); /* make sure we always have a valid stackframe */ |