diff options
| author | David Disseldorp <ddiss@samba.org> | 2019-01-29 01:50:15 +0100 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2019-02-01 16:08:25 +0100 |
| commit | 0ae7c3144a30910adb1e54cf46d54d42a1036839 (patch) | |
| tree | 59fd073271cd0938ab73ab68787fc273744471e5 /source3/printing/queue_process.c | |
| parent | bdb90ec974b31a6430a2f2329364b01d6f7270c6 (diff) | |
| download | samba-0ae7c3144a30910adb1e54cf46d54d42a1036839.tar.gz samba-0ae7c3144a30910adb1e54cf46d54d42a1036839.tar.bz2 samba-0ae7c3144a30910adb1e54cf46d54d42a1036839.zip | |
printing: drop pcap_cache_loaded() guard around load_printers()
Add the pcap_cache_loaded() check to load_printers() and return early
if it returns false. This simplifies callers in preparation for checking
lp_load_printers() in the printcap cache update code-path.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13766
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Diffstat (limited to 'source3/printing/queue_process.c')
| -rw-r--r-- | source3/printing/queue_process.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c index 1d60f259a86..197bde01086 100644 --- a/source3/printing/queue_process.c +++ b/source3/printing/queue_process.c @@ -483,9 +483,7 @@ void printing_subsystem_update(struct tevent_context *ev_ctx, bool force) { if (background_lpq_updater_pid != -1) { - if (pcap_cache_loaded(NULL)) { - load_printers(); - } + load_printers(); if (force) { /* Send a sighup to the background process. * this will force it to reload printers */ |