From 4bfaf8cb4702f77bb546d3739bbacd5ac5187e33 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 17 Jan 2011 16:09:32 +0100 Subject: s3-printing: remove pcap_cache_loaded asserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pcap_cache_loaded() assertions were added to the (re)load_printers() functions, to ensure the caller had called pcap_cache_reload() prior to reloading printer shares. The problem is, pcap_cache_loaded() returns false if the the pcap_cache contains no printer entries. i.e. pcap_cache_reload() has run but not detected any printers. Remove these assertions, correct call ordering is already enforced. Signed-off-by: Günther Deschner The last 3 patches address bug #7836 (A newly added printer isn't visbile to clients). (cherry picked from commit da9b2d9d58193ed3da36c2f8ff1e41a1e743ba07) --- source3/printing/load.c | 2 -- source3/smbd/server.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/source3/printing/load.c b/source3/printing/load.c index 00da9cb2921..c80a4794fbb 100644 --- a/source3/printing/load.c +++ b/source3/printing/load.c @@ -57,8 +57,6 @@ load automatic printer services from pre-populated pcap cache ***************************************************************************/ void load_printers(void) { - SMB_ASSERT(pcap_cache_loaded()); - add_auto_printers(); /* load all printcap printers */ diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 6147526172c..9c2709caf6b 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -715,8 +715,6 @@ void reload_printers(void) int pnum = lp_servicenumber(PRINTERS_NAME); const char *pname; - SMB_ASSERT(pcap_cache_loaded()); - DEBUG(10, ("reloading printer services from pcap cache\n")); for (snum = 0; snum < n_services; snum++) { /* avoid removing PRINTERS_NAME or non-autoloaded printers */ -- cgit v1.2.1