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>
(cherry picked from commit 0ae7c3144a30910adb1e54cf46d54d42a1036839)

diff --git a/source3/printing/load.c b/source3/printing/load.c
index 51495f970db6217af7bf284b0753a25cba487899..7e25d5a91c71c07bffcf48bb2a39716ef50b8350 100644 (file)
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -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();
 

diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c
index c4648ce2b6ac200b29980030c1f02ce768b64e94..2a17f677c8aacadb0893f3a1900a3460fc0f34d4 100644 (file)
--- 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 */

diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index ca1eda918790dc22233031def09eb0d3ca6c1fd5..06c46a69dd65433421df736e8606818dd7fb2f95 100644 (file)
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -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) {