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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/lanman.c | 8 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 5bf7bb89e3..a218a04962 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -445,7 +445,7 @@ static void fill_printjob_info(connection_struct *conn, int snum, int uLevel, PACKI(desc,"W",queue->job); /* uJobId */ if (uLevel == 1) { - PACKS(desc,"B21",queue->user); /* szUserName */ + PACKS(desc,"B21",queue->fs_user); /* szUserName */ PACKS(desc,"B",""); /* pad */ PACKS(desc,"B16",""); /* szNotifyName */ PACKS(desc,"B10","PM_Q_RAW"); /* szDataType */ @@ -455,17 +455,17 @@ static void fill_printjob_info(connection_struct *conn, int snum, int uLevel, PACKS(desc,"z",""); /* pszStatus */ PACKI(desc,"D",t); /* ulSubmitted */ PACKI(desc,"D",queue->size); /* ulSize */ - PACKS(desc,"z",queue->file); /* pszComment */ + PACKS(desc,"z",queue->fs_file); /* pszComment */ } if (uLevel == 2 || uLevel == 3 || uLevel == 4) { PACKI(desc,"W",queue->priority); /* uPriority */ - PACKS(desc,"z",queue->user); /* pszUserName */ + PACKS(desc,"z",queue->fs_user); /* pszUserName */ PACKI(desc,"W",n+1); /* uPosition */ PACKI(desc,"W",printj_status(queue->status)); /* fsStatus */ PACKI(desc,"D",t); /* ulSubmitted */ PACKI(desc,"D",queue->size); /* ulSize */ PACKS(desc,"z","Samba"); /* pszComment */ - PACKS(desc,"z",queue->file); /* pszDocument */ + PACKS(desc,"z",queue->fs_file); /* pszDocument */ if (uLevel == 3) { PACKS(desc,"z",""); /* pszNotifyName */ PACKS(desc,"z","PM_Q_RAW"); /* pszDataType */ diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 8f6ff9cb34..e72b6a7319 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2605,7 +2605,7 @@ int reply_printqueue(connection_struct *conn, SSVAL(p,5, queue[i].job); SIVAL(p,7,queue[i].size); SCVAL(p,11,0); - srvstr_push(outbuf, p+12, queue[i].user, 16, STR_ASCII); + srvstr_push(outbuf, p+12, queue[i].fs_user, 16, STR_ASCII); p += 28; } |