s3: Lift the smbd_messaging_context from winreg_set_printer_dataex

4 files changed, 23 insertions, 2 deletions

diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 12993a9bf9..595da7fee1 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -68,7 +68,9 @@ static void store_printer_guid(const char *printer, struct GUID guid)
 		goto done;
 	}
 
-	result = winreg_set_printer_dataex(tmp_ctx, server_info, printer,
+	result = winreg_set_printer_dataex(tmp_ctx, server_info,
+					   smbd_messaging_context(),
+					   printer,
 					   SPOOL_DSSPOOLER_KEY, "objectGUID",
 					   REG_SZ, blob.data, blob.length);
 	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 efd607c75a..f58561dd1a 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5670,6 +5670,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, printer->drivername);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_DRIVERNAME,
@@ -5689,6 +5690,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, printer->comment);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_DESCRIPTION,
@@ -5705,6 +5707,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, printer->sharename);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTSHARENAME,
@@ -5730,6 +5733,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, p);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTERNAME,
@@ -5746,6 +5750,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, printer->portname);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PORTNAME,
@@ -5762,6 +5767,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, printer->location);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_LOCATION,
@@ -5778,6 +5784,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, printer->sepfile);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTSEPARATORFILE,
@@ -5795,6 +5802,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		SIVAL(buffer.data, 0, printer->starttime);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTSTARTTIME,
@@ -5808,6 +5816,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		SIVAL(buffer.data, 0, printer->untiltime);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTENDTIME,
@@ -5821,6 +5830,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		SIVAL(buffer.data, 0, printer->priority);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRIORITY,
@@ -5835,6 +5845,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 				       PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS));
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTKEEPPRINTEDJOBS,
@@ -5858,6 +5869,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 		push_reg_sz(mem_ctx, &buffer, spooling);
 		winreg_set_printer_dataex(mem_ctx,
 					  server_info,
+					  smbd_messaging_context(),
 					  printer->sharename,
 					  SPOOL_DSSPOOLER_KEY,
 					  SPOOL_REG_PRINTSPOOLING,
@@ -5869,6 +5881,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 	push_reg_sz(mem_ctx, &buffer, global_myname());
 	winreg_set_printer_dataex(mem_ctx,
 				  server_info,
+				  smbd_messaging_context(),
 				  printer->sharename,
 				  SPOOL_DSSPOOLER_KEY,
 				  SPOOL_REG_SHORTSERVERNAME,
@@ -5890,6 +5903,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 	push_reg_sz(mem_ctx, &buffer, longname);
 	winreg_set_printer_dataex(mem_ctx,
 				  server_info,
+				  smbd_messaging_context(),
 				  printer->sharename,
 				  SPOOL_DSSPOOLER_KEY,
 				  SPOOL_REG_SERVERNAME,
@@ -5902,6 +5916,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
 	push_reg_sz(mem_ctx, &buffer, uncname);
 	winreg_set_printer_dataex(mem_ctx,
 				  server_info,
+				  smbd_messaging_context(),
 				  printer->sharename,
 				  SPOOL_DSSPOOLER_KEY,
 				  SPOOL_REG_UNCNAME,
@@ -8738,6 +8753,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p,
 
 	result = winreg_set_printer_dataex(p->mem_ctx,
 					   p->server_info,
+					   p->msg_ctx,
 					   pinfo2->sharename,
 					   r->in.key_name,
 					   r->in.value_name,
@@ -8763,6 +8779,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p,
 			 */
 			winreg_set_printer_dataex(p->mem_ctx,
 						  p->server_info,
+						  p->msg_ctx,
 						  pinfo2->sharename,
 						  str,
 						  r->in.value_name,
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index a54cf1d424..9f6ea90ca6 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2540,6 +2540,7 @@ done:
 /* Set printer data over the winreg pipe. */
 WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx,
 				 struct auth_serversupplied_info *server_info,
+				 struct messaging_context *msg_ctx,
 				 const char *printer,
 				 const char *key,
 				 const char *value,
@@ -2574,7 +2575,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(),
+					msg_ctx,
 					&winreg_pipe,
 					path,
 					key,
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index bad48fca32..084f415b81 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -198,6 +198,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
  */
 WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx,
 				 struct auth_serversupplied_info *server_info,
+				 struct messaging_context *msg_ctx,
 				 const char *printer,
 				 const char *key,
 				 const char *value,