[print notify fixes from APP_HEAD]
[garming/samba-autobuild/.git] / source3 / printing / printing.c
index e0eb2a06d768c57353dd57e908fb89ecbf0c719b..a6b5e5cb834d0f38da11fe2d5c7e1eca88396d32 100644 (file)
@@ -3,6 +3,7 @@
    Version 3.0
    printing backend routines
    Copyright (C) Andrew Tridgell 1992-2000
+   Copyright (C) Jeremy Allison 2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "printing.h"
 
-extern int DEBUGLEVEL;
-
 /* Current printer interface */
-struct printif *current_printif = &generic_printif;
+static struct printif *current_printif = &generic_printif;
 
 /* 
    the printing backend revolves around a tdb database that stores the
@@ -40,36 +39,147 @@ struct printif *current_printif = &generic_printif;
    jobids are assigned when a job starts spooling. 
 */
 
-/* the open printing.tdb database */
-static TDB_CONTEXT *tdb;
+/***************************************************************************
+ Nightmare. LANMAN jobid's are 16 bit numbers..... We must map them to 32
+ bit RPC jobids.... JRA.
+***************************************************************************/
+
+static TDB_CONTEXT *rap_tdb;
+static uint16 next_rap_jobid;
+
+uint16 pjobid_to_rap(int snum, uint32 jobid)
+{
+       uint16 rap_jobid;
+       TDB_DATA data, key;
+       char jinfo[8];
+
+       if (!rap_tdb) {
+               /* Create the in-memory tdb. */
+               rap_tdb = tdb_open_log(NULL, 0, TDB_INTERNAL, (O_RDWR|O_CREAT), 0644);
+               if (!rap_tdb)
+                       return 0;
+       }
+
+       SIVAL(&jinfo,0,(int32)snum);
+       SIVAL(&jinfo,4,jobid);
+
+       key.dptr = (char *)&jinfo;
+       key.dsize = sizeof(jinfo);
+       data = tdb_fetch(rap_tdb, key);
+       if (data.dptr && data.dsize == sizeof(uint16)) {
+               memcpy(&rap_jobid, data.dptr, sizeof(uint16));
+               SAFE_FREE(data.dptr);
+               return rap_jobid;
+       }
+       SAFE_FREE(data.dptr);
+       /* Not found - create and store mapping. */
+       rap_jobid = ++next_rap_jobid;
+       if (rap_jobid == 0)
+               rap_jobid = ++next_rap_jobid;
+       data.dptr = (char *)&rap_jobid;
+       data.dsize = sizeof(rap_jobid);
+       tdb_store(rap_tdb, key, data, TDB_REPLACE);
+       tdb_store(rap_tdb, data, key, TDB_REPLACE);
+       return rap_jobid;
+}
+
+BOOL rap_to_pjobid(uint16 rap_jobid, int *psnum, uint32 *pjobid)
+{
+       TDB_DATA data, key;
+       char jinfo[8];
+
+       if (!rap_tdb)
+               return False;
+
+       key.dptr = (char *)&rap_jobid;
+       key.dsize = sizeof(rap_jobid);
+       data = tdb_fetch(rap_tdb, key);
+       if (data.dptr && data.dsize == sizeof(jinfo)) {
+               *psnum = IVAL(&jinfo,0);
+               *pjobid = IVAL(&jinfo,4);
+               SAFE_FREE(data.dptr);
+               return True;
+       }
+       SAFE_FREE(data.dptr);
+       return False;
+}
+
+static void rap_jobid_delete(int snum, uint32 jobid)
+{
+       TDB_DATA key, data;
+       uint16 rap_jobid;
+       char jinfo[8];
+
+       if (!rap_tdb)
+               return;
+
+       SIVAL(&jinfo,0,(int32)snum);
+       SIVAL(&jinfo,4,jobid);
+
+       key.dptr = (char *)&jinfo;
+       key.dsize = sizeof(jinfo);
+       data = tdb_fetch(rap_tdb, key);
+       if (!data.dptr || (data.dsize != sizeof(uint16))) {
+               SAFE_FREE(data.dptr);
+               return;
+       }
+
+       memcpy(&rap_jobid, data.dptr, sizeof(uint16));
+       SAFE_FREE(data.dptr);
+       data.dptr = (char *)&rap_jobid;
+       data.dsize = sizeof(rap_jobid);
+       tdb_delete(rap_tdb, key);
+       tdb_delete(rap_tdb, data);
+}
+
 static pid_t local_pid;
 
 static int get_queue_status(int, print_status_struct *);
 
 /****************************************************************************
-initialise the printing backend. Called once at startup. 
-Does not survive a fork
+ Initialise the printing backend. Called once at startup before the fork().
 ****************************************************************************/
