summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 14:10:11 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:21 +0200
commit89d8998d7c0f386e106817ead9ec4360b3c2f1de (patch)
tree3dd93cac552d49d45d02816c46d5d81521701571
parente35ac20ca32e9c4221da6320706eb3562b544302 (diff)
downloadsamba-89d8998d7c0f386e106817ead9ec4360b3c2f1de.tar.gz
samba-89d8998d7c0f386e106817ead9ec4360b3c2f1de.tar.bz2
samba-89d8998d7c0f386e106817ead9ec4360b3c2f1de.zip
s3: Lift the smbd_messaging_context from enumprinters_level2
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index fa1ce86c73..2ae4aa004c 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4071,14 +4071,14 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx,
static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
uint32_t flags,
const char *servername,
union spoolss_PrinterInfo **info,
uint32_t *count)
{
if (flags & PRINTER_ENUM_LOCAL) {
- return enum_all_printers_info_2(mem_ctx, server_info,
- smbd_messaging_context(),
+ return enum_all_printers_info_2(mem_ctx, server_info, msg_ctx,
info, count);
}
@@ -4087,8 +4087,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx,
return WERR_INVALID_NAME;
}
- return enum_all_printers_info_2(mem_ctx, server_info,
- smbd_messaging_context(),
+ return enum_all_printers_info_2(mem_ctx, server_info, msg_ctx,
info, count);
}
@@ -4189,7 +4188,7 @@ WERROR _spoolss_EnumPrinters(struct pipes_struct *p,
break;
case 2:
result = enumprinters_level2(p->mem_ctx, p->server_info,
- r->in.flags, name,
+ p->msg_ctx, r->in.flags, name,
r->out.info, r->out.count);
break;
case 4: