summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 10:39:42 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:18 +0200
commit428e86e562e830093b9af6bab09e851a4163b934 (patch)
tree33e4dfa0ec273bb62a668c4b2fab7f3925b21833
parentfe5985316c9b63057b68f7ce6bf0062fe61edbeb (diff)
downloadsamba-428e86e562e830093b9af6bab09e851a4163b934.tar.gz
samba-428e86e562e830093b9af6bab09e851a4163b934.tar.bz2
samba-428e86e562e830093b9af6bab09e851a4163b934.zip
s3: Lift the smbd_messaging_context from winreg_printer_enumforms1
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_spoolss_util.c6
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
3 files changed, 6 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index b02c17a4fd..33d318ea37 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6928,6 +6928,7 @@ WERROR _spoolss_EnumForms(struct pipes_struct *p,
case 1:
result = winreg_printer_enumforms1(p->mem_ctx,
p->server_info,
+ p->msg_ctx,
r->out.count,
r->out.info);
break;
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index d2c2522eb0..aea9a5a702 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -3265,7 +3265,8 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx,
goto done;
}
- result = winreg_printer_enumforms1(tmp_ctx, server_info, &num_info, &info);
+ result = winreg_printer_enumforms1(tmp_ctx, server_info, msg_ctx,
+ &num_info, &info);
if (!W_ERROR_IS_OK(result)) {
DEBUG(0, ("winreg_printer_addform: Could not enum keys %s: %s\n",
TOP_LEVEL_CONTROL_FORMS_KEY, win_errstr(result)));
@@ -3328,6 +3329,7 @@ done:
WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
uint32_t *pnum_info,
union spoolss_FormInfo **pinfo)
{
@@ -3352,7 +3354,7 @@ WERROR winreg_printer_enumforms1(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 ada7cabdee..6a9c1d4af3 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -425,6 +425,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx,
*/
WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
uint32_t *pnum_info,
union spoolss_FormInfo **pinfo);