+
 BOOL print_backend_init(void)
 {
        char *sversion = "INFO/version";
+       pstring printing_path;
+       int services = lp_numservices();
+       int snum;
+
+       if (local_pid == sys_getpid())
+               return True;
+
+       unlink(lock_path("printing.tdb"));
+       pstrcpy(printing_path,lock_path("printing"));
+       mkdir(printing_path,0755);
 
-       if (tdb && local_pid == sys_getpid()) return True;
-       tdb = tdb_open_log(lock_path("printing.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
-       if (!tdb) {
-               DEBUG(0,("print_backend_init: Failed to open printing backend database. Error = [%s]\n",
-                                tdb_errorstr(tdb)));
-               return False;
-       }
        local_pid = sys_getpid();
 
        /* handle a Samba upgrade */
-       tdb_lock_bystring(tdb, sversion);
-       if (tdb_fetch_int(tdb, sversion) != PRINT_DATABASE_VERSION) {
-               tdb_traverse(tdb, (tdb_traverse_func)tdb_delete, NULL);
-               tdb_store_int(tdb, sversion, PRINT_DATABASE_VERSION);
+
+       for (snum = 0; snum < services; snum++) {
+               struct tdb_print_db *pdb;
+               if (!lp_print_ok(snum))
+                       continue;
+
+               pdb = get_print_db_byname(lp_const_servicename(snum));
+               if (!pdb)
+                       continue;
+               if (tdb_lock_bystring(pdb->tdb, sversion, 0) == -1) {
+                       DEBUG(0,("print_backend_init: Failed to open printer %s database\n", lp_const_servicename(snum) ));
+                       release_print_db(pdb);
+                       return False;
+               }
+               if (tdb_fetch_int32(pdb->tdb, sversion) != PRINT_DATABASE_VERSION) {
+                       tdb_traverse(pdb->tdb, tdb_traverse_delete_fn, NULL);
+                       tdb_store_int32(pdb->tdb, sversion, PRINT_DATABASE_VERSION);
+               }
+               tdb_unlock_bystring(pdb->tdb, sversion);
+               release_print_db(pdb);
        }
-       tdb_unlock_bystring(tdb, sversion);
+
+       close_all_print_db(); /* Don't leave any open. */
 
        /* select the appropriate printing interface... */
 #ifdef HAVE_CUPS
@@ -82,11 +192,21 @@ BOOL print_backend_init(void)
 }
 
 /****************************************************************************
-useful function to generate a tdb key
+ Shut down printing backend. Called once at shutdown to close the tdb.
+****************************************************************************/
+
+void printing_end(void)
+{
+       close_all_print_db(); /* Don't leave any open. */
+}
+
+/****************************************************************************
+ Useful function to generate a tdb key.
 ****************************************************************************/
-static TDB_DATA print_key(int jobid)
+
+static TDB_DATA print_key(uint32 jobid)
 {
-       static int j;
+       static uint32 j;
        TDB_DATA ret;
 
        j = jobid;
@@ -95,62 +215,355 @@ static TDB_DATA print_key(int jobid)
        return ret;
 }
 
+/***********************************************************************
+ unpack a pjob from a tdb buffer 
+***********************************************************************/
+int unpack_pjob( char* buf, int buflen, struct printjob *pjob )
+{
+       int     len = 0;
+       int     used;
+       
+       if ( !buf || !pjob )
+               return -1;
+               
+       len += tdb_unpack(buf+len, buflen-len, "dddddddddffff",
+                               &pjob->pid,
+                               &pjob->sysjob,
+                               &pjob->fd,
+                               &pjob->starttime,
+                               &pjob->status,
+                               &pjob->size,
+                               &pjob->page_count,
+                               &pjob->spooled,
+                               &pjob->smbjob,
+                               pjob->filename,
+                               pjob->jobname,
+                               pjob->user,
+                               pjob->queuename);
+                               
+       if ( len == -1 )
+               return -1;
+               
+       if ( (used = unpack_devicemode(&pjob->nt_devmode, buf+len, buflen-len)) == -1 )
+               return -1;
+       
+       len += used;
+       
+       return len;
+
+}
+
 /****************************************************************************
-useful function to find a print job in the database
+ Useful function to find a print job in the database.
 ****************************************************************************/
-static struct printjob *print_job_find(int jobid)
+
+static struct printjob *print_job_find(int snum, uint32 jobid)
 {
-       static struct printjob pjob;
-       TDB_DATA ret;
+       static struct printjob  pjob;
+       TDB_DATA                ret;
+       struct tdb_print_db     *pdb = get_print_db_byname(lp_const_servicename(snum));
+       
 
-       ret = tdb_fetch(tdb, print_key(jobid));
-       if (!ret.dptr || ret.dsize != sizeof(pjob)) return NULL;
+       if (!pdb)
+               return NULL;
 
-       memcpy(&pjob, ret.dptr, sizeof(pjob));
-       free(ret.dptr);
+       ret = tdb_fetch(pdb->tdb, print_key(jobid));
+       release_print_db(pdb);
+
+       if (!ret.dptr)
+               return NULL;
+       
+       if ( pjob.nt_devmode )
+               free_nt_devicemode( &pjob.nt_devmode );
+               
+       ZERO_STRUCT( pjob );
+       
+       if ( unpack_pjob( ret.dptr, ret.dsize, &pjob ) == -1 ) {
+               SAFE_FREE(ret.dptr);
+               return NULL;
+       }
+       
+       SAFE_FREE(ret.dptr);    
        return &pjob;
 }
 
+/* Convert a unix jobid to a smb jobid */
+
+static uint32 sysjob_to_jobid_value;
+
+static int unixjob_traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA key,
+                              TDB_DATA data, void *state)
+{
+       struct printjob *pjob;
+       int *sysjob = (int *)state;
+
+       if (!data.dptr || data.dsize == 0)
+               return 0;
+
+       pjob = (struct printjob *)data.dptr;
+       if (key.dsize != sizeof(uint32))
+               return 0;
+
+       if (*sysjob == pjob->sysjob) {
+               uint32 *jobid = (uint32 *)key.dptr;
+
+               sysjob_to_jobid_value = *jobid;
+               return 1;
+       }
+
+       return 0;
+}
+
+/****************************************************************************
+ This is a *horribly expensive call as we have to iterate through all the
+ current printer tdb's. Don't do this often ! JRA.
+****************************************************************************/
+
+uint32 sysjob_to_jobid(int unix_jobid)
+{
+       int services = lp_numservices();
+       int snum;
+
+       sysjob_to_jobid_value = (uint32)-1;
+
+       for (snum = 0; snum < services; snum++) {
+               struct tdb_print_db *pdb;
+               if (!lp_print_ok(snum))
+                       continue;
+               pdb = get_print_db_byname(lp_const_servicename(snum));
+               if (pdb)
+                       tdb_traverse(pdb->tdb, unixjob_traverse_fn, &unix_jobid);
+               release_print_db(pdb);
+               if (sysjob_to_jobid_value != (uint32)-1)
+                       return sysjob_to_jobid_value;
+       }
+       return (uint32)-1;
+}
+
+/****************************************************************************
+ Send notifications based on what has changed after a pjob_store.
+****************************************************************************/
+
+static struct {
+       uint32 lpq_status;
+       uint32 spoolss_status;
+} lpq_to_spoolss_status_map[] = {
+       { LPQ_QUEUED, JOB_STATUS_QUEUED },
+       { LPQ_PAUSED, JOB_STATUS_PAUSED },
+       { LPQ_SPOOLING, JOB_STATUS_SPOOLING },
+       { LPQ_PRINTING, JOB_STATUS_PRINTING },
+       { LPQ_DELETING, JOB_STATUS_DELETING },
+       { LPQ_OFFLINE, JOB_STATUS_OFFLINE },
+       { LPQ_PAPEROUT, JOB_STATUS_PAPEROUT },
+       { LPQ_PRINTED, JOB_STATUS_PRINTED },
+       { LPQ_DELETED, JOB_STATUS_DELETED },
+       { LPQ_BLOCKED, JOB_STATUS_BLOCKED },
+       { LPQ_USER_INTERVENTION, JOB_STATUS_USER_INTERVENTION },
+       { -1, 0 }
+};
+
+/* Convert a lpq status value stored in printing.tdb into the
+   appropriate win32 API constant. */
+
+static uint32 map_to_spoolss_status(uint32 lpq_status)
+{
+       int i = 0;
+
+       while (lpq_to_spoolss_status_map[i].lpq_status != -1) {
+               if (lpq_to_spoolss_status_map[i].lpq_status == lpq_status)
+                       return lpq_to_spoolss_status_map[i].spoolss_status;
+               i++;
+       }
+
+       return 0;
+}
+
+static void pjob_store_notify(int snum, uint32 jobid, struct printjob *old_data,
+                             struct printjob *new_data)
+{
+       BOOL new_job = False;
+
+       if (!old_data)
+               new_job = True;
+
+       /* Notify the job name first */
+
+       if (new_job || !strequal(old_data->jobname, new_data->jobname))
+               notify_job_name(snum, jobid, new_data->jobname);
+
+       /* Job attributes that can't be changed.  We only send
+          notification for these on a new job. */
+
+       if (new_job) {
+               notify_job_submitted(snum, jobid, new_data->starttime);
+               notify_job_username(snum, jobid, new_data->user);
+       }
+
+       /* Job attributes of a new job or attributes that can be
+          modified. */
+
+       if (new_job || old_data->status != new_data->status)
+               notify_job_status(snum, jobid, map_to_spoolss_status(new_data->status));
+
+       if (new_job || old_data->size != new_data->size)
+               notify_job_total_bytes(snum, jobid, new_data->size);
+
+       if (new_job || old_data->page_count != new_data->page_count)
+               notify_job_total_pages(snum, jobid, new_data->page_count);
+}
+
+/****************************************************************************
+ Store a job structure back to the database.
+****************************************************************************/
+
+static BOOL pjob_store(int snum, uint32 jobid, struct printjob *pjob)
+{
+       TDB_DATA                old_data, new_data;
+       BOOL                    ret = False;
+       struct tdb_print_db     *pdb = get_print_db_byname(lp_const_servicename(snum));
+       char                    *buf = NULL;
+       int                     len, newlen, buflen;
+       
+
+       if (!pdb)
+               return False;
+
+       /* Get old data */
+
+       old_data = tdb_fetch(pdb->tdb, print_key(jobid));
+
+       /* Doh!  Now we have to pack/unpack data since the NT_DEVICEMODE was added */
+
+       newlen = 0;
+       
+       do {
+               len = 0;
+               buflen = newlen;
+               len += tdb_pack(buf+len, buflen-len, "dddddddddffff",
+                               pjob->pid,
+                               pjob->sysjob,
+                               pjob->fd,
+                               pjob->starttime,
+                               pjob->status,
+                               pjob->size,
+                               pjob->page_count,
+                               pjob->spooled,
+                               pjob->smbjob,
+                               pjob->filename,
+                               pjob->jobname,
+                               pjob->user,
+                               pjob->queuename);
+
+               len += pack_devicemode(pjob->nt_devmode, buf+len, buflen-len);
+       
+               if (buflen != len) {
+                       char *tb;
+
+                       tb = (char *)Realloc(buf, len);
+                       if (!tb) {
+                               DEBUG(0,("pjob_store: failed to enlarge buffer!\n"));
+                               goto done;
+                       }
+                       else 
+                               buf = tb;
+                       newlen = len;
+               }
+       } while ( buflen != len );
+               
+       
+       /* Store new data */
+
+       new_data.dptr = buf;
+       new_data.dsize = len;
+       ret = (tdb_store(pdb->tdb, print_key(jobid), new_data, TDB_REPLACE) == 0);
+
+       release_print_db(pdb);
+
+       /* Send notify updates for what has changed */
+
+       if ( ret && (old_data.dsize == 0 || old_data.dsize == sizeof(*pjob)) )
+               pjob_store_notify( snum, jobid, (struct printjob *)old_data.dptr, pjob );
+
+done:
+       SAFE_FREE( old_data.dptr );
+       SAFE_FREE( buf );
+
+       return ret;
+}
+
 /****************************************************************************
-store a job structure back to the database
+ Remove a job structure from the database.
 ****************************************************************************/
-static BOOL print_job_store(int jobid, struct printjob *pjob)
+
+static void pjob_delete(int snum, uint32 jobid)
 {
-       TDB_DATA d;
-       d.dptr = (void *)pjob;
-       d.dsize = sizeof(*pjob);
+       struct printjob *pjob = print_job_find(snum, jobid);
+       uint32 job_status = 0;
+       struct tdb_print_db *pdb = get_print_db_byname(lp_const_servicename(snum));
+
+       if (!pdb)
+               return;
+
+       if (!pjob) {
+               DEBUG(5, ("pjob_delete(): we were asked to delete nonexistent job %u\n",
+                                       (unsigned int)jobid));
+               release_print_db(pdb);
+               return;
+       }
+
+       /* Send a notification that a job has been deleted */
 
-       return (tdb_store(tdb, print_key(jobid), d, TDB_REPLACE) == 0);
+       job_status = map_to_spoolss_status(pjob->status);
+
+       /* We must cycle through JOB_STATUS_DELETING and
+           JOB_STATUS_DELETED for the port monitor to delete the job
+           properly. */
+       
+       job_status |= JOB_STATUS_DELETING;
+       notify_job_status(snum, jobid, job_status);
+       
+       job_status |= JOB_STATUS_DELETED;
+       notify_job_status(snum, jobid, job_status);
+
+       /* Remove from printing.tdb */
+
+       tdb_delete(pdb->tdb, print_key(jobid));
+       release_print_db(pdb);
+       rap_jobid_delete(snum, jobid);
 }
 
 /****************************************************************************
-parse a file name from the system spooler to generate a jobid
+ Parse a file name from the system spooler to generate a jobid.
 ****************************************************************************/
-static int print_parse_jobid(char *fname)
+
+static uint32 print_parse_jobid(char *fname)
 {
        int jobid;
 
-       if (strncmp(fname,PRINT_SPOOL_PREFIX,strlen(PRINT_SPOOL_PREFIX)) != 0) return -1;
+       if (strncmp(fname,PRINT_SPOOL_PREFIX,strlen(PRINT_SPOOL_PREFIX)) != 0)
+               return (uint32)-1;
        fname += strlen(PRINT_SPOOL_PREFIX);
 
        jobid = atoi(fname);
-       if (jobid <= 0) return -1;
+       if (jobid <= 0)
+               return (uint32)-1;
 
-       return jobid;
+       return (uint32)jobid;
 }
 
-
 /****************************************************************************
-list a unix job in the print database
+ List a unix job in the print database.
 ****************************************************************************/
+
 static void print_unix_job(int snum, print_queue_struct *q)
 {
-       int jobid = q->job + UNIX_JOB_START;
+       uint32 jobid = q->job + UNIX_JOB_START;
        struct printjob pj, *old_pj;
 
        /* Preserve the timestamp on an existing unix print job */
 
-       old_pj = print_job_find(jobid);
+       old_pj = print_job_find(snum, jobid);
 
        ZERO_STRUCT(pj);
 
@@ -163,11 +576,11 @@ static void print_unix_job(int snum, print_queue_struct *q)
        pj.spooled = True;
        pj.smbjob = False;
        fstrcpy(pj.filename, "");
-       fstrcpy(pj.jobname, q->file);
-       fstrcpy(pj.user, q->user);
-       fstrcpy(pj.qname, lp_servicename(snum));
+       fstrcpy(pj.jobname, q->fs_file);
+       fstrcpy(pj.user, q->fs_user);
+       fstrcpy(pj.queuename, lp_const_servicename(snum));
 
-       print_job_store(jobid, &pj);
+       pjob_store(snum, jobid, &pj);
 }
 
 
@@ -176,20 +589,28 @@ struct traverse_struct {
        int qcount, snum, maxcount, total_jobs;
 };
 
-/* utility fn to delete any jobs that are no longer active */
+/****************************************************************************
+ Utility fn to delete any jobs that are no longer active.
+****************************************************************************/
+
 static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *state)
 {
        struct traverse_struct *ts = (struct traverse_struct *)state;
        struct printjob pjob;
-       int i, jobid;
+       uint32 jobid;
+       int i;
 
-       if (data.dsize != sizeof(pjob) || key.dsize != sizeof(int)) return 0;
+       if (  key.dsize != sizeof(jobid) )
+               return 0;
+               
        memcpy(&jobid, key.dptr, sizeof(jobid));
-       memcpy(&pjob,  data.dptr, sizeof(pjob));
+       if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
+               return 0;
+       free_nt_devicemode( &pjob.nt_devmode );
 
-       if (strcmp(lp_servicename(ts->snum), pjob.qname)) {
-               /* this isn't for the queue we are looking at */
-               ts->total_jobs++;
+
+       if (ts->snum != lp_servicenumber(pjob.queuename)) {
+               /* this isn't for the queue we are looking at - this cannot happen with the split tdb's. JRA */
                return 0;
        }
 
@@ -197,10 +618,12 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
                /* remove a unix job if it isn't in the system queue any more */
 
                for (i=0;i<ts->qcount;i++) {
-                       if (jobid == ts->queue[i].job + UNIX_JOB_START) break;
+                       uint32 u_jobid = (ts->queue[i].job + UNIX_JOB_START);
+                       if (jobid == u_jobid)
+                               break;
                }
                if (i == ts->qcount)
-                       tdb_delete(tdb, key);
+                       pjob_delete(ts->snum, jobid);
                else
                        ts->total_jobs++;
                return 0;
@@ -212,15 +635,16 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
                    exist then kill it. This cleans up after smbd
                    deaths */
                if (!process_exists(pjob.pid))
-                       tdb_delete(tdb, key);
+                       pjob_delete(ts->snum, jobid);
                else
                        ts->total_jobs++;
                return 0;
        }
 
        for (i=0;i<ts->qcount;i++) {
-               int qid = print_parse_jobid(ts->queue[i].file);
-               if (jobid == qid) break;
+               uint32 curr_jobid = print_parse_jobid(ts->queue[i].fs_file);
+               if (jobid == curr_jobid)
+                       break;
        }
        
        /* The job isn't in the system queue - we have to assume it has
@@ -238,7 +662,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
                   submitted less than lp_lpqcachetime() seconds ago. */
 
                if ((cur_t - pjob.starttime) > lp_lpqcachetime())
-                       tdb_delete(t, key);
+                       pjob_delete(ts->snum, jobid);
                else
                        ts->total_jobs++;
        }
@@ -249,13 +673,20 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
 }
 
 /****************************************************************************
-check if the print queue has been updated recently enough
+ Check if the print queue has been updated recently enough.
 ****************************************************************************/
