summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@suse.de>2010-12-28 14:55:01 +0100
committerJeremy Allison <jra@samba.org>2011-01-07 15:37:39 -0800
commitff577762b9cb37355f9433850b2119a6411e21da (patch)
tree138a2a45c4d6d322e0fc5c610069d5592b44c72f /source3/printing
parent0b188e7784a3f58810f871bf63d10d8a691ecbae (diff)
downloadsamba-ff577762b9cb37355f9433850b2119a6411e21da.tar.gz
samba-ff577762b9cb37355f9433850b2119a6411e21da.tar.bz2
samba-ff577762b9cb37355f9433850b2119a6411e21da.zip
s3-printing: remove old entries in pcap_cache_replace
Callers of pcap_cache_replace() assume the existing printcap cache is replaced by the new values provided. This is not currently the case, old entries should be removed.
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/pcap.c22
-rw-r--r--source3/printing/pcap.h2
-rw-r--r--source3/printing/print_cups.c11
3 files changed, 24 insertions, 11 deletions
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index be267bd116..7a733b1c3c 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -97,13 +97,28 @@ bool pcap_cache_loaded(void)
return NT_STATUS_IS_OK(status);
}
-void pcap_cache_replace(const struct pcap_cache *pcache)
+bool pcap_cache_replace(const struct pcap_cache *pcache)
{
const struct pcap_cache *p;
+ NTSTATUS status;
+
+ status = printer_list_mark_reload();
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to mark printer list for reload!\n"));
+ return false;
+ }
for (p = pcache; p; p = p->next) {
pcap_cache_add(p->name, p->comment);
}
+
+ status = printer_list_clean_old();
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to cleanup printer list!\n"));
+ return false;
+ }
+
+ return true;
}
void pcap_cache_reload(struct tevent_context *ev,
@@ -175,7 +190,7 @@ void pcap_cache_reload(struct tevent_context *ev,
done:
DEBUG(3, ("reload status: %s\n", (pcap_reloaded) ? "ok" : "error"));
- if (pcap_reloaded) {
+ if ((pcap_reloaded) && (post_cache_fill_fn_handled == false)) {
/* cleanup old entries only if the operation was successful,
* otherwise keep around the old entries until we can
* successfuly reaload */
@@ -183,8 +198,7 @@ done:
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to cleanup printer list!\n"));
}
- if ((post_cache_fill_fn_handled == false)
- && (post_cache_fill_fn != NULL)) {
+ if (post_cache_fill_fn != NULL) {
post_cache_fill_fn(ev, msg_ctx);
}
}
diff --git a/source3/printing/pcap.h b/source3/printing/pcap.h
index 7f8f7d2baf..4198be1de5 100644
--- a/source3/printing/pcap.h
+++ b/source3/printing/pcap.h
@@ -24,7 +24,7 @@ bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, cons
void pcap_cache_destroy_specific(struct pcap_cache **ppcache);
bool pcap_cache_add(const char *name, const char *comment);
bool pcap_cache_loaded(void);
-void pcap_cache_replace(const struct pcap_cache *cache);
+bool pcap_cache_replace(const struct pcap_cache *cache);
void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char *, const char *, void *), void *);
void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *);
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 8c023ddb30..0e5dac5374 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -552,15 +552,18 @@ static void cups_async_callback(struct event_context *event_ctx,
TALLOC_FREE(frame);
if (tmp_pcap_cache) {
+ bool ret;
/* We got a namelist, replace our local cache. */
pcap_cache_destroy_specific(&local_pcap_copy);
local_pcap_copy = tmp_pcap_cache;
/* And the systemwide pcap cache. */
- pcap_cache_replace(local_pcap_copy);
+ ret = pcap_cache_replace(local_pcap_copy);
+ if (!ret)
+ DEBUG(0, ("failed to replace pcap cache\n"));
/* Caller may have requested post cache fill callback */
- if (cb_args->post_cache_fill_fn != NULL) {
+ if (ret && cb_args->post_cache_fill_fn != NULL) {
cb_args->post_cache_fill_fn(cb_args->event_ctx,
cb_args->msg_ctx);
}
@@ -611,10 +614,6 @@ bool cups_cache_reload(struct tevent_context *ev,
return false;
}
} else {
- /* Replace the system cache with our
- * local copy. */
- pcap_cache_replace(local_pcap_copy);
-
DEBUG(10,("cups_cache_reload: async read on fd %d\n",
*p_pipe_fd ));