summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-03-17 15:55:23 +0100
committerGünther Deschner <gd@samba.org>2010-03-17 15:55:23 +0100
commit4ca2cc348e3412fd1851cd8512a10d0d0b1acf99 (patch)
tree2ee402d7f4121c437ac3c9d51d8f096fbc649a68
parent481402bae557b174b38a965d209d417728c7562f (diff)
downloadsamba-4ca2cc348e3412fd1851cd8512a10d0d0b1acf99.tar.gz
samba-4ca2cc348e3412fd1851cd8512a10d0d0b1acf99.tar.bz2
samba-4ca2cc348e3412fd1851cd8512a10d0d0b1acf99.zip
s4-smbtorture: workaround broken REG_MULTI_SZ from winreg in s3
during SetPrinterDataEx SPOOLSS test. Guenther
-rw-r--r--source4/torture/rpc/spoolss.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index fef95bd2b0..db7d5ab566 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3719,6 +3719,13 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
s = 0xffff;
}
+ if (torture_setting_bool(tctx, "samba3", false)) {
+ if ((types[t] == REG_MULTI_SZ) && s == 0) {
+ torture_warning(tctx, "samba3 does not handle 4 byte emtpy REG_MULTI_SZ buffers");
+ continue;
+ }
+ }
+
switch (types[t]) {
case REG_BINARY:
data = blob;