sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3: Remove the smbd_messaging_context from pcap_cache_reload

Browse Source
This commit is contained in:
Volker Lendecke 2010-08-08 22:53:02 +02:00
parent 795589b4f8
commit 1c1d83a532
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/proto.h
View File

@ -4467,7 +4467,8 @@ void notify_printer_byname(struct tevent_context *ev,
/* The following definitions come from printing/pcap.c */
void pcap_cache_reload(void);
void pcap_cache_reload(struct tevent_context *ev,
struct messaging_context *msg_ctx);
bool pcap_printername_ok(const char *printername);
/* The following definitions come from printing/printing.c */

6
source3/printing/load.c
View File

@ -54,8 +54,10 @@ load automatic printer services
***************************************************************************/
void load_printers(void)
{
if (!pcap_cache_loaded())
pcap_cache_reload();
if (!pcap_cache_loaded()) {
pcap_cache_reload(server_event_context(),
server_messaging_context());
}
add_auto_printers();

6
source3/printing/pcap.c
View File

@ -101,7 +101,8 @@ void pcap_cache_replace(const struct pcap_cache *pcache)
}
}
void pcap_cache_reload(void)
void pcap_cache_reload(struct tevent_context *ev,
struct messaging_context *msg_ctx)
{
const char *pcap_name = lp_printcapname();
bool pcap_reloaded = False;
@ -120,8 +121,7 @@ void pcap_cache_reload(void)
#ifdef HAVE_CUPS
if (strequal(pcap_name, "cups")) {
pcap_reloaded = cups_cache_reload(server_event_context(),
server_messaging_context());
pcap_reloaded = cups_cache_reload(ev, msg_ctx);
goto done;
}
#endif

2
source3/smbd/server_reload.c
View File

@ -40,7 +40,7 @@ void reload_printers(struct messaging_context *msg_ctx)
NTSTATUS status;
bool skip = false;
pcap_cache_reload();
pcap_cache_reload(server_event_context(), msg_ctx);
status = make_server_info_system(talloc_tos(), &server_info);
if (!NT_STATUS_IS_OK(status)) {