summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 10:41:54 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:18 +0200
commitcf016e3e494765f40b4866bd81dd91b8694dd833 (patch)
tree64b9f20d1e5e328c22e3ea0e557242b040c8b636
parent428e86e562e830093b9af6bab09e851a4163b934 (diff)
downloadsamba-cf016e3e494765f40b4866bd81dd91b8694dd833.tar.gz
samba-cf016e3e494765f40b4866bd81dd91b8694dd833.tar.bz2
samba-cf016e3e494765f40b4866bd81dd91b8694dd833.zip
s3: Lift the smbd_messaging_context from winreg_printer_deleteform1
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_spoolss_util.c7
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
3 files changed, 7 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 33d318ea37..68167f3c26 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7970,6 +7970,7 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p,
status = winreg_printer_deleteform1(p->mem_ctx,
p->server_info,
+ p->msg_ctx,
form_name);
if (!W_ERROR_IS_OK(status)) {
return status;
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index aea9a5a702..6aa45da6fa 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -3445,6 +3445,7 @@ done:
WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *form_name)
{
uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -3473,7 +3474,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx,
result = winreg_printer_openkey(tmp_ctx,
server_info,
- smbd_messaging_context(),
+ msg_ctx,
&winreg_pipe,
TOP_LEVEL_CONTROL_FORMS_KEY,
"",
@@ -3575,7 +3576,9 @@ 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, form_name);
+ result = winreg_printer_deleteform1(tmp_ctx, server_info,
+ smbd_messaging_context(),
+ 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)));
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index 6a9c1d4af3..2a6b0b20de 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -445,6 +445,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx,
*/
WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *form_name);
/**