summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 14:12:57 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:23 +0200
commit8ee2a0a26917729212b8c91a54bb4231e6bd6cb1 (patch)
tree100add242cb45aa3cba4ff5ff80eda15acde46f0
parent9daa6a2501a1486aa78e7eed71d12a404df2e882 (diff)
downloadsamba-8ee2a0a26917729212b8c91a54bb4231e6bd6cb1.tar.gz
samba-8ee2a0a26917729212b8c91a54bb4231e6bd6cb1.tar.bz2
samba-8ee2a0a26917729212b8c91a54bb4231e6bd6cb1.zip
s3: Lift the smbd_messaging_context from construct_printer_driver_info_level
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 535c58fc12..f0b686170d 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4998,6 +4998,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx,
static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
uint32_t level,
union spoolss_DriverInfo *r,
int snum,
@@ -5011,7 +5012,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
result = winreg_get_printer(mem_ctx,
server_info,
- smbd_messaging_context(),
+ msg_ctx,
servername,
lp_const_servicename(snum),
&pinfo2);
@@ -5023,8 +5024,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
return WERR_INVALID_PRINTER_NAME;
}
- result = winreg_get_driver(mem_ctx, server_info,
- smbd_messaging_context(),
+ result = winreg_get_driver(mem_ctx, server_info, msg_ctx,
architecture,
pinfo2->drivername, version, &driver);
@@ -5043,8 +5043,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
/* Yes - try again with a WinNT driver. */
version = 2;
- result = winreg_get_driver(mem_ctx, server_info,
- smbd_messaging_context(),
+ result = winreg_get_driver(mem_ctx, server_info, msg_ctx,
architecture,
pinfo2->drivername,
version, &driver);
@@ -5127,7 +5126,9 @@ WERROR _spoolss_GetPrinterDriver2(struct pipes_struct *p,
return WERR_BADFID;
}
- result = construct_printer_driver_info_level(p->mem_ctx, p->server_info,
+ result = construct_printer_driver_info_level(p->mem_ctx,
+ p->server_info,
+ p->msg_ctx,
r->in.level, r->out.info,
snum, printer->servername,
r->in.architecture,