Changeset 751 for trunk/server/source3/printing/printing.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/printing/printing.c (modified) (70 diffs)

trunk/server/source3/printing/printing.c

@@ -378 +378 @@
 ***********************************************************************/
 
-static int unpack_pjob( uint8 *buf, int buflen, struct printjob *pjob )
+static int unpack_pjob(TALLOC_CTX *mem_ctx, uint8 *buf, int buflen,
+                       struct printjob *pjob)
 {
         int     len = 0;
         int     used;
-        uint32 pjpid, pjsysjob, pjfd, pjstarttime, pjstatus;
+        uint32 pjpid, pjjobid, pjsysjob, pjfd, pjstarttime, pjstatus;
         uint32 pjsize, pjpage_count, pjspooled, pjsmbjob;
 
-        if ( !buf || !pjob )
+        if (!buf || !pjob) {
                 return -1;
-
-        len += tdb_unpack(buf+len, buflen-len, "dddddddddfffff",
+        }
+
+        len += tdb_unpack(buf+len, buflen-len, "ddddddddddfffff",
                                 &pjpid,
+                                &pjjobid,
                                 &pjsysjob,
                                 &pjfd,
@@ -404 +407 @@
                                 pjob->queuename);
 
-        if ( len == -1 )
+        if (len == -1) {
                 return -1;
-
-        used = unpack_devicemode(NULL, buf+len, buflen-len, &pjob->devmode);
+        }
+
+        used = unpack_devicemode(mem_ctx, buf+len, buflen-len, &pjob->devmode);
         if (used == -1) {
                 return -1;
@@ -415 +419 @@
 
         pjob->pid = pjpid;
+        pjob->jobid = pjjobid;
         pjob->sysjob = pjsysjob;
         pjob->fd = pjfd;
@@ -432 +437 @@
 ****************************************************************************/
 
-static struct printjob *print_job_find(const char *sharename, uint32 jobid)
-{
-        static struct printjob  pjob;
+static struct printjob *print_job_find(TALLOC_CTX *mem_ctx,
+                                       const char *sharename,
+                                       uint32 jobid)
+{
+        struct printjob         *pjob;
         uint32_t tmp;
         TDB_DATA                ret;
@@ -450 +457 @@
 
         if (!ret.dptr) {
-                DEBUG(10,("print_job_find: failed to find jobid %u.\n", (unsigned int)jobid ));
+                DEBUG(10, ("print_job_find: failed to find jobid %u.\n",
+                           jobid));
                 return NULL;
         }
 
-        talloc_free(pjob.devmode);
-
-        ZERO_STRUCT( pjob );
-
-        if ( unpack_pjob( ret.dptr, ret.dsize, &pjob ) == -1 ) {
-                DEBUG(10,("print_job_find: failed to unpack jobid %u.\n", (unsigned int)jobid ));
-                SAFE_FREE(ret.dptr);
-                return NULL;
-        }
-
+        pjob = talloc_zero(mem_ctx, struct printjob);
+        if (pjob == NULL) {
+                goto err_out;
+        }
+
+        if (unpack_pjob(mem_ctx, ret.dptr, ret.dsize, pjob) == -1) {
+                DEBUG(10, ("failed to unpack jobid %u.\n", jobid));
+                talloc_free(pjob);
+                pjob = NULL;
+                goto err_out;
+        }
+
+        DEBUG(10,("print_job_find: returning system job %d for jobid %u.\n",
+                  pjob->sysjob, jobid));
+        SMB_ASSERT(pjob->jobid == jobid);
+
+err_out:
         SAFE_FREE(ret.dptr);
-
-        DEBUG(10,("print_job_find: returning system job %d for jobid %u.\n",
-                        (int)pjob.sysjob, (unsigned int)jobid ));
-
-        return &pjob;
+        return pjob;
 }
 
@@ -494 +505 @@
 
         if (state->sysjob == pjob->sysjob) {
-                uint32 jobid = IVAL(key.dptr,0);
-
-                state->sysjob_to_jobid_value = jobid;
+                state->sysjob_to_jobid_value = pjob->jobid;
                 return 1;
         }
 
         return 0;
+}
+
+static uint32 sysjob_to_jobid_pdb(struct tdb_print_db *pdb, int sysjob)
+{
+        struct unixjob_traverse_state state;
+
+        state.sysjob = sysjob;
+        state.sysjob_to_jobid_value = (uint32)-1;
+
+        tdb_traverse(pdb->tdb, unixjob_traverse_fn, &state);
+
+        return state.sysjob_to_jobid_value;
 }
 
@@ -742 +763 @@
                 len = 0;
                 buflen = newlen;
-                len += tdb_pack(buf+len, buflen-len, "dddddddddfffff",
+                len += tdb_pack(buf+len, buflen-len, "ddddddddddfffff",
                                 (uint32)pjob->pid,
+                                (uint32)pjob->jobid,
                                 (uint32)pjob->sysjob,
                                 (uint32)pjob->fd,
@@ -780 +802 @@
         /* Send notify updates for what has changed */
 
-        if ( ret ) {
+        if (ret) {
                 bool changed = false;
                 struct printjob old_pjob;
 
-                if ( old_data.dsize )
-                {
-                        if ( unpack_pjob( old_data.dptr, old_data.dsize, &old_pjob ) != -1 )
-                        {
-                                pjob_store_notify(server_event_context(),
+                if (old_data.dsize) {
+                        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+                        if (tmp_ctx == NULL)
+                                goto done;
+
+                        len = unpack_pjob(tmp_ctx, old_data.dptr,
+                                          old_data.dsize, &old_pjob);
+                        if (len != -1 ) {
+                                pjob_store_notify(ev,
                                                   msg_ctx,
                                                   sharename, jobid, &old_pjob,
                                                   pjob,
                                                   &changed);
-                                talloc_free(old_pjob.devmode);
-
                                 if (changed) {
                                         add_to_jobs_changed(pdb, jobid);
                                 }
                         }
-
-                }
-                else {
+                        talloc_free(tmp_ctx);
+
+                } else {
                         /* new job */
-                        pjob_store_notify(server_event_context(), msg_ctx,
+                        pjob_store_notify(ev, msg_ctx,
                                           sharename, jobid, NULL, pjob,
                                           &changed);
@@ -809 +833 @@
         }
 
+done:
         release_print_db(pdb);
-done:
         SAFE_FREE( old_data.dptr );
         SAFE_FREE( buf );
@@ -829 +853 @@
         uint32 job_status = 0;
         struct tdb_print_db *pdb;
-
-        pdb = get_print_db_byname( sharename );
-
-        if (!pdb)
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
                 return;
-
-        pjob = print_job_find( sharename, jobid );
-
+        }
+
+        pdb = get_print_db_byname(sharename);
+        if (!pdb) {
+                goto err_out;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob) {
-                DEBUG(5, ("pjob_delete: we were asked to delete nonexistent job %u\n",
-                                        (unsigned int)jobid));
-                release_print_db(pdb);
-                return;
+                DEBUG(5, ("we were asked to delete nonexistent job %u\n",
+                          jobid));
+                goto err_release;
         }
 
@@ -855 +881 @@
         tdb_delete(pdb->tdb, print_key(jobid, &tmp));
         remove_from_jobs_added(sharename, jobid);
-        release_print_db( pdb );
         rap_jobid_delete(sharename, jobid);
+err_release:
+        release_print_db(pdb);
+err_out:
+        talloc_free(tmp_ctx);
 }
 
@@ -869 +898 @@
 {
         struct printjob pj, *old_pj;
-
-        if (jobid == (uint32)-1)
-                jobid = q->job + UNIX_JOB_START;
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
+                return;
+        }
+
+        if (jobid == (uint32)-1) {
+                jobid = q->sysjob + UNIX_JOB_START;
+        }
 
         /* Preserve the timestamp on an existing unix print job */
 
-        old_pj = print_job_find(sharename, jobid);
+        old_pj = print_job_find(tmp_ctx, sharename, jobid);
 
         ZERO_STRUCT(pj);
 
         pj.pid = (pid_t)-1;
-        pj.sysjob = q->job;
+        pj.jobid = jobid;
+        pj.sysjob = q->sysjob;
         pj.fd = -1;
         pj.starttime = old_pj ? old_pj->starttime : q->time;
@@ -898 +933 @@
 
         pjob_store(ev, msg_ctx, sharename, jobid, &pj);
+        talloc_free(tmp_ctx);
 }
 
@@ -910 +946 @@
         struct tevent_context *ev;
         struct messaging_context *msg_ctx;
+        TALLOC_CTX *mem_ctx;
 };
 
@@ -926 +963 @@
                 return 0;
 
-        jobid = IVAL(key.dptr, 0);
-        if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
+        if (unpack_pjob(ts->mem_ctx, data.dptr, data.dsize, &pjob) == -1)
                 return 0;
         talloc_free(pjob.devmode);
-
+        jobid = pjob.jobid;
 
         if (!pjob.smbjob) {
                 /* remove a unix job if it isn't in the system queue any more */
-
                 for (i=0;i<ts->qcount;i++) {
-                        uint32 u_jobid = (ts->queue[i].job + UNIX_JOB_START);
-                        if (jobid == u_jobid)
+                        if (ts->queue[i].sysjob == pjob.sysjob) {
                                 break;
+                        }
                 }
                 if (i == ts->qcount) {
@@ -969 +1004 @@
         /* this check only makes sense for jobs submitted from Windows clients */
 
-        if ( pjob.smbjob ) {
+        if (pjob.smbjob) {
                 for (i=0;i<ts->qcount;i++) {
-                        uint32 curr_jobid;
-
                         if ( pjob.status == LPQ_DELETED )
                                 continue;
 
-                        curr_jobid = print_parse_jobid(ts->queue[i].fs_file);
-
-                        if (jobid == curr_jobid) {
+                        if (ts->queue[i].sysjob == pjob.sysjob) {
 
                                 /* try to clean up any jobs that need to be deleted */
@@ -1033 +1064 @@
         }
 
-        /* Save the pjob attributes we will store.
-           FIXME!!! This is the only place where queue->job
-           represents the SMB jobid      --jerry */
-
-        ts->queue[i].job = jobid;
+        /* Save the pjob attributes we will store. */
+        ts->queue[i].sysjob = pjob.sysjob;
         ts->queue[i].size = pjob.size;
         ts->queue[i].page_count = pjob.page_count;
@@ -1188 +1216 @@
                 qcount++;
                 data.dsize += tdb_pack(NULL, 0, "ddddddff",
-                                (uint32)queue[i].job,
+                                (uint32)queue[i].sysjob,
                                 (uint32)queue[i].size,
                                 (uint32)queue[i].page_count,
@@ -1208 +1236 @@
 
                 len += tdb_pack(data.dptr + len, data.dsize - len, "ddddddff",
-                                (uint32)queue[i].job,
+                                (uint32)queue[i].sysjob,
                                 (uint32)queue[i].size,
                                 (uint32)queue[i].page_count,
@@ -1322 +1350 @@
 ****************************************************************************/
 
-static void print_queue_update_internal( struct tevent_context *ev,
-                                         struct messaging_context *msg_ctx,
-                                         const char *sharename,
-                                         struct printif *current_printif,
-                                         char *lpq_command, char *lprm_command )
+static void print_queue_update_internal(struct tevent_context *ev,
+                                        struct messaging_context *msg_ctx,
+                                        const char *sharename,
+                                        struct printif *current_printif,
+                                        char *lpq_command, char *lprm_command)
 {
         int i, qcount;
@@ -1338 +1366 @@
         fstring keystr, cachestr;
         struct tdb_print_db *pdb = get_print_db_byname(sharename);
-
-        if (!pdb) {
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+
+        if ((pdb == NULL) || (tmp_ctx == NULL)) {
                 return;
         }
@@ -1380 +1409 @@
           fill in any system job numbers as we go
         */
-
         jcdata = get_jobs_added_data(pdb);
 
         for (i=0; i<qcount; i++) {
-                uint32 jobid = print_parse_jobid(queue[i].fs_file);
-
+                uint32 jobid = sysjob_to_jobid_pdb(pdb, queue[i].sysjob);
                 if (jobid == (uint32)-1) {
                         /* assume its a unix print job */
@@ -1394 +1421 @@
 
                 /* we have an active SMB print job - update its status */
-                pjob = print_job_find(sharename, jobid);
+                pjob = print_job_find(tmp_ctx, sharename, jobid);
                 if (!pjob) {
                         /* err, somethings wrong. Probably smbd was restarted
                            with jobs in the queue. All we can do is treat them
                            like unix jobs. Pity. */
+                        DEBUG(1, ("queued print job %d not found in jobs list, "
+                                  "assuming unix job\n", jobid));
                         print_unix_job(ev, msg_ctx,
                                        sharename, &queue[i], jobid);
                         continue;
                 }
-
-                pjob->sysjob = queue[i].job;
 
                 /* don't reset the status on jobs to be deleted */
@@ -1430 +1457 @@
         tstruct.ev = ev;
         tstruct.msg_ctx = msg_ctx;
+        tstruct.mem_ctx = tmp_ctx;
 
         tdb_traverse(pdb->tdb, traverse_fn_delete, (void *)&tstruct);
@@ -1437 +1465 @@
 
         SAFE_FREE(tstruct.queue);
+        talloc_free(tmp_ctx);
 
         DEBUG(10,("print_queue_update_internal: printer %s INFO/total_jobs = %d\n",
@@ -1632 +1661 @@
 }
 
+static bool printer_housekeeping_fn(const struct timeval *now,
+                                    void *private_data)
+{
+        static time_t last_pcap_reload_time = 0;
+        time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
+        time_t t = time_mono(NULL);
+
+        DEBUG(5, ("printer housekeeping\n"));
+
+        /* if periodic printcap rescan is enabled, see if it's time to reload */
+        if ((printcap_cache_time != 0)
+         && (t >= (last_pcap_reload_time + printcap_cache_time))) {
+                DEBUG( 3,( "Printcap cache time expired.\n"));
+                pcap_cache_reload(server_event_context(),
+                                  smbd_messaging_context(),
+                                  &reload_pcap_change_notify);
+                last_pcap_reload_time = t;
+        }
+
+        return true;
+}
+
 static pid_t background_lpq_updater_pid = -1;
 
@@ -1703 +1754 @@
                         DEBUG(0,("tevent_add_fd() failed for pause_pipe\n"));
                         smb_panic("tevent_add_fd() failed for pause_pipe");
+                }
+
+                if (!(event_add_idle(ev, NULL,
+                                     timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
+                                     "printer_housekeeping",
+                                     printer_housekeeping_fn,
+                                     NULL))) {
+                        DEBUG(0, ("Could not add printing housekeeping event\n"));
+                        exit(1);
                 }
 
@@ -2049 +2109 @@
 
 /****************************************************************************
- Give the filename used for a jobid.
+ Return the device mode asigned to a specific print job.
  Only valid for the process doing the spooling and when the job
  has not been spooled.
 ****************************************************************************/
 
-char *print_job_fname(const char* sharename, uint32 jobid)
-{
-        struct printjob *pjob = print_job_find(sharename, jobid);
-        if (!pjob || pjob->spooled || pjob->pid != sys_getpid())
+struct spoolss_DeviceMode *print_job_devmode(TALLOC_CTX *mem_ctx,
+                                             const char *sharename,
+                                             uint32 jobid)
+{
+        struct printjob *pjob = print_job_find(mem_ctx, sharename, jobid);
+        if (pjob == NULL) {
                 return NULL;
-        return pjob->filename;
-}
-
-
-/****************************************************************************
- Give the filename used for a jobid.
- Only valid for the process doing the spooling and when the job
- has not been spooled.
-****************************************************************************/
-
-struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid)
-{
-        struct printjob *pjob = print_job_find(sharename, jobid);
-
-        if ( !pjob )
-                return NULL;
+        }
 
         return pjob->devmode;
@@ -2088 +2135 @@
 {
         struct printjob *pjob;
-
-        pjob = print_job_find(sharename, jobid);
-        if (!pjob || pjob->pid != sys_getpid())
-                return False;
+        bool ret;
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob || pjob->pid != sys_getpid()) {
+                ret = false;
+                goto err_out;
+        }
 
         fstrcpy(pjob->jobname, name);
-        return pjob_store(ev, msg_ctx, sharename, jobid, pjob);
+        ret = pjob_store(ev, msg_ctx, sharename, jobid, pjob);
+err_out:
+        talloc_free(tmp_ctx);
+        return ret;
 }
 
@@ -2105 +2162 @@
         struct printjob *pjob;
 
-        pjob = print_job_find(sharename, jobid);
+        pjob = print_job_find(mem_ctx, sharename, jobid);
         if (!pjob || pjob->pid != sys_getpid()) {
                 return false;
         }
 
-        *name = talloc_strdup(mem_ctx, pjob->jobname);
-        if (!*name) {
-                return false;
-        }
-
+        *name = pjob->jobname;
         return true;
 }
@@ -2187 +2240 @@
 {
         const char* sharename = lp_const_servicename(snum);
-        struct printjob *pjob = print_job_find(sharename, jobid);
+        struct printjob *pjob;
         int result = 0;
         struct printif *current_printif = get_printer_fns( snum );
-
-        if (!pjob)
-                return False;
+        bool ret;
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob) {
+                ret = false;
+                goto err_out;
+        }
 
         /*
@@ -2198 +2259 @@
          */
 
-        if (pjob->status == LPQ_DELETING)
-                return True;
+        if (pjob->status == LPQ_DELETING) {
+                ret = true;
+                goto err_out;
+        }
 
         /* Hrm - we need to be able to cope with deleting a job before it
@@ -2229 +2292 @@
                         int njobs = 1;
 
-                        if (!pdb)
-                                return False;
+                        if (!pdb) {
+                                ret = false;
+                                goto err_out;
+                        }
                         pjob_delete(ev, msg_ctx, sharename, jobid);
                         /* Ensure we keep a rough count of the number of total jobs... */
@@ -2240 +2305 @@
         remove_from_jobs_added( sharename, jobid );
 
-        return (result == 0);
+        ret = (result == 0);
+err_out:
+        talloc_free(tmp_ctx);
+        return ret;
 }
 
@@ -2251 +2319 @@
                      uint32 jobid)
 {
-        struct printjob *pjob = print_job_find(servicename, jobid);
-
-        if (!pjob || !server_info)
-                return False;
-
-        return strequal(pjob->user, server_info->sanitized_username);
+        struct printjob *pjob;
+        bool ret;
+        TALLOC_CTX *tmp_ctx = talloc_new(server_info);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
+
+        pjob = print_job_find(tmp_ctx, servicename, jobid);
+        if (!pjob || !server_info) {
+                ret = false;
+                goto err_out;
+        }
+
+        ret = strequal(pjob->user, server_info->sanitized_username);
+err_out:
+        talloc_free(tmp_ctx);
+        return ret;
 }
 
@@ -2270 +2349 @@
         struct printjob *pjob;
         bool    owner;
-        char    *fname;
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return WERR_NOT_ENOUGH_MEMORY;
+        }
 
         owner = is_owner(server_info, lp_const_servicename(snum), jobid);
@@ -2290 +2373 @@
                 /* END_ADMIN_LOG */
 
-                return WERR_ACCESS_DENIED;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2300 +2384 @@
          */
 
-        fname = print_job_fname(sharename, jobid);
-        if (fname != NULL) {
-                /* remove the spool file */
-                DEBUG(10, ("print_job_delete: "
-                           "Removing spool file [%s]\n", fname));
-                if (unlink(fname) == -1) {
-                        return map_werror_from_unix(errno);
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob || pjob->spooled || pjob->pid != getpid()) {
+                DEBUG(10, ("Skipping spool file removal for job %u\n", jobid));
+        } else {
+                DEBUG(10, ("Removing spool file [%s]\n", pjob->filename));
+                if (unlink(pjob->filename) == -1) {
+                        werr = map_werror_from_unix(errno);
+                        goto err_out;
                 }
         }
 
         if (!print_job_delete1(server_event_context(), msg_ctx, snum, jobid)) {
-                return WERR_ACCESS_DENIED;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2319 +2405 @@
         print_queue_update(msg_ctx, snum, True);
 
-        pjob = print_job_find(sharename, jobid);
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (pjob && (pjob->status != LPQ_DELETING)) {
-                return WERR_ACCESS_DENIED;
-        }
-
-        return WERR_PRINTER_HAS_JOBS_QUEUED;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
+        }
+        werr = WERR_PRINTER_HAS_JOBS_QUEUED;
+
+err_out:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -2331 +2421 @@
 ****************************************************************************/
 
-bool print_job_pause(const struct auth_serversupplied_info *server_info,
+WERROR print_job_pause(const struct auth_serversupplied_info *server_info,
                      struct messaging_context *msg_ctx,
-                     int snum, uint32 jobid, WERROR *errcode)
+                     int snum, uint32 jobid)
 {
         const char* sharename = lp_const_servicename(snum);
@@ -2339 +2429 @@
         int ret = -1;
         struct printif *current_printif = get_printer_fns( snum );
-
-        pjob = print_job_find(sharename, jobid);
-
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return WERR_NOT_ENOUGH_MEMORY;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob || !server_info) {
                 DEBUG(10, ("print_job_pause: no pjob or user for jobid %u\n",
                         (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2351 +2446 @@
                 DEBUG(10, ("print_job_pause: not spooled or bad sysjob = %d for jobid %u\n",
                         (int)pjob->sysjob, (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2367 +2463 @@
                 /* END_ADMIN_LOG */
 
-                *errcode = WERR_ACCESS_DENIED;
-                return False;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2375 +2471 @@
 
         if (ret != 0) {
-                *errcode = WERR_INVALID_PARAM;
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2388 +2484 @@
 
         /* how do we tell if this succeeded? */
-
-        return True;
+        werr = WERR_OK;
+err_out:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -2396 +2494 @@
 ****************************************************************************/
 
-bool print_job_resume(const struct auth_serversupplied_info *server_info,
+WERROR print_job_resume(const struct auth_serversupplied_info *server_info,
                       struct messaging_context *msg_ctx,
-                      int snum, uint32 jobid, WERROR *errcode)
+                      int snum, uint32 jobid)
 {
         const char *sharename = lp_const_servicename(snum);
@@ -2404 +2502 @@
         int ret;
         struct printif *current_printif = get_printer_fns( snum );
-
-        pjob = print_job_find(sharename, jobid);
-
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL)
+                return WERR_NOT_ENOUGH_MEMORY;
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob || !server_info) {
                 DEBUG(10, ("print_job_resume: no pjob or user for jobid %u\n",
                         (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2416 +2518 @@
                 DEBUG(10, ("print_job_resume: not spooled or bad sysjob = %d for jobid %u\n",
                         (int)pjob->sysjob, (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2423 +2526 @@
                                 JOB_ACCESS_ADMINISTER)) {
                 DEBUG(3, ("resume denied by security descriptor\n"));
-                *errcode = WERR_ACCESS_DENIED;
 
                 /* BEGIN_ADMIN_LOG */
@@ -2432 +2534 @@
                               lp_printername(snum) );
                 /* END_ADMIN_LOG */
-                return False;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2438 +2541 @@
 
         if (ret != 0) {
-                *errcode = WERR_INVALID_PARAM;
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2450 +2553 @@
                           JOB_STATUS_QUEUED);
 
-        return True;
+        werr = WERR_OK;
+err_out:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -2464 +2570 @@
         ssize_t return_code;
         struct printjob *pjob;
-
-        pjob = print_job_find(sharename, jobid);
-
-        if (!pjob)
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
                 return -1;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob) {
+                return_code = -1;
+                goto err_out;
+        }
+
         /* don't allow another process to get this info - it is meaningless */
-        if (pjob->pid != sys_getpid())
-                return -1;
+        if (pjob->pid != sys_getpid()) {
+                return_code = -1;
+                goto err_out;
+        }
 
         /* if SMBD is spooling this can't be allowed */
         if (pjob->status == PJOB_SMBD_SPOOLING) {
-                return -1;
+                return_code = -1;
+                goto err_out;
         }
 
         return_code = write_data(pjob->fd, buf, size);
-
-        if (return_code>0) {
+        if (return_code > 0) {
                 pjob->size += size;
                 pjob_store(ev, msg_ctx, sharename, jobid, pjob);
         }
+err_out:
+        talloc_free(tmp_ctx);
         return return_code;
 }
@@ -2763 +2879 @@
 
         slprintf(pjob->filename, sizeof(pjob->filename)-1,
-                 "%s/%s%.8u.XXXXXX", lp_pathname(snum),
-                 PRINT_SPOOL_PREFIX, (unsigned int)jobid);
+                 "%s/%sXXXXXX", lp_pathname(snum), PRINT_SPOOL_PREFIX);
         pjob->fd = mkstemp(pjob->filename);
 
@@ -2830 +2945 @@
 
         pjob.pid = sys_getpid();
+        pjob.jobid = jobid;
         pjob.sysjob = -1;
         pjob.fd = -1;
@@ -2894 +3010 @@
         const char* sharename = lp_const_servicename(snum);
         struct printjob *pjob;
-
-        pjob = print_job_find(sharename, jobid);
-        if (!pjob)
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
                 return;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob) {
+                goto err_out;
+        }
         /* don't allow another process to get this info - it is meaningless */
-        if (pjob->pid != sys_getpid())
-                return;
+        if (pjob->pid != sys_getpid()) {
+                goto err_out;
+        }
 
         pjob->page_count++;
         pjob_store(server_event_context(), msg_ctx, sharename, jobid, pjob);
+err_out:
+        talloc_free(tmp_ctx);
 }
 
@@ -2919 +3043 @@
         int ret;
         SMB_STRUCT_STAT sbuf;
-        struct printif *current_printif = get_printer_fns( snum );
+        struct printif *current_printif = get_printer_fns(snum);
         NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-
-        pjob = print_job_find(sharename, jobid);
-
+        char *lpq_cmd;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob) {
-                return NT_STATUS_PRINT_CANCELLED;
+                status = NT_STATUS_PRINT_CANCELLED;
+                goto err_out;
         }
 
         if (pjob->spooled || pjob->pid != sys_getpid()) {
-                return NT_STATUS_ACCESS_DENIED;
+                status = NT_STATUS_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2983 +3113 @@
         }
 
-        ret = (*(current_printif->job_submit))(snum, pjob);
-
+        /* don't strip out characters like '$' from the printername */
+        lpq_cmd = talloc_string_sub2(tmp_ctx,
+                                     lp_lpqcommand(snum),
+                                     "%p",
+                                     lp_printername(snum),
+                                     false, false, false);
+        if (lpq_cmd == NULL) {
+                status = NT_STATUS_PRINT_CANCELLED;
+                goto fail;
+        }
+        lpq_cmd = talloc_sub_advanced(tmp_ctx,
+                                      lp_servicename(snum),
+                                      current_user_info.unix_name,
+                                      "",
+                                      current_user.ut.gid,
+                                      get_current_username(),
+                                      current_user_info.domain,
+                                      lpq_cmd);
+        if (lpq_cmd == NULL) {
+                status = NT_STATUS_PRINT_CANCELLED;
+                goto fail;
+        }
+
+        ret = (*(current_printif->job_submit))(snum, pjob,
+                                               current_printif->type, lpq_cmd);
         if (ret) {
                 status = NT_STATUS_PRINT_CANCELLED;
@@ -3009 +3162 @@
         unlink(pjob->filename);
         pjob_delete(server_event_context(), msg_ctx, sharename, jobid);
+err_out:
+        talloc_free(tmp_ctx);
         return status;
 }
@@ -3031 +3186 @@
         bool ret = False;
         const char* sharename = lp_servicename(snum);
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
 
         /* make sure the database is up to date */
@@ -3080 +3239 @@
                                 queue[i].fs_user,
                                 queue[i].fs_file);
-                queue[i].job = qjob;
+                queue[i].sysjob = qjob;
                 queue[i].size = qsize;
                 queue[i].page_count = qpage_count;
@@ -3097 +3256 @@
                 jobid = IVAL(cgdata.dptr, i*4);
                 DEBUG(5,("get_stored_queue_info: added job = %u\n", (unsigned int)jobid));
-                pjob = print_job_find(lp_const_servicename(snum), jobid);
+                pjob = print_job_find(tmp_ctx, lp_const_servicename(snum), jobid);
                 if (!pjob) {
                         DEBUG(5,("get_stored_queue_info: failed to find added job = %u\n", (unsigned int)jobid));
@@ -3104 +3263 @@
                 }
 
-                queue[total_count].job = jobid;
+                queue[total_count].sysjob = jobid;
                 queue[total_count].size = pjob->size;
                 queue[total_count].page_count = pjob->page_count;
@@ -3113 +3272 @@
                 fstrcpy(queue[total_count].fs_file, pjob->jobname);
                 total_count++;
+                talloc_free(pjob);
         }
 
@@ -3122 +3282 @@
 
                 for (j = 0; j < total_count; j++) {
-                        if (queue[j].job == jobid) {
+                        if (queue[j].sysjob == jobid) {
                                 found = true;
                                 break;
@@ -3134 +3294 @@
                                  (unsigned int) jobid));
 
-                        pjob = print_job_find(sharename, jobid);
+                        pjob = print_job_find(tmp_ctx, sharename, jobid);
                         if (pjob == NULL) {
                                 DEBUG(5,("get_stored_queue_info: failed to find "
@@ -3143 +3303 @@
                         }
 
-                        queue[j].job = jobid;
+                        queue[j].sysjob = jobid;
                         queue[j].size = pjob->size;
                         queue[j].page_count = pjob->page_count;
@@ -3151 +3311 @@
                         fstrcpy(queue[j].fs_user, pjob->user);
                         fstrcpy(queue[j].fs_file, pjob->jobname);
+                        talloc_free(pjob);
 
                         DEBUG(5,("get_stored_queue_info: updated queue[%u], jobid: %u, jobname: %s\n",
@@ -3178 +3339 @@
         SAFE_FREE(data.dptr);
         SAFE_FREE(cgdata.dptr);
+        talloc_free(tmp_ctx);
         return ret;
 }
@@ -3345 +3507 @@
         for (i=0;i<njobs;i++) {
                 bool owner = is_owner(server_info, lp_const_servicename(snum),
-                                      queue[i].job);
+                                      queue[i].sysjob);
 
                 if (owner || can_job_admin) {
                         print_job_delete1(server_event_context(), msg_ctx,
-                                          snum, queue[i].job);
+                                          snum, queue[i].sysjob);
                 }
         }