diff options
| author | David O'Neill <dmo@samba.org> | 2001-01-23 17:39:03 +0000 |
|---|---|---|
| committer | David O'Neill <dmo@samba.org> | 2001-01-23 17:39:03 +0000 |
| commit | b9c5be4d79364db0fd3f9af186f165638cae1c54 (patch) | |
| tree | fc4d1d9859caba6aa6029f72c2362c6f8eda1f9d | |
| parent | a699e9b572bc3b6684ff46d205d3175aca6dee0a (diff) | |
| download | samba-b9c5be4d79364db0fd3f9af186f165638cae1c54.tar.gz samba-b9c5be4d79364db0fd3f9af186f165638cae1c54.tar.bz2 samba-b9c5be4d79364db0fd3f9af186f165638cae1c54.zip | |
Changes from APPLIANCE_HEAD:
source/rpc_server/srv_spoolss_nt.c
- remove redundant srv_spoolss_sendnotify() calls from
_spoolss_startdocprinter() and _spoolss_enddocprinter(), as its
functionality is already covered in print_job_start() and
print_job_end()
source/printing/printing.c
- force a print_queue_update() prior to print queue purge so that
all jobs are purged.
(This used to be commit 0ccc552203d6432cde844c5946b203b27f257b1a)
| -rw-r--r-- | source3/printing/printing.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 3a676d29b6..955bb0a9b2 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1226,6 +1226,9 @@ BOOL print_queue_purge(struct current_user *user, int snum, int *errcode) int njobs, i; BOOL can_job_admin; + /* Force and update so the count is accurate (i.e. not a cached count) */ + print_queue_update(snum); + can_job_admin = print_access_check(user, snum, JOB_ACCESS_ADMINISTER); njobs = print_queue_status(snum, &queue, &status); @@ -1237,7 +1240,6 @@ BOOL print_queue_purge(struct current_user *user, int snum, int *errcode) } } - print_queue_update(snum); safe_free(queue); /* Send a printer notify message */ diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index d838d08c3c..4f2c7fa03e 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3658,7 +3658,6 @@ uint32 _spoolss_startdocprinter(POLICY_HND *handle, uint32 level, Printer->document_started=True; (*jobid) = Printer->jobid; - srv_spoolss_sendnotify(handle); return 0x0; } @@ -3680,8 +3679,6 @@ uint32 _spoolss_enddocprinter(POLICY_HND *handle) print_job_end(Printer->jobid); /* error codes unhandled so far ... */ - srv_spoolss_sendnotify(handle); - return 0x0; } |