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 | acbed88a195b32d251fd15fc8fdd069726659d64 (patch) | |
tree | f7dbcdd35f6121806ce630f3bb6eca0cac342ca0 | |
parent | 7b774b72c2857af9519012106714a9e2cb099da3 (diff) | |
download | samba-acbed88a195b32d251fd15fc8fdd069726659d64.tar.gz samba-acbed88a195b32d251fd15fc8fdd069726659d64.tar.xz samba-acbed88a195b32d251fd15fc8fdd069726659d64.zip |
Changes from APPLIANCE_HEAD:
source/smbd/lanman.c
- Change fill_printq_info() to fix corrupted 9X/ME printer comment
-rw-r--r-- | source/smbd/lanman.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c index 848a187f1a6..a2178f052bd 100644 --- a/source/smbd/lanman.c +++ b/source/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 */ |