summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 10:37:43 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:18 +0200
commitfe5985316c9b63057b68f7ce6bf0062fe61edbeb (patch)
tree88925f8685e7aa97d9c2575909615007c433262a
parentb9fe8de0ff7d0a44c5d0169b552a673e3d225524 (diff)
downloadsamba-fe5985316c9b63057b68f7ce6bf0062fe61edbeb.tar.gz
samba-fe5985316c9b63057b68f7ce6bf0062fe61edbeb.tar.bz2
samba-fe5985316c9b63057b68f7ce6bf0062fe61edbeb.zip
s3: Lift the smbd_messaging_context from winreg_printer_addform1
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c3
-rw-r--r--source3/rpc_server/srv_spoolss_util.c3
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 657fbd7d0b..b02c17a4fd 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7909,7 +7909,8 @@ WERROR _spoolss_AddForm(struct pipes_struct *p,
return WERR_INVALID_PARAM;
}
- status = winreg_printer_addform1(p->mem_ctx, p->server_info, form);
+ status = winreg_printer_addform1(p->mem_ctx, p->server_info,
+ p->msg_ctx, form);
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 af759b7f8c..d2c2522eb0 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -3226,6 +3226,7 @@ done:
WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct spoolss_AddFormInfo1 *form)
{
uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@@ -3250,7 +3251,7 @@ WERROR winreg_printer_addform1(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 92776158e9..ada7cabdee 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -406,6 +406,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx,
*/
WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct spoolss_AddFormInfo1 *form);
/*