diff options
| author | Gerald Carter <jerry@samba.org> | 2002-03-15 08:14:10 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-03-15 08:14:10 +0000 |
| commit | 65c007b583e2107f5ad1ba6733d3e578a143863e (patch) | |
| tree | a11e1da607580d291ce74926417126ce22f34852 /source3/printing/printing.c | |
| parent | d19e06c0c620046658621fcec7c2cda9a77ceac3 (diff) | |
| download | samba-65c007b583e2107f5ad1ba6733d3e578a143863e.tar.gz samba-65c007b583e2107f5ad1ba6733d3e578a143863e.tar.bz2 samba-65c007b583e2107f5ad1ba6733d3e578a143863e.zip | |
syncing up printing code with SAMBA_2_2 (already done some merges
in the reverse).
* add in new printer change notify code from SAMBA_2_2
* add in se_map_standard() from 2.2 in _spoolss_open_printer_ex()
* sync up the _print_queue_struct in smb.h (why did someone change the
user/file names in fs_user/fs_file (or vice-versa) ? )
* sync up some cli_spoolss_XXX functions
(This used to be commit 5760315c1de4033fdc22684c940f18010010924f)
Diffstat (limited to 'source3/printing/printing.c')
| -rw-r--r-- | source3/printing/printing.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 758c855188..97eaaebcc4 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -161,8 +161,8 @@ static void print_unix_job(int snum, print_queue_struct *q) pj.spooled = True; pj.smbjob = False; fstrcpy(pj.filename, ""); - fstrcpy(pj.jobname, q->file); - fstrcpy(pj.user, q->user); + fstrcpy(pj.jobname, q->fs_file); + fstrcpy(pj.user, q->fs_user); pj.snum = snum; print_job_store(jobid, &pj); @@ -217,7 +217,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void } for (i=0;i<ts->qcount;i++) { - int qid = print_parse_jobid(ts->queue[i].file); + int qid = print_parse_jobid(ts->queue[i].fs_file); if (jobid == qid) break; } @@ -410,7 +410,7 @@ static void print_queue_update_background(int snum) fill in any system job numbers as we go */ for (i=0; i<qcount; i++) { - int jobid = print_parse_jobid(queue[i].file); + int jobid = print_parse_jobid(queue[i].fs_file); if (jobid == -1) { /* assume its a unix print job */ @@ -1140,8 +1140,8 @@ static int traverse_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void * ts->queue[i].status = pjob.status; ts->queue[i].priority = 1; ts->queue[i].time = pjob.starttime; - fstrcpy(ts->queue[i].user, pjob.user); - fstrcpy(ts->queue[i].file, pjob.jobname); + fstrcpy(ts->queue[i].fs_user, pjob.user); + fstrcpy(ts->queue[i].fs_file, pjob.jobname); ts->qcount++; |