Changeset 480 for trunk/server/source3/printing/print_cups.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/printing/print_cups.c (modified) (3 diffs)

trunk/server/source3/printing/print_cups.c

@@ -923 +923 @@
         char *filename = NULL;
         size_t size;
+        uint32_t jobid = (uint32_t)-1;
         char addr[INET6_ADDRSTRLEN];
 
@@ -989 +990 @@
                       clientname);
 
+        /* Get the jobid from the filename. */
+        jobid = print_parse_jobid(pjob->filename);
+        if (jobid == (uint32_t)-1) {
+                DEBUG(0,("cups_job_submit: failed to parse jobid from name %s\n",
+                                pjob->filename ));
+                jobid = 0;
+        }
+
         if (!push_utf8_talloc(frame, &jobname, pjob->jobname, &size)) {
                 goto out;
@@ -994 +1003 @@
         new_jobname = talloc_asprintf(frame,
                         "%s%.8u %s", PRINT_SPOOL_PREFIX,
-                        (unsigned int)pjob->smbjob,
+                        (unsigned int)jobid,
                         jobname);
         if (new_jobname == NULL) {