From 1af73b04fc30c6be8a9fa792e2ecdb1affb9996b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 8 Aug 2010 10:55:41 +0200
Subject: s3: Lift the smbd_messaging_context from winreg_del_driver_list

---
 source3/printing/nt_printing.c        | 1 +
 source3/rpc_server/srv_spoolss_nt.c   | 1 +
 source3/rpc_server/srv_spoolss_util.c | 3 ++-
 source3/rpc_server/srv_spoolss_util.h | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d12f168145..a5d36dab57 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1805,6 +1805,7 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
 	/* get the list of drivers */
 
 	result = winreg_get_driver_list(mem_ctx, server_info,
+					smbd_messaging_context(),
 					info->architecture, version,
 					&num_drivers, &drivers);
 	if (!W_ERROR_IS_OK(result)) {
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 4c660374ae..8789b86bf3 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6720,6 +6720,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
 
 	for (version=0; version<DRIVER_MAX_VERSION; version++) {
 		result = winreg_get_driver_list(mem_ctx, server_info,
+						smbd_messaging_context(),
 						architecture, version,
 						&num_drivers, &drivers);
 		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 05ee92f65a..2de45b70a6 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -4351,6 +4351,7 @@ done:
 
 WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx,
 			      struct auth_serversupplied_info *server_info,
+			      struct messaging_context *msg_ctx,
 			      const char *architecture,
 			      uint32_t version,
 			      uint32_t *num_drivers,
@@ -4378,7 +4379,7 @@ WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx,
 	 * parent of all drivers for this architecture and version */
 	result = winreg_printer_opendriver(tmp_ctx,
 					   server_info,
-					   smbd_messaging_context(),
+					   msg_ctx,
 					   NULL,
 					   architecture,
 					   version,
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index 6cd7556175..2b8a653338 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -585,6 +585,7 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx,
 
 WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx,
 			      struct auth_serversupplied_info *server_info,
+                              struct messaging_context *msg_ctx,
 			      const char *architecture,
 			      uint32_t version,
 			      uint32_t *num_drivers,
-- 
cgit