sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Fix the new storage code to correctly convert from system queue info to

Browse Source 
pjob info. Ensure we retrieve more than one job from the storage code.
Jeremy.
(This used to be commit 5dc3150ff3)
This commit is contained in:
Jeremy Allison 2003-04-04 01:02:50 +00:00
parent 0bcc0c343f
commit b1b9adebb0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/printing/printing.c
View File

@ -713,9 +713,20 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
pjob_delete(ts->snum, jobid);
} else
ts->total_jobs++;
return 0;
}
else
ts->total_jobs++;
/* Save the pjob attributes we will store. */
ts->queue[i].job = jobid;
ts->queue[i].size = pjob.size;
ts->queue[i].page_count = pjob.page_count;
ts->queue[i].status = pjob.status;
ts->queue[i].priority = 1;
ts->queue[i].time = pjob.starttime;
fstrcpy(ts->queue[i].fs_user, pjob.user);
fstrcpy(ts->queue[i].fs_file, pjob.jobname);
ts->total_jobs++;
return 0;
}
@ -2088,6 +2099,7 @@ static BOOL get_stored_queue_info(struct tdb_print_db *pdb, int snum, int *pcoun
uint32 qcount = 0;
uint32 extra_count = 0;
int total_count = 0;
size_t len = 0;
uint32 i;
int max_reported_jobs = lp_max_reported_jobs(snum);
BOOL ret = False;
@ -2130,8 +2142,8 @@ static BOOL get_stored_queue_info(struct tdb_print_db *pdb, int snum, int *pcoun
goto out;
/* Retrieve the linearised queue data. */
len = 0;
for( i = 0; i < qcount; i++) {
size_t len = 0;
uint32 qjob, qsize, qpage_count, qstatus, qpriority, qtime;
len += tdb_unpack(data.dptr + 4 + len, data.dsize - len, NULL, "ddddddff",
&qjob,