diff options
| author | David O'Neill <dmo@samba.org> | 2001-01-17 19:16:05 +0000 |
|---|---|---|
| committer | David O'Neill <dmo@samba.org> | 2001-01-17 19:16:05 +0000 |
| commit | 8aec70075ae410502b9e70f885409bd709ad5a97 (patch) | |
| tree | 98c8d725f9b3664c9bcac243ae52e50839a297f6 | |
| parent | 792ca5d98938c3c52ff4e598bcb55056565dc202 (diff) | |
| download | samba-8aec70075ae410502b9e70f885409bd709ad5a97.tar.gz samba-8aec70075ae410502b9e70f885409bd709ad5a97.tar.bz2 samba-8aec70075ae410502b9e70f885409bd709ad5a97.zip | |
Changes from APPLIANCE_HEAD:
source/smbd/lanman.c
- Change fill_printq_info() to fix corrupted 9X/ME printer comment
(This used to be commit acbed88a195b32d251fd15fc8fdd069726659d64)
| -rw-r--r-- | source3/smbd/lanman.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 848a187f1a..a2178f052b 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -737,11 +737,12 @@ static void fill_printq_info(connection_struct *conn, int snum, int uLevel, PACKS(desc,"z",""); /* pszSepFile */ PACKS(desc,"z","WinPrint"); /* pszPrProc */ PACKS(desc,"z",""); /* pszParms */ - if (!status || !status->message[0]) { - PACKS(desc,"z",Expand(conn,snum,lp_comment(snum))); /* pszComment */ + PACKS(desc,"z",NULL); /* pszComment - don't ask.... JRA */ + /* "don't ask" that it's done this way to fix corrupted + Win9X/ME printer comments. */ + if (!status) { PACKI(desc,"W",LPSTAT_OK); /* fsStatus */ } else { - PACKS(desc,"z",status->message); /* pszComment */ PACKI(desc,"W",printq_status(status->status)); /* fsStatus */ } PACKI(desc,(uLevel == 3 ? "W" : "N"),count); /* cJobs */ |