sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-06-03 17:05:54 +03:00
Code

Fix bug #7288 - SMB job IDs in CUPS job names wrong.

Browse Source 
Based on a patch from Michael Karcher <samba@mkarcher.dialup.fu-berlin.de>.

I think this is the correct fix. It causes cups_job_submit to use
print_parse_jobid(), which I've moved into printing/lpq_parse.c (to allow the
link to work).

It turns out the old print_parse_jobid() was *broken*, in that the pjob
filename was set as an absolute path - not relative to the sharename (due to it
not going through the VFS calls).

This meant that the original code doing a strncmp on the first part of the
filename would always fail - it starts with a "/", not the relative pathname of
PRINT_SPOOL_PREFIX ("smbprn.").

This fix could fix some other mysterious printing bugs - probably the ones
Guenther noticed where job control fails on non-cups backends.

Guenther PLEASE CHECK !

Jeremy.
This commit is contained in:
Jeremy Allison 2010-03-25 17:36:47 -07:00
parent 2e00a8a74b
commit c79ca41baf
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -4772,6 +4772,7 @@ void load_printers(void);
bool parse_lpq_entry(enum printing_types printing_type,char *line,
print_queue_struct *buf,
print_status_struct *status,bool first);
uint32_t print_parse_jobid(const char *fname);
/* The following definitions come from printing/notify.c */

21
source3/printing/lpq_parse.c
View File

@ -18,6 +18,7 @@
*/
#include "includes.h"
#include "printing.h"
static const char *Months[13] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Err"};
@ -1150,3 +1151,23 @@ bool parse_lpq_entry(enum printing_types printing_type,char *line,
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;
}

11
source3/printing/print_cups.c
View File

@ -918,6 +918,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
char *cupsoptions = NULL;
char *filename = NULL;
size_t size;
uint32_t jobid = (uint32_t)-1;
char addr[INET6_ADDRSTRLEN];
DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob));
@ -984,12 +985,20 @@ static int cups_job_submit(int snum, struct printjob *pjob)
"job-originating-host-name", NULL,
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;
}
new_jobname = talloc_asprintf(frame,
"%s%.8u %s", PRINT_SPOOL_PREFIX,
(unsigned int)pjob->smbjob,
(unsigned int)jobid,
jobname);
if (new_jobname == NULL) {
goto out;

19
source3/printing/printing.c
View File

@ -643,25 +643,6 @@ void pjob_delete(const char* sharename, uint32 jobid)
rap_jobid_delete(sharename, jobid);
}
/****************************************************************************
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.
****************************************************************************/