From e35ac20ca32e9c4221da6320706eb3562b544302 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 14:08:58 +0200 Subject: s3: Lift the smbd_messaging_context from enumprinters_level1 --- source3/rpc_server/srv_spoolss_nt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 98a2d0b1a3..fa1ce86c73 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4037,6 +4037,7 @@ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, uint32_t flags, const char *name, union spoolss_PrinterInfo **info, @@ -4046,20 +4047,19 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, if (flags & PRINTER_ENUM_LOCAL) { return enum_all_printers_info_1_local(mem_ctx, server_info, - smbd_messaging_context(), - info, count); + msg_ctx, info, count); } if (flags & PRINTER_ENUM_NAME) { return enum_all_printers_info_1_name(mem_ctx, server_info, - smbd_messaging_context(), - name, info, count); + msg_ctx, name, info, + count); } if (flags & PRINTER_ENUM_NETWORK) { return enum_all_printers_info_1_network(mem_ctx, server_info, - smbd_messaging_context(), - name, info, count); + msg_ctx, name, info, + count); } return WERR_OK; /* NT4sp5 does that */ @@ -4184,7 +4184,7 @@ WERROR _spoolss_EnumPrinters(struct pipes_struct *p, break; case 1: result = enumprinters_level1(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 2: -- cgit