diff --git a/samba-3.6.6-ndr.patch b/samba-3.6.6-ndr.patch new file mode 100644 index 0000000..6b30246 --- /dev/null +++ b/samba-3.6.6-ndr.patch @@ -0,0 +1,705 @@ +From aaa2005d4b344dfc148b719b1e3081710b703d64 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 6 Jul 2012 18:04:33 +0200 +Subject: [PATCH 1/4] ntprinting: make decode_ntprinting helpers public in + idl. + +Guenther +(cherry picked from commit 66514f8bbe5f9e2dcd8be90450ef339305a3161c) +--- + librpc/idl/ntprinting.idl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/librpc/idl/ntprinting.idl b/librpc/idl/ntprinting.idl +index 9098291..7013566 100644 +--- a/librpc/idl/ntprinting.idl ++++ b/librpc/idl/ntprinting.idl +@@ -26,7 +26,7 @@ interface ntprinting + uint32 bottom; + } ntprinting_form; + +- void decode_ntprinting_form( ++ [public] void decode_ntprinting_form( + [in] ntprinting_form form + ); + +@@ -46,7 +46,7 @@ interface ntprinting + [flag(STR_UTF8|STR_NOTERM|NDR_REMAINING)] string_array dependent_files; + } ntprinting_driver; + +- void decode_ntprinting_driver( ++ [public] void decode_ntprinting_driver( + [in] ntprinting_driver driver + ); + +@@ -146,7 +146,7 @@ interface ntprinting + ntprinting_printer_data printer_data[count]; + } ntprinting_printer; + +- void decode_ntprinting_printer( ++ [public] void decode_ntprinting_printer( + [in] ntprinting_printer printer + ); + } +-- +1.7.10.4 + + +From c56dccd811ac5829897a37acd3613db14ae7b26c Mon Sep 17 00:00:00 2001 +From: David Disseldorp +Date: Fri, 6 Jul 2012 14:00:27 +0200 +Subject: [PATCH 2/4] ndr: fix push/pull DATA_BLOB with NDR_NOALIGN +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This change addresses bug 9026. +There are 3 use cases for DATA_BLOB marshalling/unmarshalling: + +1) +ndr_push_DATA_BLOB and ndr_pull_DATA_BLOB when called with +LIBNDR_FLAG_ALIGN* alignment flags set, are used to push/pull padding +bytes _only_. The length is determined by the alignment required and +the current ndr offset. +e.g. dcerpc.idl: + typedef struct { +... + [flag(NDR_ALIGN8)] DATA_BLOB _pad; + } dcerpc_request; + +2) +When called with the LIBNDR_FLAG_REMAINING flag, all remaining bytes in +the ndr buffer are pushed/pulled. +e.g. dcerpc.idl: + typedef struct { +... + [flag(NDR_REMAINING)] DATA_BLOB stub_and_verifier; + } dcerpc_request; + +3) +When called without alignment flags, push/pull a uint32 length _and_ a +corresponding byte array to/from the ndr buffer. +e.g. drsblobs.idl + typedef [public] struct { +... + DATA_BLOB data; + } DsCompressedChunk; + +The fix for bug 8373 changed the definition of "alignment flags", such +that when called with LIBNDR_FLAG_NOALIGN ndr_push/pull_DATA_BLOB +behaves as (1: padding bytes) rather than (3: uint32 length + byte +array). + +This breaks marshalling/unmarshalling for the following structures. +eventlog.idl: + typedef [flag(NDR_NOALIGN|NDR_PAHEX),public] struct { +... + DATA_BLOB sid; +... + } eventlog_Record_tdb; + +ntprinting.idl: + typedef [flag(NDR_NOALIGN),public] struct { +... + DATA_BLOB *nt_dev_private; + } ntprinting_devicemode; + + typedef [flag(NDR_NOALIGN),public] struct { +... + DATA_BLOB data; + } ntprinting_printer_data; + +Signed-off-by: Günther Deschner +(cherry picked from commit 0d3249b927465fdca1765cbd7e17c947364b5ef0) +--- + librpc/ndr/ndr_basic.c | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c +index b444300..c7a2c11 100644 +--- a/librpc/ndr/ndr_basic.c ++++ b/librpc/ndr/ndr_basic.c +@@ -1213,16 +1213,21 @@ _PUBLIC_ void ndr_print_DATA_BLOB(struct ndr_print *ndr, const char *name, DATA_ + + + /* +- push a DATA_BLOB onto the wire. +-*/ ++ * Push a DATA_BLOB onto the wire. ++ * 1) When called with LIBNDR_FLAG_ALIGN* alignment flags set, push padding ++ * bytes _only_. The length is determined by the alignment required and the ++ * current ndr offset. ++ * 2) When called with the LIBNDR_FLAG_REMAINING flag, push the byte array to ++ * the ndr buffer. ++ * 3) Otherwise, push a uint32 length _and_ a corresponding byte array to the ++ * ndr buffer. ++ */ + _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob) + { + if (ndr->flags & LIBNDR_FLAG_REMAINING) { + /* nothing to do */ +- } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) { +- if (ndr->flags & LIBNDR_FLAG_NOALIGN) { +- blob.length = 0; +- } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) { ++ } else if (ndr->flags & (LIBNDR_ALIGN_FLAGS & ~LIBNDR_FLAG_NOALIGN)) { ++ if (ndr->flags & LIBNDR_FLAG_ALIGN2) { + blob.length = NDR_ALIGN(ndr, 2); + } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { + blob.length = NDR_ALIGN(ndr, 4); +@@ -1239,18 +1244,23 @@ _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flag + } + + /* +- pull a DATA_BLOB from the wire. +-*/ ++ * Pull a DATA_BLOB from the wire. ++ * 1) when called with LIBNDR_FLAG_ALIGN* alignment flags set, pull padding ++ * bytes _only_. The length is determined by the alignment required and the ++ * current ndr offset. ++ * 2) When called with the LIBNDR_FLAG_REMAINING flag, pull all remaining bytes ++ * from the ndr buffer. ++ * 3) Otherwise, pull a uint32 length _and_ a corresponding byte array from the ++ * ndr buffer. ++ */ + _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_BLOB *blob) + { + uint32_t length = 0; + + if (ndr->flags & LIBNDR_FLAG_REMAINING) { + length = ndr->data_size - ndr->offset; +- } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) { +- if (ndr->flags & LIBNDR_FLAG_NOALIGN) { +- length = 0; +- } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) { ++ } else if (ndr->flags & (LIBNDR_ALIGN_FLAGS & ~LIBNDR_FLAG_NOALIGN)) { ++ if (ndr->flags & LIBNDR_FLAG_ALIGN2) { + length = NDR_ALIGN(ndr, 2); + } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { + length = NDR_ALIGN(ndr, 4); +-- +1.7.10.4 + + +From 96b466de8354bd3983910c6e6b322249a1dbf1f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 6 Jul 2012 18:22:36 +0200 +Subject: [PATCH 3/4] ntprinting: mark the final 4 byte null pointer for + printer data in ndr_pull_ntprinting_printer as read. + +Guenther +(cherry picked from commit 8835eab013ea1c8919dd6aafda090733f6224535) +--- + librpc/ndr/ndr_ntprinting.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/librpc/ndr/ndr_ntprinting.c b/librpc/ndr/ndr_ntprinting.c +index 87b743d..76b296d 100644 +--- a/librpc/ndr/ndr_ntprinting.c ++++ b/librpc/ndr/ndr_ntprinting.c +@@ -54,6 +54,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int + uint32_t ptr = 0; + ptr = IVAL(ndr->data, ndr->offset); + if (ptr == 0) { ++ ndr->offset = ndr->offset + 4; + break; + } + r->printer_data = talloc_realloc(ndr, r->printer_data, struct ntprinting_printer_data, r->count + 1); +-- +1.7.10.4 + + +From 7c165459c9042247f952ee4c886898f9f0142531 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 6 Jul 2012 19:02:00 +0200 +Subject: [PATCH 4/4] s4-torture: add ntprinting ndr operations testsuite. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Autobuild-User(master): Günther Deschner +Autobuild-Date(master): Fri Jul 6 20:55:26 CEST 2012 on sn-devel-104 +(cherry picked from commit 4cafbb4e7443779ab1c58581709114db9a7bf918) +--- + source4/torture/ndr/ndr.c | 1 + + source4/torture/ndr/ntprinting.c | 440 ++++++++++++++++++++++++++++++++++++++ + source4/torture/wscript_build | 2 +- + 3 files changed, 442 insertions(+), 1 deletion(-) + create mode 100644 source4/torture/ndr/ntprinting.c + +diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c +index 36b2b55..c5fd6b8 100644 +--- a/source4/torture/ndr/ndr.c ++++ b/source4/torture/ndr/ndr.c +@@ -350,6 +350,7 @@ struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx) + torture_suite_add_suite(suite, ndr_netlogon_suite(suite)); + torture_suite_add_suite(suite, ndr_drsuapi_suite(suite)); + torture_suite_add_suite(suite, ndr_spoolss_suite(suite)); ++ torture_suite_add_suite(suite, ndr_ntprinting_suite(suite)); + torture_suite_add_suite(suite, ndr_samr_suite(suite)); + torture_suite_add_suite(suite, ndr_drsblobs_suite(suite)); + torture_suite_add_suite(suite, ndr_nbt_suite(suite)); +diff --git a/source4/torture/ndr/ntprinting.c b/source4/torture/ndr/ntprinting.c +new file mode 100644 +index 0000000..44ad86b +--- /dev/null ++++ b/source4/torture/ndr/ntprinting.c +@@ -0,0 +1,440 @@ ++/* ++ Unix SMB/CIFS implementation. ++ test suite for ntprinting ndr operations ++ ++ Copyright (C) Guenther Deschner 2012 ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++*/ ++ ++#include "includes.h" ++#include "torture/ndr/ndr.h" ++#include "librpc/gen_ndr/ndr_ntprinting.h" ++#include "torture/ndr/proto.h" ++ ++static const uint8_t ntprinting_printer_data[] = { ++ 0x48, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x0e, 0x03, 0x09, ++ 0x00, 0x00, 0x00, 0x00, 0x24, 0x13, 0xb8, 0x4e, 0x00, 0x4b, 0x79, 0x6f, ++ 0x63, 0x65, 0x72, 0x61, 0x2d, 0x35, 0x30, 0x30, 0x00, 0x6b, 0x79, 0x6f, ++ 0x63, 0x65, 0x72, 0x61, 0x2d, 0x35, 0x30, 0x30, 0x00, 0x53, 0x61, 0x6d, ++ 0x62, 0x61, 0x20, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x50, ++ 0x6f, 0x72, 0x74, 0x00, 0x6b, 0x79, 0x6f, 0x63, 0x65, 0x72, 0x61, 0x2d, ++ 0x35, 0x30, 0x30, 0x00, 0x4b, 0x79, 0x6f, 0x63, 0x65, 0x72, 0x61, 0x20, ++ 0x54, 0x61, 0x73, 0x6b, 0x41, 0x6c, 0x66, 0x61, 0x20, 0x35, 0x30, 0x30, ++ 0x63, 0x69, 0x00, 0x62, 0x75, 0x6c, 0x6c, 0x70, 0x65, 0x6e, 0x00, 0x00, ++ 0x77, 0x69, 0x6e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x00, 0x52, 0x41, 0x57, ++ 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x5c, 0x5c, 0x69, 0x72, 0x6f, 0x62, ++ 0x6f, 0x74, 0x5c, 0x4b, 0x79, 0x6f, 0x63, 0x65, 0x72, 0x61, 0x2d, 0x35, ++ 0x30, 0x30, 0x00, 0x4c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x00, 0x01, 0x04, ++ 0x00, 0x06, 0xdc, 0x00, 0x60, 0x08, 0x01, 0x00, 0x01, 0x00, 0xea, 0x0a, ++ 0x6f, 0x08, 0x64, 0x00, 0x01, 0x00, 0x0f, 0x00, 0x58, 0x02, 0x02, 0x00, ++ 0x01, 0x00, 0x58, 0x02, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x53, 0xff, ++ 0x81, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, ++ 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x60, 0x08, ++ 0x00, 0x00, 0x50, 0x52, 0x49, 0x56, 0xe2, 0x30, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x10, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x54, 0x06, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x10, 0x00, 0x5c, 0x4b, ++ 0x03, 0x00, 0x68, 0x43, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x75, ++ 0xbf, 0xbb, 0x29, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0e, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x53, 0x4d, ++ 0x54, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x70, 0x03, 0x6b, 0x00, ++ 0x79, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, ++ 0x2d, 0x00, 0x35, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x4a, 0x43, ++ 0x4c, 0x54, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x00, 0x4d, 0x65, ++ 0x64, 0x69, 0x75, 0x6d, 0x00, 0x4a, 0x43, 0x4c, 0x48, 0x61, 0x6c, 0x66, ++ 0x74, 0x6f, 0x6e, 0x65, 0x00, 0x47, 0x72, 0x61, 0x64, 0x61, 0x74, 0x69, ++ 0x6f, 0x6e, 0x00, 0x4a, 0x43, 0x4c, 0x52, 0x65, 0x64, 0x4c, 0x65, 0x76, ++ 0x65, 0x6c, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x47, ++ 0x72, 0x65, 0x65, 0x6e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x00, 0x4e, 0x6f, ++ 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x42, 0x6c, 0x75, 0x65, 0x4c, 0x65, ++ 0x76, 0x65, 0x6c, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, ++ 0x48, 0x75, 0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x00, 0x4e, 0x6f, ++ 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x48, 0x75, 0x65, 0x52, 0x65, 0x64, ++ 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x48, 0x75, 0x65, ++ 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, ++ 0x4a, 0x43, 0x4c, 0x48, 0x75, 0x65, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x00, ++ 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x48, 0x75, 0x65, 0x43, ++ 0x79, 0x61, 0x6e, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, ++ 0x48, 0x75, 0x65, 0x42, 0x6c, 0x75, 0x65, 0x00, 0x4e, 0x6f, 0x6e, 0x65, ++ 0x00, 0x4a, 0x43, 0x4c, 0x48, 0x75, 0x65, 0x4d, 0x61, 0x67, 0x65, 0x6e, ++ 0x74, 0x61, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x4c, ++ 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x61, 0x6d, 0x6d, ++ 0x61, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, 0x4c, 0x69, ++ 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x72, ++ 0x61, 0x73, 0x74, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4a, 0x43, 0x4c, ++ 0x53, 0x61, 0x74, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x4e, ++ 0x6f, 0x6e, 0x65, 0x00, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, ++ 0x6f, 0x6e, 0x00, 0x36, 0x30, 0x30, 0x64, 0x70, 0x69, 0x00, 0x4b, 0x43, ++ 0x45, 0x63, 0x6f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x00, 0x4f, 0x66, 0x66, ++ 0x00, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x00, ++ 0x43, 0x4d, 0x59, 0x4b, 0x00, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x72, 0x65, ++ 0x70, 0x72, 0x6f, 0x64, 0x00, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, ++ 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x00, 0x43, 0x49, 0x45, ++ 0x00, 0x50, 0x72, 0x6e, 0x44, 0x65, 0x66, 0x00, 0x50, 0x61, 0x67, 0x65, ++ 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x00, 0x4f, 0x6e, 0x00, 0x50, 0x61, ++ 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x00, 0x4c, 0x65, 0x74, 0x74, 0x65, ++ 0x72, 0x00, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, ++ 0x00, 0x00, 0x4c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x45, 0x64, 0x67, ++ 0x65, 0x00, 0x00, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, 0x6c, 0x6f, 0x74, ++ 0x00, 0x2a, 0x55, 0x73, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x54, 0x72, 0x61, ++ 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x00, 0x4d, 0x65, 0x64, 0x69, 0x61, ++ 0x54, 0x79, 0x70, 0x65, 0x00, 0x41, 0x75, 0x74, 0x6f, 0x00, 0x4f, 0x75, ++ 0x74, 0x70, 0x75, 0x74, 0x42, 0x69, 0x6e, 0x00, 0x4e, 0x6f, 0x6e, 0x65, ++ 0x00, 0x4b, 0x43, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x00, 0x4e, 0x6f, ++ 0x6e, 0x65, 0x00, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x43, 0x6f, 0x75, ++ 0x6e, 0x74, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4b, 0x43, 0x50, 0x75, ++ 0x6e, 0x63, 0x68, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4b, 0x43, 0x42, ++ 0x6f, 0x6f, 0x6b, 0x6c, 0x65, 0x74, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, ++ 0x4b, 0x43, 0x46, 0x6f, 0x6c, 0x64, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, ++ 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x00, 0x46, 0x61, 0x6c, 0x73, 0x65, ++ 0x00, 0x4a, 0x6f, 0x67, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x44, 0x75, ++ 0x70, 0x6c, 0x65, 0x78, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x4b, 0x43, ++ 0x43, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x00, 0x50, 0x72, 0x6e, 0x44, ++ 0x65, 0x66, 0x00, 0x4b, 0x6d, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x6d, 0x65, ++ 0x6e, 0x74, 0x00, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x4b, ++ 0x43, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x44, 0x65, 0x66, ++ 0x61, 0x75, 0x6c, 0x74, 0x00, 0x63, 0x75, 0x70, 0x73, 0x4a, 0x6f, 0x62, ++ 0x48, 0x6f, 0x6c, 0x64, 0x55, 0x6e, 0x74, 0x69, 0x6c, 0x00, 0x6e, 0x6f, ++ 0x2d, 0x68, 0x6f, 0x6c, 0x64, 0x00, 0x63, 0x75, 0x70, 0x73, 0x4a, 0x6f, ++ 0x62, 0x53, 0x68, 0x65, 0x65, 0x74, 0x73, 0x53, 0x74, 0x61, 0x72, 0x74, ++ 0x00, 0x6e, 0x6f, 0x6e, 0x65, 0x00, 0x63, 0x75, 0x70, 0x73, 0x4a, 0x6f, ++ 0x62, 0x53, 0x68, 0x65, 0x65, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x00, 0x6e, ++ 0x6f, 0x6e, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x53, 0x50, 0x55, 0x43, 0x00, 0x06, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, ++ 0x00, 0x00, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x44, 0x72, 0x69, ++ 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x50, 0x72, 0x69, 0x6e, ++ 0x74, 0x65, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, ++ 0x61, 0x5c, 0x54, 0x72, 0x61, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x53, 0x69, ++ 0x7a, 0x65, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xce, ++ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x50, 0x72, 0x69, 0x6e, 0x74, ++ 0x65, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, ++ 0x5c, 0x54, 0x72, 0x61, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x54, 0x61, 0x62, ++ 0x6c, 0x65, 0x00, 0x03, 0x00, 0x00, 0x00, 0xce, 0x00, 0x00, 0x00, 0xce, ++ 0x00, 0x43, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x65, 0x00, 0x74, ++ 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x00, 0x00, 0x4c, ++ 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, ++ 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x32, ++ 0x00, 0x00, 0x00, 0x4c, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, ++ 0x00, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x00, 0x61, ++ 0x00, 0x73, 0x00, 0x73, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, ++ 0x00, 0x20, 0x00, 0x33, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x65, 0x00, 0x74, ++ 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x43, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x65, 0x00, 0x74, ++ 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x34, 0x00, 0x00, 0x00, 0x4c, ++ 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x79, 0x00, 0x70, 0x00, 0x61, ++ 0x00, 0x73, 0x00, 0x73, 0x00, 0x20, 0x00, 0x54, 0x00, 0x72, 0x00, 0x61, ++ 0x00, 0x79, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, ++ 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x01, 0x00, 0x00, 0x00, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, ++ 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x5c, 0x54, ++ 0x72, 0x61, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x4d, 0x61, 0x70, 0x53, 0x69, ++ 0x7a, 0x65, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x39, ++ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x50, 0x72, 0x69, 0x6e, 0x74, ++ 0x65, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, ++ 0x5c, 0x54, 0x72, 0x61, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x4d, 0x61, 0x70, ++ 0x00, 0x03, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x50, 0x46, 0x37, ++ 0x30, 0x30, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x37, 0x30, ++ 0x30, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x37, 0x30, 0x30, ++ 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x37, 0x30, 0x30, 0x44, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x46, 0x31, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x50, 0x72, ++ 0x69, 0x6e, 0x74, 0x65, 0x72, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x44, ++ 0x61, 0x74, 0x61, 0x5c, 0x54, 0x72, 0x61, 0x79, 0x46, 0x6f, 0x72, 0x6d, ++ 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x53, 0x69, 0x7a, 0x65, 0x00, ++ 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, ++ 0x01, 0x00, 0x00, 0x00, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x44, ++ 0x72, 0x69, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x5c, 0x54, 0x72, ++ 0x61, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, ++ 0x64, 0x00, 0x03, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x50, 0x46, ++ 0x37, 0x30, 0x30, 0x41, 0x00, 0x00, 0x50, 0x46, 0x37, 0x30, 0x30, 0x42, ++ 0x00, 0x00, 0x50, 0x46, 0x37, 0x30, 0x30, 0x43, 0x00, 0x00, 0x50, 0x46, ++ 0x37, 0x30, 0x30, 0x44, 0x00, 0x00, 0x4d, 0x46, 0x31, 0x00, 0x00, 0x00, ++ 0x01, 0x00, 0x00, 0x00, 0x44, 0x73, 0x53, 0x70, 0x6f, 0x6f, 0x6c, 0x65, ++ 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, ++ 0x00, 0x00, 0x44, 0x73, 0x53, 0x70, 0x6f, 0x6f, 0x6c, 0x65, 0x72, 0x5c, ++ 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x00, 0x01, ++ 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x49, 0x00, 0x52, 0x00, 0x4f, ++ 0x00, 0x42, 0x00, 0x4f, 0x00, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, ++ 0x00, 0x44, 0x73, 0x53, 0x70, 0x6f, 0x6f, 0x6c, 0x65, 0x72, 0x5c, 0x73, ++ 0x68, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, ++ 0x6d, 0x65, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x49, ++ 0x00, 0x52, 0x00, 0x4f, 0x00, 0x42, 0x00, 0x4f, 0x00, 0x54, 0x00, 0x00, ++ 0x00, 0x01, 0x00, 0x00, 0x00, 0x44, 0x73, 0x53, 0x70, 0x6f, 0x6f, 0x6c, ++ 0x65, 0x72, 0x5c, 0x75, 0x4e, 0x43, 0x4e, 0x61, 0x6d, 0x65, 0x00, 0x01, ++ 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x49, ++ 0x00, 0x52, 0x00, 0x4f, 0x00, 0x42, 0x00, 0x4f, 0x00, 0x54, 0x00, 0x5c, ++ 0x00, 0x6b, 0x00, 0x79, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x65, 0x00, 0x72, ++ 0x00, 0x61, 0x00, 0x2d, 0x00, 0x35, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00 ++}; ++ ++static bool ntprinting_printer_check(struct torture_context *tctx, ++ struct ntprinting_printer *r) ++{ ++ torture_assert_int_equal(tctx, r->info.attributes, 0x00081048, "attributes"); ++ torture_assert_int_equal(tctx, r->info.priority, 1, "priority"); ++ torture_assert_int_equal(tctx, r->info.default_priority, 1, "default_priority"); ++ torture_assert_int_equal(tctx, r->info.starttime, 0, "startime"); ++ torture_assert_int_equal(tctx, r->info.untiltime, 0, "untiltime"); ++ torture_assert_int_equal(tctx, r->info.status, 0, "status"); ++ torture_assert_int_equal(tctx, r->info.cjobs, 5, "cjobs"); ++ torture_assert_int_equal(tctx, r->info.averageppm, 0, "averageppm"); ++ torture_assert_int_equal(tctx, r->info.changeid, 0x09030e9d, "changeid"); ++ torture_assert_int_equal(tctx, r->info.c_setprinter, 0, "c_setprinter"); ++ torture_assert_int_equal(tctx, r->info.setuptime, 0x4eb81324, "setuptime"); ++ torture_assert_str_equal(tctx, r->info.servername, "", "servername"); ++ torture_assert_str_equal(tctx, r->info.printername, "Kyocera-500", "printername"); ++ torture_assert_str_equal(tctx, r->info.sharename, "kyocera-500", "sharename"); ++ torture_assert_str_equal(tctx, r->info.portname, "Samba Printer Port", "portname"); ++ torture_assert_str_equal(tctx, r->info.drivername, "kyocera-500", "drivername"); ++ torture_assert_str_equal(tctx, r->info.comment, "Kyocera TaskAlfa 500ci", "comment"); ++ torture_assert_str_equal(tctx, r->info.location, "bullpen", "comment"); ++ torture_assert_str_equal(tctx, r->info.sepfile, "", "sepfile"); ++ torture_assert_str_equal(tctx, r->info.printprocessor, "winprint", "printprocessor"); ++ torture_assert_str_equal(tctx, r->info.datatype, "RAW", "datatype"); ++ torture_assert_str_equal(tctx, r->info.parameters, "", "parameters"); ++ ++ torture_assert(tctx, r->devmode, "devmode"); ++ torture_assert_str_equal(tctx, r->devmode->devicename, "\\\\irobot\\Kyocera-500", "devicename"); ++ torture_assert_str_equal(tctx, r->devmode->formname, "Letter", "formname"); ++ torture_assert_int_equal(tctx, r->devmode->specversion, 0x0401, "specversion"); ++ torture_assert_int_equal(tctx, r->devmode->driverversion, 0x0600, "driverversion"); ++ torture_assert_int_equal(tctx, r->devmode->size, 0x00dc, "size"); ++ torture_assert_int_equal(tctx, r->devmode->driverextra, 0x0860, "driverextra"); ++ torture_assert_int_equal(tctx, r->devmode->orientation, 1, "orientation"); ++ torture_assert_int_equal(tctx, r->devmode->papersize, 1, "papersize"); ++ torture_assert_int_equal(tctx, r->devmode->paperlength, 0x0aea, "paperlength"); ++ torture_assert_int_equal(tctx, r->devmode->paperwidth, 0x086f, "paperwidth"); ++ torture_assert_int_equal(tctx, r->devmode->scale, 0x0064, "scale"); ++ torture_assert_int_equal(tctx, r->devmode->copies, 1, "copies"); ++ torture_assert_int_equal(tctx, r->devmode->defaultsource, 0x000f, "defaultsource"); ++ torture_assert_int_equal(tctx, r->devmode->printquality, 0x0258, "printquality"); ++ torture_assert_int_equal(tctx, r->devmode->color, 2, "color"); ++ torture_assert_int_equal(tctx, r->devmode->duplex, 1, "duplex"); ++ torture_assert_int_equal(tctx, r->devmode->yresolution, 0x0258, "yresolution"); ++ torture_assert_int_equal(tctx, r->devmode->ttoption, 2, "ttoption"); ++ torture_assert_int_equal(tctx, r->devmode->collate, 1, "collate"); ++ torture_assert_int_equal(tctx, r->devmode->logpixels, 0, "logpixels"); ++ torture_assert_int_equal(tctx, r->devmode->fields, 0x0381ff53, "fields"); ++ torture_assert_int_equal(tctx, r->devmode->bitsperpel, 0, "bitsperpel"); ++ torture_assert_int_equal(tctx, r->devmode->pelswidth, 0, "pelswidth"); ++ torture_assert_int_equal(tctx, r->devmode->pelsheight, 0, "pelsheight"); ++ torture_assert_int_equal(tctx, r->devmode->displayflags, 1, "displayflags"); ++ torture_assert_int_equal(tctx, r->devmode->displayfrequency, 0, "displayfrequency"); ++ torture_assert_int_equal(tctx, r->devmode->icmmethod, 1, "icmmethod"); ++ torture_assert_int_equal(tctx, r->devmode->icmintent, 2, "icmintent"); ++ torture_assert_int_equal(tctx, r->devmode->mediatype, 0x00000101, "mediatype"); ++ torture_assert_int_equal(tctx, r->devmode->dithertype, 0, "dithertype"); ++ torture_assert_int_equal(tctx, r->devmode->reserved1, 0, "reserved1"); ++ torture_assert_int_equal(tctx, r->devmode->reserved2, 0, "reserved2"); ++ torture_assert_int_equal(tctx, r->devmode->panningwidth, 0, "panningwidth"); ++ torture_assert_int_equal(tctx, r->devmode->panningheight, 0, "panningheight"); ++ ++ torture_assert(tctx, r->devmode->nt_dev_private, "nt_dev_private"); ++ torture_assert_int_equal(tctx, r->devmode->nt_dev_private->length, 2144, "nt_dev_private->length"); ++ ++ torture_assert_int_equal(tctx, r->count, 11, "count"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[0].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[0].name, "PrinterDriverData", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[0].type, 0, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[0].data.length, 0, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[1].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[1].name, "PrinterDriverData\\TrayFormSize", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[1].type, 4, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[1].data.length, 4, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[2].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[2].name, "PrinterDriverData\\TrayFormTable", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[2].type, 3, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[2].data.length, 206, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[3].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[3].name, "PrinterDriverData\\TrayFormMapSize", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[3].type, 4, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[3].data.length, 4, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[4].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[4].name, "PrinterDriverData\\TrayFormMap", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[4].type, 3, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[4].data.length, 57, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[5].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[5].name, "PrinterDriverData\\TrayFormKeywordSize", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[5].type, 4, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[5].data.length, 4, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[6].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[6].name, "PrinterDriverData\\TrayFormKeyword", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[6].type, 3, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[6].data.length, 38, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[7].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[7].name, "DsSpooler", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[7].type, 0, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[7].data.length, 0, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[8].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[8].name, "DsSpooler\\serverName", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[8].type, 1, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[8].data.length, 14, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[9].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[9].name, "DsSpooler\\shortServerName", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[9].type, 1, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[9].data.length, 14, "data.length"); ++ ++ torture_assert_int_equal(tctx, r->printer_data[10].ptr, 1, "ptr"); ++ torture_assert_str_equal(tctx, r->printer_data[10].name, "DsSpooler\\uNCName", "name"); ++ torture_assert_int_equal(tctx, r->printer_data[10].type, 1, "type"); ++ torture_assert_int_equal(tctx, r->printer_data[10].data.length, 42, "data.length"); ++ ++ return true; ++} ++ ++struct torture_suite *ndr_ntprinting_suite(TALLOC_CTX *ctx) ++{ ++ struct torture_suite *suite = torture_suite_create(ctx, "ntprinting"); ++ ++ torture_suite_add_ndr_pull_test(suite, ++ ntprinting_printer, ++ ntprinting_printer_data, ++ ntprinting_printer_check); ++ ++ /* pullpush not working atm. ++ torture_suite_add_ndr_pullpush_test(suite, ++ ntprinting_printer, ++ data_blob_const(ntprinting_printer_data, sizeof(ntprinting_printer_data)), ++ ntprinting_printer_check); ++ */ ++ return suite; ++} +diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build +index babe5f1..6a9f881 100644 +--- a/source4/torture/wscript_build ++++ b/source4/torture/wscript_build +@@ -33,7 +33,7 @@ bld.RECURSE('libnetapi') + bld.RECURSE('libsmbclient') + + bld.SAMBA_SUBSYSTEM('TORTURE_NDR', +- source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/backupkey.c', ++ source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/backupkey.c', + autoproto='ndr/proto.h', + deps='torture' + ) +-- +1.7.10.4 + diff --git a/samba.spec b/samba.spec index 6a5a3f8..2ca7526 100644 --- a/samba.spec +++ b/samba.spec @@ -1,4 +1,4 @@ -%define main_release 91 +%define main_release 92 %define samba_version 3.6.6 %define tdb_version 1.2.9 %define talloc_version 2.0.5 @@ -47,6 +47,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch Patch201: samba-3.6.4-krb5_locate_kdc.patch +Patch202: samba-3.6.6-ndr.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -233,6 +234,7 @@ cp %{SOURCE11} packaging/Fedora/ %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify %patch201 -p1 -b .krb5_locate_kdc +%patch202 -p1 -b .ndr mv %samba_source/VERSION %samba_source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION @@ -698,6 +700,10 @@ fi %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Jul 19 2012 Guenther Deschner - 2:3.6.6-92 +- Fix printing tdb upgrade for 3.6.6 +- resolves: #841609 + * Tue Jun 26 2012 Guenther Deschner - 2:3.6.6-91 - Update to 3.6.6