s3: Lift the smbd_messaging_context from winreg_printer_getform1

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 2a95ba94c69ab52e489039b0bfc3c5d38bf43670..d066369b1acba3e0719d63376dfb83161291c27d 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6978,6 +6978,7 @@ WERROR _spoolss_GetForm(struct pipes_struct *p,
        case 1:
                result = winreg_printer_getform1(p->mem_ctx,
                                                 p->server_info,
+                                                p->msg_ctx,
                                                 r->in.form_name,
                                                 &r->out.info->info1);
                break;

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index c20040ffc5a6ce4c4f44cb3c87ec2c7657317555..90dceb467835758f6d3db0dbc09f2f31215b3a57 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -3633,6 +3633,7 @@ done:
 
 WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx,
                               struct auth_serversupplied_info *server_info,
+                              struct messaging_context *msg_ctx,
                               const char *form_name,
                               struct spoolss_FormInfo1 *r)
 {
@@ -3668,7 +3669,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx,
 
        result = winreg_printer_openkey(tmp_ctx,
                                        server_info,
-                                       smbd_messaging_context(),
+                                       msg_ctx,
                                        &winreg_pipe,
                                        TOP_LEVEL_CONTROL_FORMS_KEY,
                                        "",

diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index 4b884efd4568bdad3f4e1f62eed0a36c5ff3f4fd..c9e27abafd6267eb3f7e1a461b754d90db5b26ad 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -488,6 +488,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx,
  */
 WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx,
                               struct auth_serversupplied_info *server_info,
+                              struct messaging_context *msg_ctx,
                               const char *form_name,
                               struct spoolss_FormInfo1 *form);