s3: Lift the smbd_messaging_context from nt_printer_remove

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index e7e2536ce66cc96d6b08888b350c9e832a01132e..c98085b421969fc676c7e10c7d35b304b9f07f5d 100644 (file)
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -285,6 +285,7 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info,
 
 void nt_printer_remove(TALLOC_CTX *mem_ctx,
                        struct auth_serversupplied_info *server_info,
+                       struct messaging_context *msg_ctx,
                        const char *printer);
 
 #endif /* NT_PRINTING_H_ */

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 4afddd31c232bf3ad22a2e99cfeb24cc2c7d9ad1..c44a0ec2c797468b14bad6c122560b1d8154047b 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2205,12 +2205,12 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info,
 
 void nt_printer_remove(TALLOC_CTX *mem_ctx,
                        struct auth_serversupplied_info *server_info,
+                       struct messaging_context *msg_ctx,
                        const char *printer)
 {
        WERROR result;
 
-       result = winreg_delete_printer_key(mem_ctx, server_info,
-                                          smbd_messaging_context(),
+       result = winreg_delete_printer_key(mem_ctx, server_info, msg_ctx,
                                           printer, "");
        if (!W_ERROR_IS_OK(result)) {
                DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s",

diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index a4646462b012fa659405cefac3250588aaa85365..601f83fb15323c49dc6bf72d0ec2012711031d87 100644 (file)
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -70,7 +70,8 @@ void reload_printers(void)
                                                   DSPRINT_UNPUBLISH);
                                TALLOC_FREE(pinfo2);
                        }
-                       nt_printer_remove(server_info, server_info, pname);
+                       nt_printer_remove(server_info, server_info,
+                                         smbd_messaging_context(), pname);
                        lp_killservice(snum);
                }
        }