diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 14:48:30 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:26 +0200 |
| commit | 9441e8c52c4d624f80bf826daa312b45cd0a80f4 (patch) | |
| tree | 6606219b361076f256c30d0c9baf7510159f5990 | |
| parent | bff871384a281dab89a3117cfcb45f7cbe0824dd (diff) | |
| download | samba-9441e8c52c4d624f80bf826daa312b45cd0a80f4.tar.gz samba-9441e8c52c4d624f80bf826daa312b45cd0a80f4.tar.bz2 samba-9441e8c52c4d624f80bf826daa312b45cd0a80f4.zip | |
s3: Lift the smbd_messaging_context from print_job_start
| -rw-r--r-- | source3/include/printing.h | 1 | ||||
| -rw-r--r-- | source3/printing/printing.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/printing.h b/source3/include/printing.h index 5f8bb644ce..d3e77bcc90 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -136,6 +136,7 @@ bool print_job_resume(struct auth_serversupplied_info *server_info, ssize_t print_job_write(int snum, uint32 jobid, const char *buf, SMB_OFF_T pos, size_t size); int print_queue_length(int snum, print_status_struct *pstatus); WERROR print_job_start(struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, int snum, const char *docname, const char *filename, struct spoolss_DeviceMode *devmode, uint32_t *_jobid); void print_job_endpage(int snum, uint32 jobid); diff --git a/source3/printing/printing.c b/source3/printing/printing.c index c537fac2b2..9b8426ae32 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -2634,6 +2634,7 @@ static WERROR print_job_spool_file(int snum, uint32_t jobid, ***************************************************************************/ WERROR print_job_start(struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, int snum, const char *docname, const char *filename, struct spoolss_DeviceMode *devmode, uint32_t *_jobid) { @@ -2651,8 +2652,7 @@ WERROR print_job_start(struct auth_serversupplied_info *server_info, path = lp_pathname(snum); - werr = print_job_checks(server_info, smbd_messaging_context(), snum, - &njobs); + werr = print_job_checks(server_info, msg_ctx, snum, &njobs); if (!W_ERROR_IS_OK(werr)) { release_print_db(pdb); return werr; diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index ec0d499043..3a83898a6a 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5249,7 +5249,7 @@ WERROR _spoolss_StartDocPrinter(struct pipes_struct *p, return WERR_BADFID; } - werr = print_job_start(p->server_info, snum, + werr = print_job_start(p->server_info, p->msg_ctx, snum, info_1->document_name, info_1->output_file, Printer->devmode, &Printer->jobid); |