+
 static void print_cache_flush(int snum)
 {
        fstring key;
-       slprintf(key, sizeof(key)-1, "CACHE/%s", lp_servicename(snum));
-       tdb_store_int(tdb, key, -1);
+       const char *printername = lp_const_servicename(snum);
+       struct tdb_print_db *pdb = get_print_db_byname(printername);
+
+       if (!pdb)
+               return;
+       slprintf(key, sizeof(key)-1, "CACHE/%s", printername);
+       tdb_store_int32(pdb->tdb, key, -1);
+       release_print_db(pdb);
 }
 
 /****************************************************************************
@@ -267,17 +698,23 @@ static pid_t get_updating_pid(fstring printer_name)
        fstring keystr;
        TDB_DATA data, key;
        pid_t updating_pid;
+       struct tdb_print_db *pdb = get_print_db_byname(printer_name);
 
+       if (!pdb)
+               return (pid_t)-1;
        slprintf(keystr, sizeof(keystr)-1, "UPDATING/%s", printer_name);
        key.dptr = keystr;
        key.dsize = strlen(keystr);
 
-       data = tdb_fetch(tdb, key);
-       if (!data.dptr || data.dsize != sizeof(pid_t))
+       data = tdb_fetch(pdb->tdb, key);
+       release_print_db(pdb);
+       if (!data.dptr || data.dsize != sizeof(pid_t)) {
+               SAFE_FREE(data.dptr);
                return (pid_t)-1;
+       }
 
        memcpy(&updating_pid, data.dptr, sizeof(pid_t));
-       free(data.dptr);
+       SAFE_FREE(data.dptr);
 
        if (process_exists(updating_pid))
                return updating_pid;
@@ -287,33 +724,39 @@ static pid_t get_updating_pid(fstring printer_name)
 
 /****************************************************************************
  Set the fact that we're doing the update, or have finished doing the update
- in th tdb.
+ in the tdb.
 ****************************************************************************/
 
-static void set_updating_pid(fstring printer_name, BOOL delete)
+static void set_updating_pid(const fstring printer_name, BOOL delete)
 {
        fstring keystr;
        TDB_DATA key;
        TDB_DATA data;
-       pid_t updating_pid = getpid();
+       pid_t updating_pid = sys_getpid();
+       struct tdb_print_db *pdb = get_print_db_byname(printer_name);
+
+       if (!pdb)
+               return;
 
        slprintf(keystr, sizeof(keystr)-1, "UPDATING/%s", printer_name);
        key.dptr = keystr;
        key.dsize = strlen(keystr);
 
        if (delete) {
-               tdb_delete(tdb, key);
+               tdb_delete(pdb->tdb, key);
+               release_print_db(pdb);
                return;
        }
        
        data.dptr = (void *)&updating_pid;
        data.dsize = sizeof(pid_t);
 
-       tdb_store(tdb, key, data, TDB_REPLACE); 
+       tdb_store(pdb->tdb, key, data, TDB_REPLACE);    
+       release_print_db(pdb);
 }
 
 /****************************************************************************
-update the internal database from the system print queue for a queue
+ Update the internal database from the system print queue for a queue.
 ****************************************************************************/
 
 static void print_queue_update(int snum)
@@ -326,21 +769,32 @@ static void print_queue_update(int snum)
        struct traverse_struct tstruct;
        fstring keystr, printer_name, cachestr;
        TDB_DATA data, key;
+       struct tdb_print_db *pdb;
+
+       fstrcpy(printer_name, lp_const_servicename(snum));
+       pdb = get_print_db_byname(printer_name);
+       if (!pdb)
+               return;
 
-       fstrcpy(printer_name, lp_servicename(snum));
-       
        /*
         * Check to see if someone else is doing this update.
         * This is essentially a mutex on the update.
         */
 
-       if (get_updating_pid(printer_name) != -1)
+       if (get_updating_pid(printer_name) != -1) {
+               release_print_db(pdb);
                return;
+       }
 
        /* Lock the queue for the database update */
 
        slprintf(keystr, sizeof(keystr) - 1, "LOCK/%s", printer_name);
-       tdb_lock_bystring(tdb, keystr);
+       /* Only wait 10 seconds for this. */
+       if (tdb_lock_bystring(pdb->tdb, keystr, 10) == -1) {
+               DEBUG(0,("print_queue_update: Failed to lock printer %s database\n", printer_name));
+               release_print_db(pdb);
+               return;
+       }
 
        /*
         * Ensure that no one else got in here.
@@ -352,7 +806,8 @@ static void print_queue_update(int snum)
                /*
                 * Someone else is doing the update, exit.
                 */
-               tdb_unlock_bystring(tdb, keystr);
+               tdb_unlock_bystring(pdb->tdb, keystr);
+               release_print_db(pdb);
                return;
        }
 
@@ -368,7 +823,7 @@ static void print_queue_update(int snum)
         * the update.
         */
 
-       tdb_unlock_bystring(tdb, keystr);
+       tdb_unlock_bystring(pdb->tdb, keystr);
 
        /*
         * Update the cache time FIRST ! Stops others even
@@ -377,7 +832,7 @@ static void print_queue_update(int snum)
         */
 
        slprintf(cachestr, sizeof(cachestr)-1, "CACHE/%s", printer_name);
