sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

printing: check lp_load_printers() prior to pcap cache update

Browse Source 
Avoid explicit and housekeeping timer triggered printcap cache updates
if lp_load_printers() is disabled.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13766

Signed-off-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Fri Feb  1 19:25:03 CET 2019 on sn-devel-144
This commit is contained in:
David Disseldorp 2019-01-29 01:55:04 +01:00 committed by Noel Power
parent 0ae7c3144a
commit 6a77237c50
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/printing/pcap.c
View File

@ -139,6 +139,11 @@ void pcap_cache_reload(struct tevent_context *ev,
DEBUG(3, ("reloading printcap cache\n")); DEBUG(3, ("reloading printcap cache\n"));
if (!lp_load_printers()) {
DBG_NOTICE("skipping reload - load printers disabled\n");
return;
}
/* only go looking if no printcap name supplied */ /* only go looking if no printcap name supplied */
if (pcap_name == NULL || *pcap_name == 0) { if (pcap_name == NULL || *pcap_name == 0) {
DEBUG(0, ("No printcap file name configured!\n")); DEBUG(0, ("No printcap file name configured!\n"));

2
source3/printing/queue_process.c
View File

@ -172,7 +172,7 @@ static bool printing_subsystem_queue_tasks(struct bq_state *state)
/* cancel any existing housekeeping event */ /* cancel any existing housekeeping event */
TALLOC_FREE(state->housekeep); TALLOC_FREE(state->housekeep);
if (housekeeping_period == 0) { if ((housekeeping_period == 0) || !lp_load_printers()) {
DEBUG(4, ("background print queue housekeeping disabled\n")); DEBUG(4, ("background print queue housekeeping disabled\n"));
return true; return true;
} }