summaryrefslogtreecommitdiff
path: root/source3/printing/printing.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-01-07 06:21:56 +0000
committerJeremy Allison <jra@samba.org>1998-01-07 06:21:56 +0000
commitc23ed625b22bfc765ba95cb7b8addf55625fea44 (patch)
tree05d1f7c6b0f9c00d9ca916306d2628f2f685c18a /source3/printing/printing.c
parent984b47d5a727c0921adf5254c66705929d0c4ef0 (diff)
downloadsamba-c23ed625b22bfc765ba95cb7b8addf55625fea44.tar.gz
samba-c23ed625b22bfc765ba95cb7b8addf55625fea44.tar.bz2
samba-c23ed625b22bfc765ba95cb7b8addf55625fea44.zip
includes.h: Added FreeBSD 3.x fixes. Added HPUX10.x fixes.
interface.c: Added netmask fix. nmbd_nameregister.c: Fixed unitialised variable warnings. nmbd_winsproxy.c: Fixed unitialised variable warnings. nmbd_winsserver.c: Fixed DEC warnings. print_svid.c: Fixed DEC warnings. printing.c: Added LPRng fixes. Jeremy. (This used to be commit 28aff043c4a3693a0c20e87c7ce11eb4bf285b78)
Diffstat (limited to 'source3/printing/printing.c')
-rw-r--r--source3/printing/printing.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index ccca91a253..76b962606b 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -320,6 +320,23 @@ Printer: humprn@hum-fak (printing disabled)
Status: finished operations at Fri Jun 21 10:10:32 1996
Rank Owner Class Job Files Size Time
1 magnus@hum-fak A 387 /var/spool/smb/netbudget.xls 21230 10:50:53
+
+******************************************************************************
+
+NEW FOR LPRng-3.3.5 !
+
+<reinelt@eunet.at>
+This will not happen anymore: with LPRng-3.3.5 there is always a blank between
+the filename and the size, and the format has changed:
+
+Printer: lj6@lizard 'HP LaserJet 6P'
+ Queue: 2 printable jobs
+ Server: pid 11941 active
+ Unspooler: pid 11942 active
+ Status: printed all 1818 bytes at 19:49:59
+ Rank Owner/ID Class Job Files Size Time
+active root@lizard+937 A 937 (stdin) 1818 19:49:58
+2 root@lizard+969 A 969 junk.txt 2170 19:50:12
****************************************************************************/
static BOOL parse_lpq_lprng(char *line,print_queue_struct *buf,BOOL first)
@@ -367,6 +384,12 @@ LPRng source changes. This is from version 2.3.0. Magnus */
string tok[LPRNG_NTOK];
int count=0;
+#ifdef OLD_LPRNG
+/* We only need this bugfix for older versions of lprng - current
+ information is that version 3.3.5 must not have this line
+ in order to work correctly.
+*/
+
/*
Need to insert one space in front of the size, to be able to use
next_token() unchanged. I would have liked to be able to insert a
@@ -378,6 +401,7 @@ A long spool-path will just waste significant chars of the file name.
*/
line[JOBSIZE_POS-1]=' ';
+#endif /* OLD_LPRNG */
/* handle the case of "(stdin)" as a filename */
string_sub(line,"stdin","STDIN");