s3: Lift the smbd_messaging_context from winreg_printer_setform1
authorVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 08:44:13 +0000 (10:44 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 14:03:18 +0000 (16:03 +0200)
source3/rpc_server/srv_spoolss_nt.c
source3/rpc_server/srv_spoolss_util.c
source3/rpc_server/srv_spoolss_util.h

index 68167f3c260ca1f8a7e443d4fac7f32f5f76f72c..2a95ba94c69ab52e489039b0bfc3c5d38bf43670 100644 (file)
@@ -8035,6 +8035,7 @@ WERROR _spoolss_SetForm(struct pipes_struct *p,
 
        status = winreg_printer_setform1(p->mem_ctx,
                                         p->server_info,
+                                        p->msg_ctx,
                                         form_name,
                                         form);
        if (!W_ERROR_IS_OK(status)) {
index 6aa45da6fabd91d3bf33f1be3393898e65284258..c20040ffc5a6ce4c4f44cb3c87ec2c7657317555 100644 (file)
@@ -3529,6 +3529,7 @@ done:
 
 WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx,
                               struct auth_serversupplied_info *server_info,
+                              struct messaging_context *msg_ctx,
                               const char *form_name,
                               struct spoolss_AddFormInfo1 *form)
 {
@@ -3560,7 +3561,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx,
 
        result = winreg_printer_openkey(tmp_ctx,
                                        server_info,
-                                       smbd_messaging_context(),
+                                       msg_ctx,
                                        &winreg_pipe,
                                        TOP_LEVEL_CONTROL_FORMS_KEY,
                                        "",
@@ -3577,8 +3578,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx,
        /* If form_name != form->form_name then we renamed the form */
        if (strequal(form_name, form->form_name)) {
                result = winreg_printer_deleteform1(tmp_ctx, server_info,
-                                                   smbd_messaging_context(),
-                                                   form_name);
+                                                   msg_ctx, form_name);
                if (!W_ERROR_IS_OK(result)) {
                        DEBUG(0, ("winreg_printer_setform1: Could not open key %s: %s\n",
                                  TOP_LEVEL_CONTROL_FORMS_KEY, win_errstr(result)));
index 2a6b0b20dec1255e240ab9449a092dc610963b44..4b884efd4568bdad3f4e1f62eed0a36c5ff3f4fd 100644 (file)
@@ -468,6 +468,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx,
  */
 WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx,
                               struct auth_serversupplied_info *server_info,
+                              struct messaging_context *msg_ctx,
                               const char *form_name,
                               struct spoolss_AddFormInfo1 *form);