From: David Disseldorp <ddiss@samba.org>
Date: Tue, 28 Aug 2012 16:58:24 +0000 (+0200)
Subject: s3-printing: fix bug 9123 lprng job tracking errors
X-Git-Tag: samba-4.0.0beta8~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb15e5a58f79801b0a74a8ddf555411c0fd44acb;p=thirdparty%2Fsamba.git

s3-printing: fix bug 9123 lprng job tracking errors

The lprng printing back-end is truncating the print job filename in the
lpq output, which means that Samba is not able to determine the back-end
job ID for a newly submitted print job.
Remove the unneeded spoolss job ID from the print job file name to
ensure the job filename is not truncated. Also log these warnings at a
higher log level.

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Wed Aug 29 14:25:13 CEST 2012 on sn-devel-104
---

diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index efe910d7b44..1560a035a12 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -288,7 +288,7 @@ static int generic_job_submit(int snum, struct printjob *pjob,
 		ret = 0;
 	}
 	if (pjob->sysjob == -1) {
-		DEBUG(0, ("failed to get sysjob for job %u (%s), tracking as "
+		DEBUG(2, ("failed to get sysjob for job %u (%s), tracking as "
 			  "Unix job\n", pjob->jobid, jobname));
 	}
 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 9a7b1109258..23b143b4c62 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2739,8 +2739,8 @@ static WERROR print_job_spool_file(int snum, uint32_t jobid,
 	}
 
 	slprintf(pjob->filename, sizeof(pjob->filename)-1,
-		 "%s/%s%.8u.XXXXXX", lp_pathname(talloc_tos(), snum),
-		 PRINT_SPOOL_PREFIX, (unsigned int)jobid);
+		 "%s/%sXXXXXX", lp_pathname(talloc_tos(), snum),
+		 PRINT_SPOOL_PREFIX);
 	pjob->fd = mkstemp(pjob->filename);
 
 	if (pjob->fd == -1) {