summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 10:46:00 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:18 +0200
commit6bd973ad0128f6abaa976289c549132451f9625b (patch)
tree18b5ba9c9c935fb5231ab4f99729cc83abeb54a9
parentd78c8c26e4ae720734eb7ce2409b128fff362bbb (diff)
downloadsamba-6bd973ad0128f6abaa976289c549132451f9625b.tar.gz
samba-6bd973ad0128f6abaa976289c549132451f9625b.tar.bz2
samba-6bd973ad0128f6abaa976289c549132451f9625b.zip
s3: Lift the smbd_messaging_context from winreg_printer_getform1
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_spoolss_util.c3
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
3 files changed, 4 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 2a95ba94c6..d066369b1a 100644
--- 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 c20040ffc5..90dceb4678 100644
--- 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 4b884efd45..c9e27abafd 100644
--- 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);