From c79ca41baf15b4ef7eb287d343b17a53ba41e852 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 25 Mar 2010 17:36:47 -0700 Subject: Fix bug #7288 - SMB job IDs in CUPS job names wrong. Based on a patch from Michael Karcher . 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. --- source3/include/proto.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/proto.h') diff --git a/source3/include/proto.h b/source3/include/proto.h index dca58cc733..c211501ac5 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -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 */ -- cgit