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

---
 source3/rpc_server/srv_spoolss_util.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'source3/rpc_server')

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 6f897dcc52..d609281ba1 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -243,6 +243,7 @@ static uint32_t winreg_printer_rev_changeid(void)
  */
 static WERROR winreg_printer_openkey(TALLOC_CTX *mem_ctx,
 			      struct auth_serversupplied_info *server_info,
+			      struct messaging_context *msg_ctx,
 			      struct rpc_pipe_client **winreg_pipe,
 			      const char *path,
 			      const char *key,
@@ -261,7 +262,7 @@ static WERROR winreg_printer_openkey(TALLOC_CTX *mem_ctx,
 	status = rpc_pipe_open_internal(mem_ctx,
 					&ndr_table_winreg.syntax_id,
 					server_info,
-					smbd_messaging_context(),
+					msg_ctx,
 					&pipe_handle);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("winreg_printer_openkey: Could not connect to winreg_pipe: %s\n",
@@ -1088,6 +1089,7 @@ static WERROR winreg_printer_opendriver(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(mem_ctx,
 					server_info,
+					smbd_messaging_context(),
 					winreg_pipe,
 					key_name,
 					drivername,
@@ -1344,6 +1346,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -1365,6 +1368,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
 	/* Create the main key */
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -1651,6 +1655,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -1980,6 +1985,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -2272,6 +2278,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -2480,6 +2487,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -2556,6 +2564,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx,
 			key, value, access_mask, printer));
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					key,
@@ -2642,6 +2651,7 @@ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					key,
@@ -2759,6 +2769,7 @@ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					key,
@@ -2836,6 +2847,7 @@ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					key,
@@ -2915,6 +2927,7 @@ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					key,
@@ -2986,6 +2999,7 @@ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					key,
@@ -3074,6 +3088,7 @@ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -3140,6 +3155,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					path,
 					"",
@@ -3216,6 +3232,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					TOP_LEVEL_CONTROL_FORMS_KEY,
 					"",
@@ -3316,6 +3333,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					TOP_LEVEL_CONTROL_FORMS_KEY,
 					"",
@@ -3434,6 +3452,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					TOP_LEVEL_CONTROL_FORMS_KEY,
 					"",
@@ -3519,6 +3538,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					TOP_LEVEL_CONTROL_FORMS_KEY,
 					"",
@@ -3624,6 +3644,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx,
 
 	result = winreg_printer_openkey(tmp_ctx,
 					server_info,
+					smbd_messaging_context(),
 					&winreg_pipe,
 					TOP_LEVEL_CONTROL_FORMS_KEY,
 					"",
-- 
cgit