diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 10:35:57 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:17 +0200 |
| commit | b9fe8de0ff7d0a44c5d0169b552a673e3d225524 (patch) | |
| tree | 959ff2cc8959626d3b3fa2b09de8619ec4aec2a3 | |
| parent | 8efa27cdbea926d55b4ae43884796910a2b0b85e (diff) | |
| download | samba-b9fe8de0ff7d0a44c5d0169b552a673e3d225524.tar.gz samba-b9fe8de0ff7d0a44c5d0169b552a673e3d225524.tar.bz2 samba-b9fe8de0ff7d0a44c5d0169b552a673e3d225524.zip | |
s3: Lift the smbd_messaging_context from winreg_printer_get_changeid
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 8 | ||||
| -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, 10 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index c3da5544d6..657fbd7d0b 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3514,7 +3514,12 @@ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx, r->number_of_processors = 0x1; r->processor_type = PROCESSOR_INTEL_PENTIUM; /* 586 Pentium ? */ r->high_part_total_bytes = 0x0; - winreg_printer_get_changeid(mem_ctx, server_info, info2->sharename, &r->change_id); /* ChangeID in milliseconds*/ + + /* ChangeID in milliseconds*/ + winreg_printer_get_changeid(mem_ctx, server_info, + smbd_messaging_context(), + info2->sharename, &r->change_id); + r->last_error = WERR_OK; r->status = nt_printq_status(status.status); r->enumerate_network_printers = 0x0; @@ -8652,6 +8657,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, result = winreg_printer_get_changeid(p->mem_ctx, p->server_info, + p->msg_ctx, printer, &changeid); if (!W_ERROR_IS_OK(result)) { diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 2f27c8d673..af759b7f8c 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -3145,6 +3145,7 @@ done: WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer, uint32_t *pchangeid) { @@ -3172,7 +3173,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, result = winreg_printer_openkey(tmp_ctx, server_info, - smbd_messaging_context(), + msg_ctx, &winreg_pipe, path, "", diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h index efbdec40fe..92776158e9 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -383,6 +383,7 @@ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, */ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer, uint32_t *pchangeid); |