summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 22:54:43 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 23:37:47 +0200
commit016418d6c240da20f010d2bbd95051feef0a5244 (patch)
treed4d2458f123fcf3a2e77cd911f42e62df3389d38
parent1c1d83a5327b86042df7c33d075e05adff7a30f2 (diff)
downloadsamba-016418d6c240da20f010d2bbd95051feef0a5244.tar.gz
samba-016418d6c240da20f010d2bbd95051feef0a5244.tar.bz2
samba-016418d6c240da20f010d2bbd95051feef0a5244.zip
s3: Remove the smbd_messaging_context from load_printers
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/printing/load.c6
-rw-r--r--source3/smbd/server_reload.c2
-rw-r--r--source3/web/swat.c4
4 files changed, 8 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ace63aeabe..18b37543da 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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 */
diff --git a/source3/printing/load.c b/source3/printing/load.c
index 58ff8812f4..dd5d4ea277 100644
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -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();
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 22a5675e07..7512f8e482 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -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);
}
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 720018d15d..1250204d03 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -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);