-       tdb_store_int(tdb, cachestr, (int)time(NULL));
+       tdb_store_int32(pdb->tdb, cachestr, (int)time(NULL));
 
         /* get the current queue using the appropriate interface */
        ZERO_STRUCT(status);
@@ -398,16 +853,16 @@ static void print_queue_update(int snum)
          fill in any system job numbers as we go
        */
        for (i=0; i<qcount; i++) {
-               int jobid = print_parse_jobid(queue[i].file);
+               uint32 jobid = print_parse_jobid(queue[i].fs_file);
 
-               if (jobid == -1) {
+               if (jobid == (uint32)-1) {
                        /* assume its a unix print job */
                        print_unix_job(snum, &queue[i]);
                        continue;
                }
 
                /* we have an active SMB print job - update its status */
-               pjob = print_job_find(jobid);
+               pjob = print_job_find(snum, jobid);
                if (!pjob) {
                        /* err, somethings wrong. Probably smbd was restarted
                           with jobs in the queue. All we can do is treat them
@@ -419,7 +874,7 @@ static void print_queue_update(int snum)
                pjob->sysjob = queue[i].job;
                pjob->status = queue[i].status;
 
-               print_job_store(jobid, pjob);
+               pjob_store(snum, jobid, pjob);
        }
 
        /* now delete any queued entries that don't appear in the
@@ -429,23 +884,15 @@ static void print_queue_update(int snum)
        tstruct.snum = snum;
        tstruct.total_jobs = 0;
 
-       tdb_traverse(tdb, traverse_fn_delete, (void *)&tstruct);
+       tdb_traverse(pdb->tdb, traverse_fn_delete, (void *)&tstruct);
 
-       safe_free(tstruct.queue);
+       SAFE_FREE(tstruct.queue);
 
-       tdb_store_int(tdb, "INFO/total_jobs", tstruct.total_jobs);
-
-       /*
-        * Get the old print status. We will use this to compare the
-        * number of jobs. If they have changed we need to send a
-        * "changed" message to the smbds.
-        */
+       tdb_store_int32(pdb->tdb, "INFO/total_jobs", tstruct.total_jobs);
 
-       if( qcount != get_queue_status(snum, &old_status)) {
+       if( qcount != get_queue_status(snum, &old_status))
                DEBUG(10,("print_queue_update: queue status change %d jobs -> %d jobs for printer %s\n",
-                               old_status.qcount, qcount, printer_name ));
-               message_send_all(conn_tdb_ctx(), MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
-       }
+                                       old_status.qcount, qcount, printer_name ));
 
        /* store the new queue status structure */
        slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", printer_name);
@@ -455,7 +902,7 @@ static void print_queue_update(int snum)
        status.qcount = qcount;
        data.dptr = (void *)&status;
        data.dsize = sizeof(status);
-       tdb_store(tdb, key, data, TDB_REPLACE); 
+       tdb_store(pdb->tdb, key, data, TDB_REPLACE);    
 
        /*
         * Update the cache time again. We want to do this call
@@ -463,90 +910,291 @@ static void print_queue_update(int snum)
         */
 
        slprintf(keystr, sizeof(keystr)-1, "CACHE/%s", printer_name);
-       tdb_store_int(tdb, keystr, (int)time(NULL));
+       tdb_store_int32(pdb->tdb, keystr, (int32)time(NULL));
 
        /* Delete our pid from the db. */
        set_updating_pid(printer_name, True);
+       release_print_db(pdb);
 }
 
 /****************************************************************************
-check if a jobid is valid. It is valid if it exists in the database
+ Create/Update an entry in the print tdb that will allow us to send notify
+ updates only to interested smbd's. 
 ****************************************************************************/
-BOOL print_job_exists(int jobid)
+
+BOOL print_notify_register_pid(int snum)
 {
-       return tdb_exists(tdb, print_key(jobid));
+       TDB_DATA data;
+       struct tdb_print_db *pdb = NULL;
+       TDB_CONTEXT *tdb = NULL;
+       const char *printername;
+       uint32 mypid = (uint32)sys_getpid();
+       BOOL ret = False;
+       size_t i;
+
+       /* if (snum == -1), then the change notify request was
+          on a print server handle and we need to register on
+          all print queus */
+          
+       if (snum == -1) 
+       {
+               int num_services = lp_numservices();
+               int idx;
+               
+               for ( idx=0; idx<num_services; idx++ ) {
+                       if (lp_snum_ok(idx) && lp_print_ok(idx) )
+                               print_notify_register_pid(idx);
+               }
+               
+               return True;
+       }
+       else /* register for a specific printer */
+       {
+               printername = lp_const_servicename(snum);
+               pdb = get_print_db_byname(printername);
+               if (!pdb)
+                       return False;
+               tdb = pdb->tdb;
+       }
+
+       if (tdb_lock_bystring(tdb, NOTIFY_PID_LIST_KEY, 10) == -1) {
+               DEBUG(0,("print_notify_register_pid: Failed to lock printer %s\n",
+                                       printername));
+               if (pdb)
+                       release_print_db(pdb);
+               return False;
+       }
+
+       data = get_printer_notify_pid_list( tdb, printername, True );
+
+       /* Add ourselves and increase the refcount. */
+
+       for (i = 0; i < data.dsize; i += 8) {
+               if (IVAL(data.dptr,i) == mypid) {
+                       uint32 new_refcount = IVAL(data.dptr, i+4) + 1;
+                       SIVAL(data.dptr, i+4, new_refcount);
+                       break;
+               }
+       }
+
+       if (i == data.dsize) {
+               /* We weren't in the list. Realloc. */
+               data.dptr = Realloc(data.dptr, data.dsize + 8);
+               if (!data.dptr) {
+                       DEBUG(0,("print_notify_register_pid: Relloc fail for printer %s\n",
+                                               printername));
+                       goto done;
+               }
+               data.dsize += 8;
+               SIVAL(data.dptr,data.dsize - 8,mypid);
+               SIVAL(data.dptr,data.dsize - 4,1); /* Refcount. */
+       }
+
+       /* Store back the record. */
+       if (tdb_store_by_string(tdb, NOTIFY_PID_LIST_KEY, data, TDB_REPLACE) == -1) {
+               DEBUG(0,("print_notify_register_pid: Failed to update pid \
+list for printer %s\n", printername));
+               goto done;
+       }
+
+       ret = True;
+
+ done:
+
+       tdb_unlock_bystring(tdb, NOTIFY_PID_LIST_KEY);
+       if (pdb)
+               release_print_db(pdb);
+       SAFE_FREE(data.dptr);
+       return ret;
 }
 
+/****************************************************************************
+ Update an entry in the print tdb that will allow us to send notify
+ updates only to interested smbd's. 
+****************************************************************************/
+
+BOOL print_notify_deregister_pid(int snum)
+{
+       TDB_DATA data;
+       struct tdb_print_db *pdb = NULL;
+       TDB_CONTEXT *tdb = NULL;
+       const char *printername;
+       uint32 mypid = (uint32)sys_getpid();
+       size_t i;
+       BOOL ret = False;
+
+       /* if ( snum == -1 ), we are deregister a print server handle
+          which means to deregister on all print queues */
+          
+       if (snum == -1) 
+       {
+               int num_services = lp_numservices();
+               int idx;
+               
+               for ( idx=0; idx<num_services; idx++ ) {
+                       if ( lp_snum_ok(idx) && lp_print_ok(idx) )
+                               print_notify_deregister_pid(idx);
+               }
+               
+               return True;
+       }
+       else /* deregister a specific printer */
+       {
+               printername = lp_const_servicename(snum);
+               pdb = get_print_db_byname(printername);
+               if (!pdb)
+                       return False;
+               tdb = pdb->tdb;
+       }
+
+       if (tdb_lock_bystring(tdb, NOTIFY_PID_LIST_KEY, 10) == -1) {
+               DEBUG(0,("print_notify_register_pid: Failed to lock \
+printer %s database\n", printername));
+               if (pdb)
+                       release_print_db(pdb);
+               return False;
+       }
+
+       data = get_printer_notify_pid_list( tdb, printername, True );
+
+       /* Reduce refcount. Remove ourselves if zero. */
+
+       for (i = 0; i < data.dsize; ) {
+               if (IVAL(data.dptr,i) == mypid) {
+                       uint32 refcount = IVAL(data.dptr, i+4);
+
+                       refcount--;
+
+                       if (refcount == 0) {
+                               if (data.dsize - i > 8)
+                                       memmove( &data.dptr[i], &data.dptr[i+8], data.dsize - i - 8);
+                               data.dsize -= 8;
+                               continue;
+                       }
+                       SIVAL(data.dptr, i+4, refcount);
+               }
+
+               i += 8;
+       }
+
+       if (data.dsize == 0)
+               SAFE_FREE(data.dptr);
+
+       /* Store back the record. */
+       if (tdb_store_by_string(tdb, NOTIFY_PID_LIST_KEY, data, TDB_REPLACE) == -1) {
+               DEBUG(0,("print_notify_register_pid: Failed to update pid \
+list for printer %s\n", printername));
+               goto done;
+       }
+
+       ret = True;
+
+  done:
+
+       tdb_unlock_bystring(tdb, NOTIFY_PID_LIST_KEY);
+       if (pdb)
+               release_print_db(pdb);
+       SAFE_FREE(data.dptr);
+       return ret;
+}
 
 /****************************************************************************
-work out which service a jobid is for
-note that we have to look up by queue name to ensure that it works for 
-other than the process that started the job
+ Check if a jobid is valid. It is valid if it exists in the database.
 ****************************************************************************/
-int print_job_snum(int jobid)
+
+BOOL print_job_exists(int snum, uint32 jobid)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       if (!pjob) return -1;
+       struct tdb_print_db *pdb = get_print_db_byname(lp_const_servicename(snum));
+       BOOL ret;
 
-       return lp_servicenumber(pjob->qname);
+       if (!pdb)
+               return False;
+       ret = tdb_exists(pdb->tdb, print_key(jobid));
+       release_print_db(pdb);
+       return ret;
 }
 
 /****************************************************************************
-give the fd used for a jobid
+ Give the fd used for a jobid.
 ****************************************************************************/
