s3: Lift the smbd_messaging_context from winreg_get_printer_secdesc

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 3a35522e29ef5282b8bd7e0f161eb170e2a516fe..72a57a7df78f3ed01f9d29cf08c008bcb66e5229 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2100,6 +2100,7 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
 
        result = winreg_get_printer_secdesc(mem_ctx,
                                            server_info,
+                                           smbd_messaging_context(),
                                            pname,
                                            &secdesc);
        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 36b2746cb654700994e8d553d55f060d4e600640..1c9b25cd7ee7f52918e93bf9c8e2e24491f3b387 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5406,6 +5406,7 @@ static WERROR update_printer_sec(struct policy_handle *handle,
           nothing may have actually changed. */
        result = winreg_get_printer_secdesc(p->mem_ctx,
                                            p->server_info,
+                                           p->msg_ctx,
                                            printer,
                                            &old_secdesc);
        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 9f8d21f62dc7107277c23e65d35b43115e4de3e9..b8716c9e04c13048221e617d494c274de390fb6c 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2222,6 +2222,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx,
 
        result = winreg_get_printer_secdesc(info2,
                                            server_info,
+                                           msg_ctx,
                                            printer,
                                            &info2->secdesc);
        if (!W_ERROR_IS_OK(result)) {
@@ -2254,6 +2255,7 @@ done:
 
 WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
                                  struct auth_serversupplied_info *server_info,
+                                 struct messaging_context *msg_ctx,
                                  const char *sharename,
                                  struct spoolss_security_descriptor **psecdesc)
 {
@@ -2283,7 +2285,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
 
        result = winreg_printer_openkey(tmp_ctx,
                                        server_info,
-                                       smbd_messaging_context(),
+                                       msg_ctx,
                                        &winreg_pipe,
                                        path,
                                        "",
@@ -2448,6 +2450,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
 
                result = winreg_get_printer_secdesc(tmp_ctx,
                                                    server_info,
+                                                   smbd_messaging_context(),
                                                    sharename,
                                                    &old_secdesc);
                if (!W_ERROR_IS_OK(result)) {

diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index fc0f0cff545020cf680a903bcaaa335ff93c6a3f..dd50884db4ecd5f577ca5b58fbbd005934d3768e 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -148,6 +148,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx,
  */
 WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
                                  struct auth_serversupplied_info *server_info,
+                                 struct messaging_context *msg_ctx,
                                  const char *sharename,
                                  struct spoolss_security_descriptor **psecdesc);