From 8aec70075ae410502b9e70f885409bd709ad5a97 Mon Sep 17 00:00:00 2001 From: David O'Neill Date: Wed, 17 Jan 2001 19:16:05 +0000 Subject: 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) --- source3/smbd/lanman.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/smbd/lanman.c') 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 */ -- cgit