Changeset 480 for trunk/server/source3/printing

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/lpq_parse.c (modified) (2 diffs)
• source3/printing/nt_printing.c (modified) (4 diffs)
• source3/printing/print_cups.c (modified) (3 diffs)
• source3/printing/printing.c (modified) (2 diffs)

trunk/server/source3/printing/lpq_parse.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "printing.h"
 
 static const char *Months[13] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -1151 +1152 @@
         return ret;
 }
+
+/****************************************************************************
+ Parse a file name from the system spooler to generate a jobid.
+****************************************************************************/
+
+uint32_t print_parse_jobid(const char *fname)
+{
+        int jobid;
+        const char *p = strstr_m(fname,PRINT_SPOOL_PREFIX);
+
+        if (!p) {
+                return (uint32_t)-1;
+        }
+        p += strlen(PRINT_SPOOL_PREFIX);
+        jobid = atoi(p);
+        if (jobid <= 0) {
+                return (uint32_t)-1;
+        }
+        return (uint32_t)jobid;
+}

trunk/server/source3/printing/nt_printing.c

@@ -92 +92 @@
         {"Statement",0x1,0x221b4,0x34b5c,0x0,0x0,0x221b4,0x34b5c},
         {"Executive",0x1,0x2cf56,0x411cc,0x0,0x0,0x2cf56,0x411cc},
+        {"A0",0x1,0xcd528,0x122488,0x0,0x0,0xcd528,0x122488},
+        {"A1",0x1,0x91050,0xcd528,0x0,0x0,0x91050,0xcd528},
         {"A3",0x1,0x48828,0x668a0,0x0,0x0,0x48828,0x668a0},
         {"A4",0x1,0x33450,0x48828,0x0,0x0,0x33450,0x48828},
@@ -1603 +1605 @@
 
 #define strip_driver_path(_mem_ctx, _element) do { \
-        if ((_p = strrchr((_element), '\\')) != NULL) { \
+        if (_element && ((_p = strrchr((_element), '\\')) != NULL)) { \
                 (_element) = talloc_asprintf((_mem_ctx), "%s", _p+1); \
                 W_ERROR_HAVE_NO_MEMORY((_element)); \
@@ -1624 +1626 @@
         char *_p;
 
+        if (!*driver_path || !*data_file || !*config_file) {
+                return WERR_INVALID_PARAM;
+        }
+
         /* clean up the driver name.
          * we can get .\driver.dll
@@ -1633 +1639 @@
         strip_driver_path(mem_ctx, *data_file);
         strip_driver_path(mem_ctx, *config_file);
-        strip_driver_path(mem_ctx, *help_file);
+        if (help_file) {
+                strip_driver_path(mem_ctx, *help_file);
+        }
 
         if (dependent_files && dependent_files->string) {

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) {

trunk/server/source3/printing/printing.c

@@ -645 +645 @@
 
 /****************************************************************************
- Parse a file name from the system spooler to generate a jobid.
-****************************************************************************/
-
-static uint32 print_parse_jobid(char *fname)
-{
-        int jobid;
-
-        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 (uint32)-1;
-
-        return (uint32)jobid;
-}
-
-/****************************************************************************
  List a unix job in the print database.
 ****************************************************************************/
@@ -2614 +2595 @@
                 return True;
         }
-
-        pjob->smbjob = jobid;
 
         ret = (*(current_printif->job_submit))(snum, pjob);