summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 14:16:24 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:23 +0200
commitab196c7bfb531e854b1b4fce54c6b9c113991b6d (patch)
tree0e627d54ba16f3428879dc5d9f02bb968d8ab1bc
parente1af63fdeefdaa1ed2f6723a2fe6d8cf8fe1f40b (diff)
downloadsamba-ab196c7bfb531e854b1b4fce54c6b9c113991b6d.tar.gz
samba-ab196c7bfb531e854b1b4fce54c6b9c113991b6d.tar.bz2
samba-ab196c7bfb531e854b1b4fce54c6b9c113991b6d.zip
s3: Lift the smbd_messaging_context from enumprinterdrivers_level_by_architecture
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index bacd33cb51..9aaa7cfb10 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6731,6 +6731,7 @@ WERROR _spoolss_SetJob(struct pipes_struct *p,
static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *servername,
const char *architecture,
uint32_t level,
@@ -6750,8 +6751,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
*info_p = NULL;
for (version=0; version<DRIVER_MAX_VERSION; version++) {
- result = winreg_get_driver_list(mem_ctx, server_info,
- smbd_messaging_context(),
+ result = winreg_get_driver_list(mem_ctx, server_info, msg_ctx,
architecture, version,
&num_drivers, &drivers);
if (!W_ERROR_IS_OK(result)) {
@@ -6777,7 +6777,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
DEBUG(5, ("\tdriver: [%s]\n", drivers[i]));
result = winreg_get_driver(mem_ctx, server_info,
- smbd_messaging_context(),
+ msg_ctx,
architecture, drivers[i],
version, &driver);
if (!W_ERROR_IS_OK(result)) {
@@ -6867,6 +6867,7 @@ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx,
result = enumprinterdrivers_level_by_architecture(mem_ctx,
server_info,
+ smbd_messaging_context(),
servername,
archi_table[a].long_archi,
level,
@@ -6887,6 +6888,7 @@ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx,
return enumprinterdrivers_level_by_architecture(mem_ctx,
server_info,
+ smbd_messaging_context(),
servername,
architecture,
level,