summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-03-06 16:06:12 +0000
committerGerald Carter <jerry@samba.org>2003-03-06 16:06:12 +0000
commit26b1ed7cc05e3bfd9f83bdb664cc6ca0a9883c4a (patch)
tree6803da3c40b1a8932aec7cb1837164eee7904538 /source3
parentca0d82b11c0b17e793801ccc5acdc8624c7f3f19 (diff)
downloadsamba-26b1ed7cc05e3bfd9f83bdb664cc6ca0a9883c4a.tar.gz
samba-26b1ed7cc05e3bfd9f83bdb664cc6ca0a9883c4a.tar.bz2
samba-26b1ed7cc05e3bfd9f83bdb664cc6ca0a9883c4a.zip
add #define for the max device name length in a DEVICEMODE
(This used to be commit 21ec2b6ba3ddba6964f6ddb53f8494e4a8b48a83)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/nt_printing.h2
-rw-r--r--source3/printing/nt_printing.c2
-rw-r--r--source3/rpc_parse/parse_spoolss.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index ca65a40d48..762b1c6917 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -255,6 +255,8 @@ typedef struct {
NT_PRINTER_KEY *keys;
} NT_PRINTER_DATA;
+#define MAXDEVICENAME 32
+
typedef struct ntdevicemode
{
fstring devicename;
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 6df2c6b445..a486fb9c00 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2110,7 +2110,7 @@ done:
NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
{
- char adevice[33];
+ char adevice[MAXDEVICENAME];
NT_DEVICEMODE *nt_devmode = (NT_DEVICEMODE *)malloc(sizeof(NT_DEVICEMODE));
if (nt_devmode == NULL) {
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 0545f89ff7..a5d2087a3a 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -684,7 +684,7 @@ BOOL spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE
return False;
}
- if (!prs_uint16uni(True,"devicename", ps, depth, devmode->devicename.buffer, 32))
+ if (!prs_uint16uni(True,"devicename", ps, depth, devmode->devicename.buffer, MAXDEVICENAME))
return False;
if (!prs_uint16("specversion", ps, depth, &devmode->specversion))