Attachment 6209 Details for Bug 7836 – bso7836_35t-0001-s3-printing-remove-pcap_cache_loaded-asserts.patch

[patch] bso7836_35t-0001-s3-printing-remove-pcap_cache_loaded-asserts.patch

bso7836_35t-0001-s3-printing-remove-pcap_cache_loaded-asserts.patch (text/plain), 1.62 KB, created by David Disseldorp on 2011-01-17 13:29:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2011-01-17 13:29:43 UTC

Size: 1.62 KB

patch

obsolete

>From 0ffbdf4b8fb5ce4873235e87091022147c7c1293 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@suse.de>
>Date: Mon, 17 Jan 2011 16:09:32 +0100
>Subject: [PATCH] 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.
>---
> source3/printing/load.c |    2 --
> 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 00da9cb..c80a479 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 45d9270..2f88ae3 100644
>--- a/source3/smbd/server.c
>+++ b/source3/smbd/server.c
>@@ -760,8 +760,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 */
>-- 
>1.7.1
>

Flags:

gd: review+
asn: review+

Actions: View

Attachments on bug 7836: 6104 | 6105 | 6106 | 6107 | 6112 | 6113 | 6114 | 6115 | 6116 | 6117 | 6154 | 6170 | 6186 | 6188 | 6190 | 6191 | 6208 | 6209 | 6474 | 6475