sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: Lift the server_messaging_context from print_job_end

Browse Source
This commit is contained in:
Volker Lendecke 2010-08-08 15:51:30 +02:00
parent a4c27786ff
commit c50c973036
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/printing.h
View File

@ -141,7 +141,8 @@ WERROR print_job_start(struct auth_serversupplied_info *server_info,
int snum, const char *docname, const char *filename,
struct spoolss_DeviceMode *devmode, uint32_t *_jobid);
void print_job_endpage(int snum, uint32 jobid);
NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type);
NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
uint32 jobid, enum file_close_type close_type);
int print_queue_status(int snum,
print_queue_struct **ppqueue,
print_status_struct *status);

5
source3/printing/printing.c
View File

@ -2749,7 +2749,8 @@ void print_job_endpage(int snum, uint32 jobid)
error.
****************************************************************************/
NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type)
NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
uint32 jobid, enum file_close_type close_type)
{
const char* sharename = lp_const_servicename(snum);
struct printjob *pjob;
@ -2834,7 +2835,7 @@ NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type)
/* make sure the database is up to date */
if (print_cache_expired(lp_const_servicename(snum), True))
print_queue_update(server_messaging_context(), snum, False);
print_queue_update(msg_ctx, snum, False);
return NT_STATUS_OK;

2
source3/rpc_server/srv_spoolss_nt.c
View File

@ -5290,7 +5290,7 @@ WERROR _spoolss_EndDocPrinter(struct pipes_struct *p,
}
Printer->document_started = false;
status = print_job_end(snum, Printer->jobid, NORMAL_CLOSE);
status = print_job_end(p->msg_ctx, snum, Printer->jobid, NORMAL_CLOSE);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(2, ("_spoolss_EndDocPrinter: "
"print_job_end failed [%s]\n",