From: David Disseldorp <ddiss@samba.org>
Date: Wed, 23 Nov 2011 01:03:48 +0000 (+0100)
Subject: idl: add to_null attribute to the spoolss devicename array
X-Git-Tag: samba-3.6.2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acb826038488fe8850fa227917868d9e03f4c00e;p=thirdparty%2Fsamba.git

idl: add to_null attribute to the spoolss devicename array

OpenPrinterEx requests have also been observed in the wild carrying
non-utf16 garbage after the device mode devicename field null
terminator.

Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 90f3708135ef6573997417bd8e53191df78519c2)
---

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 4b1f94f4a35..d888a79ecba 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -678,7 +678,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 	const int MAXDEVICENAME	= 32;
 
 	typedef [public,gensize] struct {
-		[charset(UTF16)] uint16 devicename[MAXDEVICENAME];
+		[charset(UTF16),to_null] uint16 devicename[MAXDEVICENAME];
 		spoolss_DeviceModeSpecVersion specversion;
 		uint16 driverversion;
 		uint16 size;