add #define for the max device name length in a DEVICEMODE

(This used to be commit 21ec2b6ba3ddba6964f6ddb53f8494e4a8b48a83)

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index ca65a40d488465209bc1dacd2a958c836fe77cf2..762b1c691709b807c48c9da0fa85c1a4b60a10ef 100644 (file)
--- 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 6df2c6b4457462d9b4bbfb9705428a99ab8df1e2..a486fb9c003f58a763ffe8137311645a196d60c1 100644 (file)
--- 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 0545f89ff7a27aee5797bad28fd6effe62a009ac..a5d2087a3a317beb2fc3f09678f82726147a1d87 100644 (file)
--- 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))