-int print_job_fd(int jobid)
+
+int print_job_fd(int snum, uint32 jobid)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       if (!pjob) return -1;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       if (!pjob)
+               return -1;
        /* don't allow another process to get this info - it is meaningless */
-       if (pjob->pid != local_pid) return -1;
+       if (pjob->pid != local_pid)
+               return -1;
        return pjob->fd;
 }
 
 /****************************************************************************
-give the filename used for a jobid
-only valid for the process doing the spooling and when the job
-has not been spooled
+ Give the filename used for a jobid.
+ Only valid for the process doing the spooling and when the job
+ has not been spooled.
 ****************************************************************************/
-char *print_job_fname(int jobid)
+
+char *print_job_fname(int snum, uint32 jobid)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       if (!pjob || pjob->spooled || pjob->pid != local_pid) return NULL;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       if (!pjob || pjob->spooled || pjob->pid != local_pid)
+               return NULL;
        return pjob->filename;
 }
 
 
 /****************************************************************************
-set the place in the queue for a job
+ Give the filename used for a jobid.
+ Only valid for the process doing the spooling and when the job
+ has not been spooled.
+****************************************************************************/
+
+NT_DEVICEMODE *print_job_devmode(int snum, uint32 jobid)
+{
+       struct printjob *pjob = print_job_find(snum, jobid);
+       
+       if ( !pjob )
+               return NULL;
+               
+       return pjob->nt_devmode;
+}
+
+/****************************************************************************
+ Set the place in the queue for a job.
 ****************************************************************************/
-BOOL print_job_set_place(int jobid, int place)
+
+BOOL print_job_set_place(int snum, uint32 jobid, int place)
 {
        DEBUG(2,("print_job_set_place not implemented yet\n"));
        return False;
 }
 
 /****************************************************************************
-set the name of a job. Only possible for owner
+ Set the name of a job. Only possible for owner.
 ****************************************************************************/
-BOOL print_job_set_name(int jobid, char *name)
+
+BOOL print_job_set_name(int snum, uint32 jobid, char *name)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       if (!pjob || pjob->pid != local_pid) return False;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       if (!pjob || pjob->pid != local_pid)
+               return False;
 
        fstrcpy(pjob->jobname, name);
-       return print_job_store(jobid, pjob);
+       return pjob_store(snum, jobid, pjob);
 }
 
-
 /****************************************************************************
-delete a print job - don't update queue
+ Delete a print job - don't update queue.
 ****************************************************************************/
-static BOOL print_job_delete1(int jobid)
+
+static BOOL print_job_delete1(int snum, uint32 jobid)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       int snum, result = 0;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       int result = 0;
 
-       if (!pjob) return False;
+       if (!pjob)
+               return False;
 
        /*
         * If already deleting just return.
@@ -555,20 +1203,17 @@ static BOOL print_job_delete1(int jobid)
        if (pjob->status == LPQ_DELETING)
                return True;
 
-       snum = print_job_snum(jobid);
-
        /* Hrm - we need to be able to cope with deleting a job before it
           has reached the spooler. */
 
        if (pjob->sysjob == -1) {
-               DEBUG(5, ("attempt to delete job %d not seen by lpr\n",
-                         jobid));
+               DEBUG(5, ("attempt to delete job %u not seen by lpr\n", (unsigned int)jobid));
        }
 
        /* Set the tdb entry to be deleting. */
 
        pjob->status = LPQ_DELETING;
-       print_job_store(jobid, pjob);
+       pjob_store(snum, jobid, pjob);
 
        if (pjob->spooled && pjob->sysjob != -1)
                result = (*(current_printif->job_delete))(snum, pjob);
@@ -576,22 +1221,23 @@ static BOOL print_job_delete1(int jobid)
        /* Delete the tdb entry if the delete suceeded or the job hasn't
           been spooled. */
 
-       if (result == 0) {
-               tdb_delete(tdb, print_key(jobid));
-       }
+       if (result == 0)
+               pjob_delete(snum, jobid);
 
        return (result == 0);
 }
 
 /****************************************************************************
-return true if the current user owns the print job
+ Return true if the current user owns the print job.
 ****************************************************************************/
