sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

printing: drop pcap_cache_loaded() guard around load_printers()

Browse Source 
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>
This commit is contained in:
David Disseldorp
2019-01-29 01:50:15 +01:00
committed by Noel Power
parent bdb90ec974
commit 0ae7c3144a
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source3/printing/load.c
View File

@ -64,7 +64,9 @@ load automatic printer services from pre-populated pcap cache
***************************************************************************/
void load_printers(void)
{
SMB_ASSERT(pcap_cache_loaded(NULL));
if (!pcap_cache_loaded(NULL)) {
return;
}
add_auto_printers();

4
source3/printing/queue_process.c
View File

@ -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 */

8
source3/printing/spoolssd.c
View File

@ -288,9 +288,7 @@ static bool spoolss_child_init(struct tevent_context *ev_ctx,
* If so then we probably missed a message and should load_printers()
* ourselves. If pcap has not been loaded yet, then ignore, we will get
* a message as soon as the bq process completes the reload. */
if (pcap_cache_loaded(NULL)) {
load_printers();
}
load_printers();
/* try to reinit rpc queues */
spoolss_cb.init = spoolss_init_cb;
@ -699,9 +697,7 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx,
* If pcap has not been loaded yet, then ignore, as we will reload on
* client enumeration anyway.
*/
if (pcap_cache_loaded(NULL)) {
load_printers();
}
load_printers();
mem_ctx = talloc_new(NULL);
if (mem_ctx == NULL) {