sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

Fix debugs for rap mapping. Delete job on map fail.

Browse Source 
Jeremy.
(This used to be commit 631d606698)
This commit is contained in:
Jeremy Allison
2002-12-05 22:32:25 +00:00
parent 90d9cf973e
commit 1815dad960
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source3/printing/printfsp.c
View File

@ -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;
}

7
source3/printing/printing.c
View File

@ -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;