-static BOOL is_owner(struct current_user *user, int jobid)
+
+static BOOL is_owner(struct current_user *user, int snum, uint32 jobid)
 {
-       struct printjob *pjob = print_job_find(jobid);
+       struct printjob *pjob = print_job_find(snum, jobid);
        user_struct *vuser;
 
-       if (!pjob || !user) return False;
+       if (!pjob || !user)
+               return False;
 
        if ((vuser = get_valid_user_struct(user->vuid)) != NULL) {
                return strequal(pjob->user, vuser->user.smb_name);
@@ -601,15 +1247,17 @@ static BOOL is_owner(struct current_user *user, int jobid)
 }
 
 /****************************************************************************
-delete a print job
+ Delete a print job.
 ****************************************************************************/
-BOOL print_job_delete(struct current_user *user, int jobid, WERROR *errcode)
+
+BOOL print_job_delete(struct current_user *user, int snum, uint32 jobid, WERROR *errcode)
 {
-       int snum = print_job_snum(jobid);
-       char *printer_name;
-       BOOL owner;
-       
-       owner = is_owner(user, jobid);
+       BOOL    owner, deleted;
+       char    *fname;
+
+       *errcode = WERR_OK;
+               
+       owner = is_owner(user, snum, jobid);
        
        /* Check access against security descriptor or whether the user
           owns their job. */
@@ -618,44 +1266,79 @@ BOOL print_job_delete(struct current_user *user, int jobid, WERROR *errcode)
            !print_access_check(user, snum, JOB_ACCESS_ADMINISTER)) {
                DEBUG(3, ("delete denied by security descriptor\n"));
                *errcode = WERR_ACCESS_DENIED;
+
+               /* BEGIN_ADMIN_LOG */
+               sys_adminlog( LOG_ERR, (char *)
+                        "Permission denied-- user not allowed to delete, \
+pause, or resume print job. User name: %s. Printer name: %s.",
+                               uidtoname(user->uid), PRINTERNAME(snum) );
+               /* END_ADMIN_LOG */
+
                return False;
        }
 
-       if (!print_job_delete1(jobid)) return False;
+       /* 
+        * get the spooled filename of the print job
+        * if this works, then the file has not been spooled
+        * to the underlying print system.  Just delete the 
+        * spool file & return.
+        */
+        
+       if ( (fname = print_job_fname( snum, jobid )) != NULL )
+       {
+               /* remove the spool file */
+               DEBUG(10,("print_job_delete: Removing spool file [%s]\n", fname ));
+               if ( unlink( fname ) == -1 ) {
+                       *errcode = map_werror_from_unix(errno);
+                       return False;
+               }
+               
+               return True;
+       }
+       
+       if (!print_job_delete1(snum, jobid)) {
+               *errcode = WERR_ACCESS_DENIED;
+               return False;
+       }
 
        /* force update the database and say the delete failed if the
            job still exists */
 
        print_queue_update(snum);
+       
+       deleted = !print_job_exists(snum, jobid);
+       if ( !deleted )
+               *errcode = WERR_ACCESS_DENIED;
 
-       /* Send a printer notify message */
-
-       printer_name = PRINTERNAME(snum);
-
-       message_send_all(conn_tdb_ctx(), MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
-
-       return !print_job_exists(jobid);
+       return deleted;
 }
 
-
 /****************************************************************************
-pause a job
+ Pause a job.
 ****************************************************************************/
-BOOL print_job_pause(struct current_user *user, int jobid, WERROR *errcode)
+
+BOOL print_job_pause(struct current_user *user, int snum, uint32 jobid, WERROR *errcode)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       int snum, ret = -1;
-       char *printer_name;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       int ret = -1;
        
-       if (!pjob || !user) return False;
-
-       if (!pjob->spooled || pjob->sysjob == -1) return False;
+       if (!pjob || !user) 
+               return False;
 
-       snum = print_job_snum(jobid);
+       if (!pjob->spooled || pjob->sysjob == -1) 
+               return False;
 
-       if (!is_owner(user, jobid) &&
+       if (!is_owner(user, snum, jobid) &&
            !print_access_check(user, snum, JOB_ACCESS_ADMINISTER)) {
                DEBUG(3, ("pause denied by security descriptor\n"));
+
+               /* BEGIN_ADMIN_LOG */
+               sys_adminlog( LOG_ERR, (char *)
+                       "Permission denied-- user not allowed to delete, \
+pause, or resume print job. User name: %s. Printer name: %s.",
+                               uidtoname(user->uid), PRINTERNAME(snum) );
+               /* END_ADMIN_LOG */
+
                *errcode = WERR_ACCESS_DENIED;
                return False;
        }
@@ -673,9 +1356,7 @@ BOOL print_job_pause(struct current_user *user, int jobid, WERROR *errcode)
 
        /* Send a printer notify message */
 
-       printer_name = PRINTERNAME(snum);
-
-       message_send_all(conn_tdb_ctx(), MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
+       notify_job_status(snum, jobid, JOB_STATUS_PAUSED);
 
        /* how do we tell if this succeeded? */
 
@@ -683,24 +1364,31 @@ BOOL print_job_pause(struct current_user *user, int jobid, WERROR *errcode)
 }
 
 /****************************************************************************
-resume a job
+ Resume a job.
 ****************************************************************************/
-BOOL print_job_resume(struct current_user *user, int jobid, WERROR *errcode)
+
+BOOL print_job_resume(struct current_user *user, int snum, uint32 jobid, WERROR *errcode)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       char *printer_name;
-       int snum, ret;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       int ret;
        
-       if (!pjob || !user) return False;
-
-       if (!pjob->spooled || pjob->sysjob == -1) return False;
+       if (!pjob || !user)
+               return False;
 
-       snum = print_job_snum(jobid);
+       if (!pjob->spooled || pjob->sysjob == -1)
+               return False;
 
-       if (!is_owner(user, jobid) &&
+       if (!is_owner(user, snum, jobid) &&
            !print_access_check(user, snum, JOB_ACCESS_ADMINISTER)) {
                DEBUG(3, ("resume denied by security descriptor\n"));
                *errcode = WERR_ACCESS_DENIED;
+
+               /* BEGIN_ADMIN_LOG */
+               sys_adminlog( LOG_ERR, (char *)
+                        "Permission denied-- user not allowed to delete, \
+pause, or resume print job. User name: %s. Printer name: %s.",
+                       uidtoname(user->uid), PRINTERNAME(snum) );
+               /* END_ADMIN_LOG */
                return False;
        }
 
@@ -716,24 +1404,32 @@ BOOL print_job_resume(struct current_user *user, int jobid, WERROR *errcode)
 
        /* Send a printer notify message */
 
-       printer_name = PRINTERNAME(snum);
-
-       message_send_all(conn_tdb_ctx(),MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
+       notify_job_status(snum, jobid, JOB_STATUS_QUEUED);
 
        return True;
 }
 
 /****************************************************************************
-write to a print file
+ Write to a print file.
 ****************************************************************************/
-int print_job_write(int jobid, const char *buf, int size)
+
+int print_job_write(int snum, uint32 jobid, const char *buf, int size)
 {
-       int fd;
+       int return_code;
+       struct printjob *pjob = print_job_find(snum, jobid);
 
-       fd = print_job_fd(jobid);
-       if (fd == -1) return -1;
+       if (!pjob)
+               return -1;
+       /* don't allow another process to get this info - it is meaningless */
+       if (pjob->pid != local_pid)
+               return -1;
 
-       return write(fd, buf, size);
+       return_code = write(pjob->fd, buf, size);
+       if (return_code>0) {
+               pjob->size += size;
+               pjob_store(snum, jobid, pjob);
+       }
+       return return_code;
 }
 
 /****************************************************************************
@@ -743,35 +1439,61 @@ int print_job_write(int jobid, const char *buf, int size)
 static BOOL print_cache_expired(int snum)
 {
        fstring key;
-       time_t t2, t = time(NULL);
+       time_t last_qscan_time, time_now = time(NULL);
+       const char *printername = lp_const_servicename(snum);
+       struct tdb_print_db *pdb = get_print_db_byname(printername);
 
-       slprintf(key, sizeof(key)-1, "CACHE/%s", lp_servicename(snum));
-       t2 = tdb_fetch_int(tdb, key);
-       if (t2 == ((time_t)-1) || (t - t2) >= lp_lpqcachetime()) {
-               DEBUG(3, ("print cache expired\n"));
+       if (!pdb)
+               return False;
+
+       slprintf(key, sizeof(key), "CACHE/%s", printername);
+       last_qscan_time = (time_t)tdb_fetch_int32(pdb->tdb, key);
+
+       /*
+        * Invalidate the queue for 3 reasons.
+        * (1). last queue scan time == -1.
+        * (2). Current time - last queue scan time > allowed cache time.
+        * (3). last queue scan time > current time + MAX_CACHE_VALID_TIME (1 hour by default).
+        * This last test picks up machines for which the clock has been moved
+        * forward, an lpq scan done and then the clock moved back. Otherwise
+        * that last lpq scan would stay around for a loooong loooong time... :-). JRA.
+        */
+
+       if (last_qscan_time == ((time_t)-1) || (time_now - last_qscan_time) >= lp_lpqcachetime() ||
+                       last_qscan_time > (time_now + MAX_CACHE_VALID_TIME)) {
+               DEBUG(3, ("print cache expired for queue %s \
+(last_qscan_time = %d, time now = %d, qcachetime = %d)\n", printername,
+                       (int)last_qscan_time, (int)time_now, (int)lp_lpqcachetime() ));
+               release_print_db(pdb);
                return True;
        }
+       release_print_db(pdb);
        return False;
 }
 
 /****************************************************************************
  Get the queue status - do not update if db is out of date.
 ****************************************************************************/
+
 static int get_queue_status(int snum, print_status_struct *status)
 {
        fstring keystr;
        TDB_DATA data, key;
+       const char *printername = lp_const_servicename(snum);
+       struct tdb_print_db *pdb = get_print_db_byname(printername);
+       if (!pdb)
+               return 0;
 
        ZERO_STRUCTP(status);
-       slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", lp_servicename(snum));
+       slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", printername);
        key.dptr = keystr;
        key.dsize = strlen(keystr);
-       data = tdb_fetch(tdb, key);
+       data = tdb_fetch(pdb->tdb, key);
+       release_print_db(pdb);
        if (data.dptr) {
-               if (data.dsize == sizeof(print_status_struct)) {
+               if (data.dsize == sizeof(print_status_struct))
                        memcpy(status, data.dptr, sizeof(print_status_struct));
-               }
-               free(data.dptr);
+               SAFE_FREE(data.dptr);
        }
        return status->qcount;
 }
@@ -779,55 +1501,55 @@ static int get_queue_status(int snum, print_status_struct *status)
 /****************************************************************************
  Determine the number of jobs in a queue.
 ****************************************************************************/
-static int print_queue_length(int snum)
+
+int print_queue_length(int snum, print_status_struct *pstatus)
 {
        print_status_struct status;
-
+       int len;
        /* make sure the database is up to date */
-       if (print_cache_expired(snum)) print_queue_update(snum);
-
+       if (print_cache_expired(snum))
+               print_queue_update(snum);
        /* also fetch the queue status */
-       return get_queue_status(snum, &status);
-}
-
-/****************************************************************************
- Determine the number of jobs in all queues.
-****************************************************************************/
-static int get_total_jobs(int snum)
-{
-       int total_jobs;
-
-       /* make sure the database is up to date */
-       if (print_cache_expired(snum)) print_queue_update(snum);
-
-       total_jobs = tdb_fetch_int(tdb, "INFO/total_jobs");
-       if (total_jobs >0)
-               return total_jobs;
-       else
-               return 0;
+       memset(&status, 0, sizeof(status));
+       len = get_queue_status(snum, &status);
+       if (pstatus)
+               *pstatus = status;
+       return len;
 }
 
 /***************************************************************************
-start spooling a job - return the jobid
+ Start spooling a job - return the jobid.
 ***************************************************************************/
-int print_job_start(struct current_user *user, int snum, char *jobname)
+
+uint32 print_job_start(struct current_user *user, int snum, char *jobname, NT_DEVICEMODE *nt_devmode )
 {
-       int jobid;
+       uint32 jobid;
        char *path;
        struct printjob pjob;
        int next_jobid;
        user_struct *vuser;
+       int njobs = 0;
+       const char *printername = lp_const_servicename(snum);
+       struct tdb_print_db *pdb = get_print_db_byname(printername);
+       BOOL pdb_locked = False;
 
        errno = 0;
 
+       if (!pdb)
+               return (uint32)-1;
+
        if (!print_access_check(user, snum, PRINTER_ACCESS_USE)) {
                DEBUG(3, ("print_job_start: job start denied by security descriptor\n"));
-               return -1;
+               release_print_db(pdb);
+               return (uint32)-1;
        }
 
        if (!print_time_access_check(snum)) {
                DEBUG(3, ("print_job_start: job start denied by time check\n"));
-               return -1;
+               release_print_db(pdb);
+               return (uint32)-1;
        }
 
        path = lp_pathname(snum);
@@ -838,36 +1560,81 @@ int print_job_start(struct current_user *user, int snum, char *jobname)
                if (sys_fsusage(path, &dspace, &dsize) == 0 &&
                    dspace < 2*(SMB_BIG_UINT)lp_minprintspace(snum)) {
                        DEBUG(3, ("print_job_start: disk space check failed.\n"));
+                       release_print_db(pdb);
                        errno = ENOSPC;
-                       return -1;
+                       return (uint32)-1;
                }
        }
 
        /* for autoloaded printers, check that the printcap entry still exists */
-       if (lp_autoloaded(snum) && !pcap_printername_ok(lp_servicename(snum), NULL)) {
-               DEBUG(3, ("print_job_start: printer name %s check failed.\n", lp_servicename(snum) ));
+       if (lp_autoloaded(snum) && !pcap_printername_ok(lp_const_servicename(snum), NULL)) {
+               DEBUG(3, ("print_job_start: printer name %s check failed.\n", lp_const_servicename(snum) ));
+               release_print_db(pdb);
                errno = ENOENT;
-               return -1;
+               return (uint32)-1;
        }
 
        /* Insure the maximum queue size is not violated */
-       if (lp_maxprintjobs(snum) && print_queue_length(snum) > lp_maxprintjobs(snum)) {
+       if ((njobs = print_queue_length(snum,NULL)) > lp_maxprintjobs(snum)) {
                DEBUG(3, ("print_job_start: number of jobs (%d) larger than max printjobs per queue (%d).\n",
-                       print_queue_length(snum), lp_maxprintjobs(snum) ));
+                       njobs, lp_maxprintjobs(snum) ));
+               release_print_db(pdb);
                errno = ENOSPC;
-               return -1;
+               return (uint32)-1;
        }
 
-       /* Insure the maximum print jobs in the system is not violated */
-       if (lp_totalprintjobs() && get_total_jobs(snum) > lp_totalprintjobs()) {
-               DEBUG(3, ("print_job_start: number of jobs (%d) larger than max printjobs per system (%d).\n",
-                       print_queue_length(snum), lp_totalprintjobs() ));
-               errno = ENOSPC;
-               return -1;
+       /* Lock the database - only wait 20 seconds. */
+       if (tdb_lock_bystring(pdb->tdb, "INFO/nextjob", 20) == -1) {
+               DEBUG(0,("print_job_start: failed to lock printing database %s\n", printername ));
+               release_print_db(pdb);
+               return (uint32)-1;
+       }
+
+       pdb_locked = True;
+
+       next_jobid = tdb_fetch_int32(pdb->tdb, "INFO/nextjob");
+       if (next_jobid == -1)
+               next_jobid = 1;
+
+       for (jobid = NEXT_JOBID(next_jobid); jobid != next_jobid; jobid = NEXT_JOBID(jobid)) {
+               if (!print_job_exists(snum, jobid))
+                       break;
+       }
+                               
+       if (jobid == next_jobid) {
+               DEBUG(3, ("print_job_start: jobid (%d)==next_jobid(%d).\n",
+                               jobid, next_jobid ));
+               jobid = -1;
+               goto fail;
+       }
+
+       /* Store a dummy placeholder. This must be quick as we have the lock. */
+       {
+               TDB_DATA dum;
+               dum.dptr = NULL;
+               dum.dsize = 0;
+               if (tdb_store(pdb->tdb, print_key(jobid), dum, TDB_INSERT) == -1) {
+                       DEBUG(3, ("print_job_start: jobid (%d) failed to store placeholder.\n",
+                               jobid ));
+                       jobid = -1;
+                       goto fail;
+               }
+       }
+
+       if (tdb_store_int32(pdb->tdb, "INFO/nextjob", jobid)==-1) {
+               DEBUG(3, ("print_job_start: failed to store INFO/nextjob.\n"));
+               jobid = -1;
+               goto fail;
        }
 
+       /* We've finished with the INFO/nextjob lock. */
+       tdb_unlock_bystring(pdb->tdb, "INFO/nextjob");
+       pdb_locked = False;
+
        /* create the database entry */
+       
        ZERO_STRUCT(pjob);
+       
        pjob.pid = local_pid;
        pjob.sysjob = -1;
        pjob.fd = -1;
@@ -876,7 +1643,8 @@ int print_job_start(struct current_user *user, int snum, char *jobname)
        pjob.size = 0;
        pjob.spooled = False;
        pjob.smbjob = True;
-
+       pjob.nt_devmode = nt_devmode;
+       
        fstrcpy(pjob.jobname, jobname);
 
        if ((vuser = get_valid_user_struct(user->vuid)) != NULL) {
@@ -885,31 +1653,11 @@ int print_job_start(struct current_user *user, int snum, char *jobname)
                fstrcpy(pjob.user, uidtoname(user->uid));
        }
 
-       fstrcpy(pjob.qname, lp_servicename(snum));
-
-       /* lock the database */
-       tdb_lock_bystring(tdb, "INFO/nextjob");
-
-       next_jobid = tdb_fetch_int(tdb, "INFO/nextjob");
-       if (next_jobid == -1)
-               next_jobid = 1;
-
-       for (jobid = NEXT_JOBID(next_jobid); jobid != next_jobid; jobid = NEXT_JOBID(jobid)) {
-               if (!print_job_exists(jobid))
-                       break;
-       }
-       if (jobid == next_jobid || !print_job_store(jobid, &pjob)) {
-               DEBUG(3, ("print_job_start: either jobid (%d)==next_jobid(%d) or print_job_store failed.\n",
-                               jobid, next_jobid ));
-               jobid = -1;
-               goto fail;
-       }
-
-       tdb_store_int(tdb, "INFO/nextjob", jobid);
+       fstrcpy(pjob.queuename, lp_const_servicename(snum));
 
        /* we have a job entry - now create the spool file */
-       slprintf(pjob.filename, sizeof(pjob.filename)-1, "%s/%s%.6d.XXXXXX", 
-                path, PRINT_SPOOL_PREFIX, jobid);
+       slprintf(pjob.filename, sizeof(pjob.filename)-1, "%s/%s%.8u.XXXXXX", 
+                path, PRINT_SPOOL_PREFIX, (unsigned int)jobid);
        pjob.fd = smb_mkstemp(pjob.filename);
 
        if (pjob.fd == -1) {
@@ -925,44 +1673,51 @@ to open spool file %s.\n", pjob.filename));
                goto fail;
        }
 
-       print_job_store(jobid, &pjob);
+       pjob_store(snum, jobid, &pjob);
 
-       tdb_unlock_bystring(tdb, "INFO/nextjob");
-
-       /*
-        * If the printer is marked as postscript output a leading
-        * file identifier to ensure the file is treated as a raw
-        * postscript file.
-        * This has a similar effect as CtrlD=0 in WIN.INI file.
-        * tim@fsg.com 09/06/94
-        */
-       if (lp_postscript(snum)) {
-               print_job_write(jobid, "%!\n",3);
-       }
+       release_print_db(pdb);
 
        return jobid;
 
  fail:
-       if (jobid != -1) {
-               tdb_delete(tdb, print_key(jobid));
-       }
+       if (jobid != -1)
+               pjob_delete(snum, jobid);
 
-       tdb_unlock_bystring(tdb, "INFO/nextjob");
+       if (pdb_locked)
+               tdb_unlock_bystring(pdb->tdb, "INFO/nextjob");
+       release_print_db(pdb);
 
        DEBUG(3, ("print_job_start: returning fail. Error = %s\n", strerror(errno) ));
        return -1;
 }
 
+/****************************************************************************
+ Update the number of pages spooled to jobid
+****************************************************************************/
+
+void print_job_endpage(int snum, uint32 jobid)
+{
+       struct printjob *pjob = print_job_find(snum, jobid);
+       if (!pjob)
+               return;
+       /* don't allow another process to get this info - it is meaningless */
+       if (pjob->pid != local_pid)
+               return;
+
+       pjob->page_count++;
+       pjob_store(snum, jobid, pjob);
+}
+
 /****************************************************************************
  Print a file - called on closing the file. This spools the job.
  If normal close is false then we're tearing down the jobs - treat as an
  error.
 ****************************************************************************/
 
-BOOL print_job_end(int jobid, BOOL normal_close)
+BOOL print_job_end(int snum, uint32 jobid, BOOL normal_close)
 {
-       struct printjob *pjob = print_job_find(jobid);
-       int snum, ret;
+       struct printjob *pjob = print_job_find(snum, jobid);
+       int ret;
        SMB_STRUCT_STAT sbuf;
 
        if (!pjob)
@@ -971,8 +1726,6 @@ BOOL print_job_end(int jobid, BOOL normal_close)
        if (pjob->spooled || pjob->pid != local_pid)
                return False;
 
-       snum = print_job_snum(jobid);
-
        if (normal_close && (sys_fstat(pjob->fd, &sbuf) == 0)) {
                pjob->size = sbuf.st_size;
                close(pjob->fd);
@@ -989,7 +1742,7 @@ BOOL print_job_end(int jobid, BOOL normal_close)
                goto fail;
        }
 
-       /* Technically, this is not quit right. If the printer has a separator
+       /* Technically, this is not quite right. If the printer has a separator
         * page turned on, the NT spooler prints the separator page even if the
         * print job is 0 bytes. 010215 JRR */
        if (pjob->size == 0 || pjob->status == LPQ_DELETING) {
@@ -997,7 +1750,7 @@ BOOL print_job_end(int jobid, BOOL normal_close)
                DEBUG(5,("print_job_end: canceling spool of %s (%s)\n",
                        pjob->filename, pjob->size ? "deleted" : "zero length" ));
                unlink(pjob->filename);
-               tdb_delete(tdb, print_key(jobid));
+               pjob_delete(snum, jobid);
                return True;
        }
 
@@ -1010,7 +1763,7 @@ BOOL print_job_end(int jobid, BOOL normal_close)
        
        pjob->spooled = True;
        pjob->status = LPQ_QUEUED;
-       print_job_store(jobid, pjob);
+       pjob_store(snum, jobid, pjob);
        
        /* make sure the database is up to date */
        if (print_cache_expired(snum))
@@ -1023,35 +1776,49 @@ fail:
        /* The print job was not succesfully started. Cleanup */
        /* Still need to add proper error return propagation! 010122:JRR */
        unlink(pjob->filename);
-       tdb_delete(tdb, print_key(jobid));
+       pjob_delete(snum, jobid);
        return False;
 }
 
-/* utility fn to enumerate the print queue */
+/****************************************************************************
+ Utility fn to enumerate the print queue.
+****************************************************************************/
+
 static int traverse_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *state)
 {
        struct traverse_struct *ts = (struct traverse_struct *)state;
        struct printjob pjob;
-       int i, jobid;
+       int i;
+       uint32 jobid;
 
-       if (data.dsize != sizeof(pjob) || key.dsize != sizeof(int)) return 0;
+       /* sanity checks */
+       
+       if ( key.dsize != sizeof(jobid) )
+               return 0;
+               
        memcpy(&jobid, key.dptr, sizeof(jobid));
-       memcpy(&pjob,  data.dptr, sizeof(pjob));
+       
+       if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
+               return 0;
+       free_nt_devicemode( &pjob.nt_devmode );
 
        /* maybe it isn't for this queue */
-       if (ts->snum != print_queue_snum(pjob.qname)) return 0;
+       if (ts->snum != lp_servicenumber(pjob.queuename))
+               return 0;
 
-       if (ts->qcount >= ts->maxcount) return 0;
+       if (ts->qcount >= ts->maxcount)
+               return 0;
 
        i = ts->qcount;
 
        ts->queue[i].job = jobid;
        ts->queue[i].size = pjob.size;
+       ts->queue[i].page_count = pjob.page_count;
        ts->queue[i].status = pjob.status;
        ts->queue[i].priority = 1;
        ts->queue[i].time = pjob.starttime;
-       fstrcpy(ts->queue[i].user, pjob.user);
-       fstrcpy(ts->queue[i].file, pjob.jobname);
+       fstrcpy(ts->queue[i].fs_user, pjob.user);
+       fstrcpy(ts->queue[i].fs_file, pjob.jobname);
 
        ts->qcount++;
 
@@ -1062,44 +1829,63 @@ struct traverse_count_struct {
        int snum, count;
 };
 
-/* utility fn to count the number of entries in the print queue */
+/****************************************************************************
+ Utility fn to count the number of entries in the print queue.
+****************************************************************************/
+
 static int traverse_count_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *state)
 {
        struct traverse_count_struct *ts = (struct traverse_count_struct *)state;
        struct printjob pjob;
-       int jobid;
+       uint32 jobid;
 
-       if (data.dsize != sizeof(pjob) || key.dsize != sizeof(int)) return 0;
+       /* sanity checks */
+       
+       if (  key.dsize != sizeof(jobid) )
+               return 0;
+               
        memcpy(&jobid, key.dptr, sizeof(jobid));
-       memcpy(&pjob,  data.dptr, sizeof(pjob));
+       
+       if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
+               return 0;
+               
+       free_nt_devicemode( &pjob.nt_devmode );
 
-       /* maybe it isn't for this queue */
-       if (ts->snum != print_queue_snum(pjob.qname)) return 0;
+       /* maybe it isn't for this queue - this cannot happen with the tdb/printer code. JRA */
+       if (ts->snum != lp_servicenumber(pjob.queuename))
+               return 0;
 
        ts->count++;
 
        return 0;
 }
 
-/* Sort print jobs by submittal time */
+/****************************************************************************
+ Sort print jobs by submittal time.
+****************************************************************************/
 
 static int printjob_comp(print_queue_struct *j1, print_queue_struct *j2)
 {
        /* Silly cases */
 
-       if (!j1 && !j2) return 0;
-       if (!j1) return -1;
-       if (!j2) return 1;
+       if (!j1 && !j2)
+               return 0;
+       if (!j1)
+               return -1;
+       if (!j2)
+               return 1;
 
        /* Sort on job start time */
 
-       if (j1->time == j2->time) return 0;
+       if (j1->time == j2->time)
+               return 0;
        return (j1->time > j2->time) ? 1 : -1;
 }
 
 /****************************************************************************
-get a printer queue listing
+ Get a printer queue listing.
 ****************************************************************************/
+
 int print_queue_status(int snum, 
                       print_queue_struct **queue,
                       print_status_struct *status)
@@ -1108,26 +1894,32 @@ int print_queue_status(int snum,
        struct traverse_count_struct tsc;
        fstring keystr;
        TDB_DATA data, key;
-
-       /* make sure the database is up to date */
-       if (print_cache_expired(snum)) print_queue_update(snum);
+       const char *printername = lp_const_servicename(snum);
+       struct tdb_print_db *pdb = get_print_db_byname(printername);
 
        *queue = NULL;
        
+       if (!pdb)
+               return 0;
+
+       /* make sure the database is up to date */
+       if (print_cache_expired(snum))
+               print_queue_update(snum);
+
        /*
         * Fetch the queue status.  We must do this first, as there may
         * be no jobs in the queue.
         */
        ZERO_STRUCTP(status);
-       slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", lp_servicename(snum));
+       slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", printername);
        key.dptr = keystr;
        key.dsize = strlen(keystr);
-       data = tdb_fetch(tdb, key);
+       data = tdb_fetch(pdb->tdb, key);
        if (data.dptr) {
                if (data.dsize == sizeof(*status)) {
                        memcpy(status, data.dptr, sizeof(*status));
                }
-               free(data.dptr);
+               SAFE_FREE(data.dptr);
        }
 
        /*
@@ -1137,16 +1929,19 @@ int print_queue_status(int snum,
        tsc.count = 0;
        tsc.snum = snum;
        
-       tdb_traverse(tdb, traverse_count_fn_queue, (void *)&tsc);
+       tdb_traverse(pdb->tdb, traverse_count_fn_queue, (void *)&tsc);
 
-       if (tsc.count == 0)
+       if (tsc.count == 0) {
+               release_print_db(pdb);
                return 0;
+       }
 
        /* Allocate the queue size. */
        if ((tstruct.queue = (print_queue_struct *)
-            malloc(sizeof(print_queue_struct)*tsc.count))
-                               == NULL)
+            malloc(sizeof(print_queue_struct)*tsc.count)) == NULL) {
+               release_print_db(pdb);
                return 0;
+       }
 
        /*
         * Fill in the queue.
@@ -1157,7 +1952,8 @@ int print_queue_status(int snum,
        tstruct.maxcount = tsc.count;
        tstruct.snum = snum;
 
-       tdb_traverse(tdb, traverse_fn_queue, (void *)&tstruct);
+       tdb_traverse(pdb->tdb, traverse_fn_queue, (void *)&tstruct);
+       release_print_db(pdb);
 
        /* Sort the queue by submission time otherwise they are displayed
           in hash order. */
