diff options
| author | David Disseldorp <ddiss@suse.de> | 2011-01-17 16:09:32 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-05-23 20:40:38 +0200 |
| commit | da9b2d9d58193ed3da36c2f8ff1e41a1e743ba07 (patch) | |
| tree | 6f0f4a7efde103e8e652e6ad5b41f4e804ada513 | |
| parent | ee094b53d7fd9c46bca57b9815993282c63af00c (diff) | |
| download | samba-da9b2d9d58193ed3da36c2f8ff1e41a1e743ba07.tar.gz | |
s3-printing: remove pcap_cache_loaded asserts
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 <gd@samba.org>
The last 3 patches address bug #7836 (A newly added printer isn't visbile to
clients).
| -rw-r--r-- | source3/printing/load.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 |
2 files changed, 0 insertions, 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 */ |