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 load_printers

Browse Source
This commit is contained in:
Volker Lendecke 2010-08-08 22:54:43 +02:00
parent 1c1d83a532
commit 016418d6c2
4 changed files with 8 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

@ -4396,7 +4396,8 @@ bool lookup_wellknown_name(TALLOC_CTX *mem_ctx, const char *name,
/* The following definitions come from printing/load.c */
void load_printers(void);
void load_printers(struct tevent_context *ev,
struct messaging_context *msg_ctx);
/* The following definitions come from printing/lpq_parse.c */

6
source3/printing/load.c
View File

@ -52,11 +52,11 @@ static void add_auto_printers(void)
/***************************************************************************
load automatic printer services
***************************************************************************/
void load_printers(void)
void load_printers(struct tevent_context *ev,
struct messaging_context *msg_ctx)
{
if (!pcap_cache_loaded()) {
pcap_cache_reload(server_event_context(),
server_messaging_context());
pcap_cache_reload(ev, msg_ctx);
}
add_auto_printers();

2
source3/smbd/server_reload.c
View File

@ -79,7 +79,7 @@ void reload_printers(struct messaging_context *msg_ctx)
}
}
load_printers();
load_printers(server_event_context(), msg_ctx);
TALLOC_FREE(server_info);
}

4
source3/web/swat.c
View File

@ -491,7 +491,7 @@ static int save_reload(int snum)
return 0;
}
iNumNonAutoPrintServices = lp_numservices();
load_printers();
load_printers(server_event_context(), server_messaging_context());
return 1;
}
@ -1434,7 +1434,7 @@ const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid)
load_config(True);
load_interfaces();
iNumNonAutoPrintServices = lp_numservices();
load_printers();
load_printers(server_event_context(), server_messaging_context());
cgi_setup(get_dyn_SWATDIR(), !demo_mode);