From d7f8a6f82d56d7d46a0bcf8ed833ad09b9d00f26 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 8 Aug 2010 09:34:23 +0200
Subject: s3: Lift the smbd_messaging_context from winreg_create_printer

---
 source3/rpc_server/srv_spoolss_nt.c   | 2 ++
 source3/rpc_server/srv_spoolss_util.c | 5 +++--
 source3/rpc_server/srv_spoolss_util.h | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 05876a9a4e..545dae2c37 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1670,6 +1670,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
 
 		winreg_create_printer(p->mem_ctx,
 				      p->server_info,
+				      p->msg_ctx,
 				      Printer->servername,
 				      lp_const_servicename(snum));
 
@@ -3811,6 +3812,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx,
 
 		result = winreg_create_printer(mem_ctx,
 					       server_info,
+					       smbd_messaging_context(),
 					       NULL,
 					       printer);
 		if (!W_ERROR_IS_OK(result)) {
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index c4c612a729..c96c19b1be 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -1315,6 +1315,7 @@ static WERROR winreg_printer_ver_to_dword(const char *str, uint64_t *data)
 
 WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
 			     struct auth_serversupplied_info *server_info,
+			     struct messaging_context *msg_ctx,
 			     const char *servername,
 			     const char *sharename)
 {
@@ -1347,7 +1348,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
-					smbd_messaging_context(),
+					msg_ctx,
 					&winreg_pipe,
 					path,
 					"",
@@ -1369,7 +1370,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
 	/* Create the main key */
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
-					smbd_messaging_context(),
+					msg_ctx,
 					&winreg_pipe,
 					path,
 					"",
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index 9b79ce5b67..e3165a07fa 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -73,6 +73,7 @@ enum spoolss_PrinterInfo2Mask {
 
 WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
 			     struct auth_serversupplied_info *server_info,
+			     struct messaging_context *msg_ctx,
 			     const char *servername,
 			     const char *sharename);
 
-- 
cgit