@@ -1169,24 +1965,12 @@ int print_queue_status(int snum,
        return tstruct.qcount;
 }
 
-
 /****************************************************************************
-turn a queue name into a snum
+ Pause a queue.
 ****************************************************************************/
-int print_queue_snum(char *qname)
-{
-       int snum = lp_servicenumber(qname);
-       if (snum == -1 || !lp_print_ok(snum)) return -1;
-       return snum;
-}
 
-
-/****************************************************************************
- pause a queue
-****************************************************************************/
 BOOL print_queue_pause(struct current_user *user, int snum, WERROR *errcode)
 {
-       char *printer_name;
        int ret;
        
        if (!print_access_check(user, snum, PRINTER_ACCESS_ADMINISTER)) {
@@ -1206,19 +1990,17 @@ BOOL print_queue_pause(struct current_user *user, int snum, WERROR *errcode)
 
        /* Send a printer notify message */
 
-       printer_name = PRINTERNAME(snum);
-
-       message_send_all(conn_tdb_ctx(),MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
+       notify_printer_status(snum, PRINTER_STATUS_PAUSED);
 
        return True;
 }
 
 /****************************************************************************
- resume a queue
+ Resume a queue.
 ****************************************************************************/
+
 BOOL print_queue_resume(struct current_user *user, int snum, WERROR *errcode)
 {
-       char *printer_name;
        int ret;
 
        if (!print_access_check(user, snum, PRINTER_ACCESS_ADMINISTER)) {
@@ -1234,25 +2016,24 @@ BOOL print_queue_resume(struct current_user *user, int snum, WERROR *errcode)
        }
 
        /* make sure the database is up to date */
-       if (print_cache_expired(snum)) print_queue_update(snum);
+       if (print_cache_expired(snum))
+               print_queue_update(snum);
 
        /* Send a printer notify message */
 
-       printer_name = PRINTERNAME(snum);
-
-       message_send_all(conn_tdb_ctx(),MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
+       notify_printer_status(snum, PRINTER_STATUS_OK);
 
        return True;
 }
 
 /****************************************************************************
- purge a queue - implemented by deleting all jobs that we can delete
+ Purge a queue - implemented by deleting all jobs that we can delete.
 ****************************************************************************/
+
 BOOL print_queue_purge(struct current_user *user, int snum, WERROR *errcode)
 {
        print_queue_struct *queue;
        print_status_struct status;
-       char *printer_name;
        int njobs, i;
        BOOL can_job_admin;
 
@@ -1263,20 +2044,14 @@ BOOL print_queue_purge(struct current_user *user, int snum, WERROR *errcode)
        njobs = print_queue_status(snum, &queue, &status);
 
        for (i=0;i<njobs;i++) {
-               BOOL owner = is_owner(user, queue[i].job);
+               BOOL owner = is_owner(user, snum, queue[i].job);
 
                if (owner || can_job_admin) {
-                       print_job_delete1(queue[i].job);
+                       print_job_delete1(snum, queue[i].job);
                }
        }
 
-       safe_free(queue);
-
-       /* Send a printer notify message */
-
-       printer_name = PRINTERNAME(snum);
-
-       message_send_all(conn_tdb_ctx(),MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
+       SAFE_FREE(queue);
 
        return True;
 }