summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>1998-03-20 13:37:46 +0000
committerJohn Terpstra <jht@samba.org>1998-03-20 13:37:46 +0000
commit1ab10eb365d8e2f5a337eea0b98956d5fd098c44 (patch)
treeb6e1faa06e19f2743c758d90470f2fcecc2c243c /source3
parent4269286835ab3b6c5e23dcd369960ec94b5075f9 (diff)
downloadsamba-1ab10eb365d8e2f5a337eea0b98956d5fd098c44.tar.gz
samba-1ab10eb365d8e2f5a337eea0b98956d5fd098c44.tar.bz2
samba-1ab10eb365d8e2f5a337eea0b98956d5fd098c44.zip
Added MAXPRINTERLEN define in smb.h setting printer share name length to maximumof 15 characters. IF this needs to be limited to 8 characters again please do
it in smb.h. (This used to be commit 3dfe0b135dd91864a81a5fadddc9151ac8812c6e)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/smb.h3
-rw-r--r--source3/printing/pcap.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 0acc5cbfa3..f0cdf9f356 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -24,6 +24,9 @@
#ifndef _SMB_H
#define _SMB_H
+/* Yves Gaige <yvesg@hptnodur.grenoble.hp.com> requested this */
+#define MAXPRINTERLEN 15
+
#define BUFFER_SIZE (0xFFFF)
#define SAFETY_MARGIN 1024
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 3698114a2f..38c4dec3fc 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -375,7 +375,7 @@ void pcap_printer_fn(void (*fn)())
continue;
}
- if (strlen(p) <= 8 && strlen(p)>strlen(name) && !has_punctuation)
+ if (strlen(p) <= MAXPRINTERLEN && strlen(p)>strlen(name) && !has_punctuation)
{
if (!*comment) pstrcpy(comment,name);
pstrcpy(name,p);
@@ -391,7 +391,7 @@ void pcap_printer_fn(void (*fn)())
}
comment[60] = 0;
- name[8] = 0;
+ name[MAXPRINTERLEN] = 0;
if (*name)
fn(name,comment);