summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorDavid O'Neill <dmo@samba.org>2001-01-23 17:39:03 +0000
committerDavid O'Neill <dmo@samba.org>2001-01-23 17:39:03 +0000
commitb9c5be4d79364db0fd3f9af186f165638cae1c54 (patch)
treefc4d1d9859caba6aa6029f72c2362c6f8eda1f9d /source3/printing
parenta699e9b572bc3b6684ff46d205d3175aca6dee0a (diff)
downloadsamba-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)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/printing.c4
1 files changed, 3 insertions, 1 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 */