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)

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 3a676d29b6607c8aa0c1702b0942013f7047f095..955bb0a9b2319073ef7ea78b1d8b73d4d1aea09d 100644 (file)
--- 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 d838d08c3cdbe011509bd59b9dc8bbf0e92dc0c9..4f2c7fa03ed7307026fd1d71e4ee0028ef505ef5 100644 (file)
--- 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;
 }