diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 10:47:35 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:18 +0200 |
| commit | 3a85d0c79a660555b5dfaaf38340900edb624d3f (patch) | |
| tree | e94f3b942cc467558b772945a37bb3f4d98d3fdb | |
| parent | 6bd973ad0128f6abaa976289c549132451f9625b (diff) | |
| download | samba-3a85d0c79a660555b5dfaaf38340900edb624d3f.tar.gz samba-3a85d0c79a660555b5dfaaf38340900edb624d3f.tar.bz2 samba-3a85d0c79a660555b5dfaaf38340900edb624d3f.zip | |
s3: Lift the smbd_messaging_context from winreg_add_driver
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index d066369b1a..04208d5267 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -7473,7 +7473,7 @@ WERROR _spoolss_AddPrinterDriverEx(struct pipes_struct *p, goto done; } - err = winreg_add_driver(p->mem_ctx, p->server_info, + err = winreg_add_driver(p->mem_ctx, p->server_info, p->msg_ctx, r->in.info_ctr, &driver_name, &version); if (!W_ERROR_IS_OK(err)) { goto done; diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 90dceb4678..ac32fbc454 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -3767,6 +3767,7 @@ done: WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, struct spoolss_AddDriverInfoCtr *r, const char **driver_name, uint32_t *driver_version) @@ -3794,7 +3795,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, result = winreg_printer_opendriver(tmp_ctx, server_info, - smbd_messaging_context(), + msg_ctx, info8.driver_name, info8.architecture, info8.version, diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h index c9e27abafd..6dfdc25da6 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -510,6 +510,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, */ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, struct spoolss_AddDriverInfoCtr *r, const char **driver_name, uint32_t *driver_version); |