From: Gerald Carter <jerry@samba.org> 
Date: Tue, 25 Nov 2003 19:17:20 +0000 (+0000)
Subject: allow users to delete jobs with cups printing backend
X-Git-Tag: samba-3.0.1rc1~5^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a84daf24f80cf44605841c844a0ba516354420b;p=thirdparty%2Fsamba.git

allow users to delete jobs with cups printing backend
The changes the name of the job passed off to cups
from "Test Page" to "smbprn.00000033 Test Page" so that
we can get the smb jobid back from lpq.  Working on bug
770.
---

diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index 291028b70cf..77719ffc528 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -681,6 +681,7 @@ cups_job_submit(int snum, struct printjob *pjob)
 	cups_lang_t	*language;	/* Default language */
 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
 	char 		*clientname; 	/* hostname of client for job-originating-host attribute */
+	pstring		new_jobname;
 
 	DEBUG(5,("cups_job_submit(%d, %p (%d))\n", snum, pjob, pjob->sysjob));
 
@@ -743,8 +744,11 @@ cups_job_submit(int snum, struct printjob *pjob)
 	             "job-originating-host-name", NULL,
 		      clientname);
 
+        pstr_sprintf(new_jobname,"%s%.8u %s", PRINT_SPOOL_PREFIX, 
+		(unsigned int)pjob->smbjob, pjob->jobname);
+
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
-        	     pjob->jobname);
+        	     new_jobname);
 
        /*
 	* Do the request and get back a response...
diff --git a/source/printing/printing.c b/source/printing/printing.c
index ef532473ba7..a4949f78e97 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -2062,6 +2062,8 @@ BOOL print_job_end(int snum, uint32 jobid, BOOL normal_close)
 		return True;
 	}
 
+	pjob->smbjob = jobid;
+
 	ret = (*(current_printif->job_submit))(snum, pjob);
 
 	if (ret)