diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 10:44:13 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:18 +0200 |
| commit | d78c8c26e4ae720734eb7ce2409b128fff362bbb (patch) | |
| tree | 9174d32c21996d3cb71fa9472205d8ecb737494a /source3/rpc_server | |
| parent | cf016e3e494765f40b4866bd81dd91b8694dd833 (diff) | |
| download | samba-d78c8c26e4ae720734eb7ce2409b128fff362bbb.tar.gz samba-d78c8c26e4ae720734eb7ce2409b128fff362bbb.tar.bz2 samba-d78c8c26e4ae720734eb7ce2409b128fff362bbb.zip | |
s3: Lift the smbd_messaging_context from winreg_printer_setform1
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.c | 6 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 68167f3c26..2a95ba94c6 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -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)) { diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 6aa45da6fa..c20040ffc5 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -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))); diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h index 2a6b0b20de..4b884efd45 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -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); |