From bf10fa67ef423d37b70b5c53990fd6ff98f4566d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 14:07:37 +0200 Subject: s3: Lift the smbd_messaging_context from enum_all_printers_info_2 --- source3/rpc_server/srv_spoolss_nt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index e9ba4fdc6c..98a2d0b1a3 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4021,13 +4021,13 @@ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, union spoolss_PrinterInfo **info, uint32_t *count) { DEBUG(4,("enum_all_printers_info_2\n")); - return enum_all_printers_info_level(mem_ctx, server_info, - smbd_messaging_context(), + return enum_all_printers_info_level(mem_ctx, server_info, msg_ctx, 2, 0, info, count); } @@ -4077,7 +4077,9 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, uint32_t *count) { if (flags & PRINTER_ENUM_LOCAL) { - return enum_all_printers_info_2(mem_ctx, server_info, info, count); + return enum_all_printers_info_2(mem_ctx, server_info, + smbd_messaging_context(), + info, count); } if (flags & PRINTER_ENUM_NAME) { @@ -4085,7 +4087,9 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, return WERR_INVALID_NAME; } - return enum_all_printers_info_2(mem_ctx, server_info, info, count); + return enum_all_printers_info_2(mem_ctx, server_info, + smbd_messaging_context(), + info, count); } if (flags & PRINTER_ENUM_REMOTE) { -- cgit