diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-05-28 16:12:34 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-05-28 16:12:34 +1000 |
| commit | 5ab03dbecc33320e23304b126f26bde3f6bc6c7d (patch) | |
| tree | f8478334db04fe03f6ed0a88622a50fe2586b91c /source3/printing/printing.c | |
| parent | 47692f39b1b3b5c589bfb63a6968aaf9f9af70c4 (diff) | |
| parent | bd1194810787901c5caa08961f97fecbcbd01978 (diff) | |
| download | samba-5ab03dbecc33320e23304b126f26bde3f6bc6c7d.tar.gz samba-5ab03dbecc33320e23304b126f26bde3f6bc6c7d.tar.bz2 samba-5ab03dbecc33320e23304b126f26bde3f6bc6c7d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/printing/printing.c')
| -rw-r--r-- | source3/printing/printing.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index ce98792096..e73669fef5 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1436,8 +1436,9 @@ void start_background_queue(void) close(pause_pipe[0]); pause_pipe[0] = -1; - if (!reinit_after_fork(smbd_messaging_context(), - smbd_event_context(), true)) { + if (!NT_STATUS_IS_OK(reinit_after_fork(smbd_messaging_context(), + smbd_event_context(), + true))) { DEBUG(0,("reinit_after_fork() failed\n")); smb_panic("reinit_after_fork() failed"); } @@ -2563,7 +2564,7 @@ bool print_job_end(int snum, uint32 jobid, enum file_close_type close_type) if ((close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE) && (sys_fstat(pjob->fd, &sbuf) == 0)) { - pjob->size = sbuf.st_size; + pjob->size = sbuf.st_ex_size; close(pjob->fd); pjob->fd = -1; } else { |