summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-12-05 22:32:25 +0000
committerJeremy Allison <jra@samba.org>2002-12-05 22:32:25 +0000
commit1815dad960e7e418dbeb7eb3d4d014322c7a093f (patch)
tree05ed00745c4058438d0ed60bf767ec0a2f5d3b79
parent90d9cf973e92510ba8e0b5c9cade65fa2cf55246 (diff)
downloadsamba-1815dad960e7e418dbeb7eb3d4d014322c7a093f.tar.gz
samba-1815dad960e7e418dbeb7eb3d4d014322c7a093f.tar.bz2
samba-1815dad960e7e418dbeb7eb3d4d014322c7a093f.zip
Fix debugs for rap mapping. Delete job on map fail.
Jeremy. (This used to be commit 631d6066981c58f61d7fed4376b0254544eede84)
-rw-r--r--source3/printing/printfsp.c3
-rw-r--r--source3/printing/printing.c7
2 files changed, 7 insertions, 3 deletions
diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c
index 4ae74e27ec..f028e1f564 100644
--- a/source3/printing/printfsp.c
+++ b/source3/printing/printfsp.c
@@ -55,7 +55,8 @@ files_struct *print_fsp_open(connection_struct *conn, char *fname)
/* Convert to RAP id. */
fsp->rap_print_jobid = pjobid_to_rap(SNUM(conn), jobid);
if (fsp->rap_print_jobid == 0) {
- /* We need to delete the entry in the tdb here ! FIXME ! JRA */
+ /* We need to delete the entry in the tdb. */
+ pjob_delete(SNUM(conn), jobid);
file_free(fsp);
return NULL;
}
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 6c70b3deae..cde1646107 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -71,6 +71,9 @@ uint16 pjobid_to_rap(int snum, uint32 jobid)
if (data.dptr && data.dsize == sizeof(uint16)) {
memcpy(&rap_jobid, data.dptr, sizeof(uint16));
SAFE_FREE(data.dptr);
+ DEBUG(10,("pjobid_to_rap: jobid %u maps to RAP jobid %u\n",
+ (unsigned int)jobid,
+ (unsigned int)rap_jobid));
return rap_jobid;
}
SAFE_FREE(data.dptr);
@@ -83,7 +86,7 @@ uint16 pjobid_to_rap(int snum, uint32 jobid)
tdb_store(rap_tdb, key, data, TDB_REPLACE);
tdb_store(rap_tdb, data, key, TDB_REPLACE);
- DEBUG(10,("pjobid_to_rap: jobid %u maps to RAP jobid %u\n",
+ DEBUG(10,("pjobid_to_rap: created jobid %u maps to RAP jobid %u\n",
(unsigned int)jobid,
(unsigned int)rap_jobid));
return rap_jobid;
@@ -516,7 +519,7 @@ done:
Remove a job structure from the database.
****************************************************************************/
-static void pjob_delete(int snum, uint32 jobid)
+void pjob_delete(int snum, uint32 jobid)
{
struct printjob *pjob = print_job_find(snum, jobid);
uint32 job_status = 0;