sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

printing: return last change time with pcap_cache_loaded()

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10652

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
David Disseldorp 2014-07-23 12:12:34 +02:00 committed by Andreas Schneider
parent 6d75e20ca8
commit 30ce835670
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/printing/load.c
View File

@ -65,7 +65,7 @@ load automatic printer services from pre-populated pcap cache
void load_printers(struct tevent_context *ev,
struct messaging_context *msg_ctx)
{
SMB_ASSERT(pcap_cache_loaded());
SMB_ASSERT(pcap_cache_loaded(NULL));
add_auto_printers();

10
source3/printing/pcap.c
View File

@ -83,13 +83,19 @@ void pcap_cache_destroy_specific(struct pcap_cache **pp_cache)
*pp_cache = NULL;
}
bool pcap_cache_loaded(void)
bool pcap_cache_loaded(time_t *_last_change)
{
NTSTATUS status;
time_t last;
status = printer_list_get_last_refresh(&last);
return NT_STATUS_IS_OK(status);
if (!NT_STATUS_IS_OK(status)) {
return false;
}
if (_last_change != NULL) {
*_last_change = last;
}
return true;
}
bool pcap_cache_replace(const struct pcap_cache *pcache)

2
source3/printing/pcap.h
View File

@ -35,7 +35,7 @@ struct pcap_cache;
bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, const char *comment, const char *location);
void pcap_cache_destroy_specific(struct pcap_cache **ppcache);
bool pcap_cache_loaded(void);
bool pcap_cache_loaded(time_t *_last_change);
bool pcap_cache_replace(const struct pcap_cache *cache);
void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char *, const char *, const char *, void *), void *);
void pcap_printer_read_fn(void (*fn)(const char *, const char *, const char *, void *), void *);

2
source3/printing/queue_process.c
View File

@ -390,7 +390,7 @@ void printing_subsystem_update(struct tevent_context *ev_ctx,
bool force)
{
if (background_lpq_updater_pid != -1) {
if (pcap_cache_loaded()) {
if (pcap_cache_loaded(NULL)) {
load_printers(ev_ctx, msg_ctx);
}
if (force) {

4
source3/printing/spoolssd.c
View File

@ -304,7 +304,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()) {
if (pcap_cache_loaded(NULL)) {
load_printers(ev_ctx, msg_ctx);
}
@ -724,7 +724,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()) {
if (pcap_cache_loaded(NULL)) {
load_printers(ev_ctx, msg_ctx);
}