[SCM] Samba Shared Repository - branch v3-5-test updated
Günther Deschner
gd at samba.org
Mon Dec 14 03:04:48 MST 2009
The branch, v3-5-test has been updated
via 4520862... spoolss: fix spoolss_PrinterData size calculation.
via 43ff4f2... spoolss: trivial fix for spoolss_FormInfo2 IDL.
via 73da0de... s4-smbtorture: check whether a returned buffer size is a multiple of 4 in RPC-SPOOLSS.
via 4e21847... s3-selftest: enable RPC-SAMBA3-WINREG.
via ee7944e... s3-rpcclient: allow to set offered size for enumkey command.
via 2f49b91... s4-smbtorture: add more spoolss_EnumPrinterKey tests for local NDR test.
via 3db86be... spoolss: remove unused spoolss_StringArray2.
via c394316... s4-smbtorture: fix and extend enum printerkey test.
via fc1dd12... s3-spoolss: fix enumprinter key client and server.
via 537e06a... s3: re-run make samba3-idl.
via 081456f... spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey.
via 0668b8b... spoolss: add spoolss_KeyNames union.
via d9a3bc0... s4-smbtorture: enhance spoolss_EnumPrinterKey torture test.
via 085f413... s3-spoolss: use SPOOLSS_ARCHITECTURE_ALL in driver enum server code.
via df1b904... spoolss: add more spoolss architectures to IDL.
via efdd60f... spoolss: fix spoolss_DriverInfo8 IDL.
via c65e5de... s4-smbtorture: make level 8 the reference for PrinterDriverEnum test.
via 9524600... s3-spoolss: cleanup _spoolss_EnumPrinterDrivers().
via 3dbb7c7... s3-spoolss: remove unused architecture from fill_printer_driver_info1().
via c466ca9... s3-spoolss: remove ridiculous amount of duplicate driver code.
via 0263b52... s3-spoolss: fully support level 8 drivers.
via 222f0bc... s3-spoolss: use driver level info8 everywhere in spoolss server internally.
via 52361a5... s4-smbtorture: fill in COMPARE_STRING_ARRAY macro in spoolss driver test.
from d8b3be2... s3:docs: Fix 'make manpages3'.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 4520862918ba2cff025b15d84922fbb08d8abbf6
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 12 02:52:41 2009 +0100
spoolss: fix spoolss_PrinterData size calculation.
Currently we were crashing in EnumPrinterDataEx when an e.g. an empty (NULL)
string for a separator file was returned.
Guenther
(cherry picked from commit e316624ddb8d4e178b03b315bfafd793e6c297c8)
commit 43ff4f2628882f9fa51bbe37f6cbe776f62241a3
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 12 02:51:44 2009 +0100
spoolss: trivial fix for spoolss_FormInfo2 IDL.
Guenther
(cherry picked from commit 5ae61cfbc281f346fd3712a975c5796f9cfbc6c2)
commit 73da0de2eaa2dec3ef1ebeee9dccaf81201dc7ba
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 12 01:51:13 2009 +0100
s4-smbtorture: check whether a returned buffer size is a multiple of 4 in RPC-SPOOLSS.
This gives a good indication where our IDL (and the s3 spoolss implementation) is still wrong.
Guenther
(cherry picked from commit 801fbd05691819ce9afadf4817bf1bf8ccc28a02)
commit 4e218472de4c5a2b79fd6c8115e8877d253c33b5
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 20:38:32 2009 +0100
s3-selftest: enable RPC-SAMBA3-WINREG.
Very strange we didn't run it before.
Guenther
(cherry picked from commit 31202a9dab330ed939b4ea71349c816707adff95)
commit ee7944ed987bd0e4dc1315ffcac09fd2fd37bfe9
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 9 15:49:46 2009 +0100
s3-rpcclient: allow to set offered size for enumkey command.
Guenther
(cherry picked from commit c2618d2c6f8657c30cd0f68777d3f37e64172191)
commit 2f49b911249b71c5aa68d14203e322c750acaef2
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 3 00:35:03 2009 +0100
s4-smbtorture: add more spoolss_EnumPrinterKey tests for local NDR test.
Guenther
(cherry picked from commit dc71d1c29de521c5034fd7ebf4657610d62c2c3c)
commit 3db86bea7b4f6168b482a3f243500ffe9a3fc35a
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:23:49 2009 +0100
spoolss: remove unused spoolss_StringArray2.
Guenther
(cherry picked from commit 835e7d6c98406725dc9dab891d3025b9a11b7eb9)
commit c3943161f7dd5d0c42b50f7689a2032652dc8ff6
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:21:12 2009 +0100
s4-smbtorture: fix and extend enum printerkey test.
Guenther
(cherry picked from commit ce33967f4a6a762e97a87513df7d33716db689fb)
commit fc1dd12c4ac9eb2994023c4e748c12b0b41e5841
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:20:22 2009 +0100
s3-spoolss: fix enumprinter key client and server.
Guenther
(cherry picked from commit f20effc437970d826c5bd4f047ff47e23e7a1a73)
commit 537e06a33e130bb8f638fe76f7c80668d801ec25
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:27:33 2009 +0100
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit fa413d167bc3ea9aff3dcff97152ef07a1173939)
commit 081456f03789f1f5e10bf1361fe5d5fa776c8fa4
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:19:28 2009 +0100
spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey.
Guenther
(cherry picked from commit 0ecb7f6ab28d7b7c1844554289f5ae8e876b1dcf)
commit 0668b8bd9c37de6df1d2af05b04ea2da441c8b20
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:18:46 2009 +0100
spoolss: add spoolss_KeyNames union.
Guenther
(cherry picked from commit cf2561473f7bd0bcef5c562c1e901d4ad17e6ee3)
commit d9a3bc084dafa7616c617fcaae5ed78fd27c3521
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 9 15:31:51 2009 +0100
s4-smbtorture: enhance spoolss_EnumPrinterKey torture test.
This demonstrates that s3 still does not have that call implemented correctly.
Guenther
(cherry picked from commit d2f13dd6882079f82d45847eda72c75d6de55a21)
commit 085f4137fbbceb8297dadcea6cf17cc73553cf00
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 8 14:46:10 2009 +0100
s3-spoolss: use SPOOLSS_ARCHITECTURE_ALL in driver enum server code.
Guenther
(cherry picked from commit e14fb8f913e35db96d8d7985e505f96150d9ce6b)
commit df1b90465c7b78c6d85cc59d087d21fd76880ad8
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 2 00:59:21 2009 +0100
spoolss: add more spoolss architectures to IDL.
Guenther
(cherry picked from commit fb3b0987f7f9d7026701ab8b3034ff6084ae2143)
commit efdd60fd9d0b36f924ef467040a1c5e1de5e68c2
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 7 18:55:08 2009 +0100
spoolss: fix spoolss_DriverInfo8 IDL.
found by RPC-SPOOLSS torture teset.
Guenther
commit c65e5dec09c14454b6d5ae22bb8aa21c414e36d7
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 7 19:26:45 2009 +0100
s4-smbtorture: make level 8 the reference for PrinterDriverEnum test.
Guenther
(cherry picked from commit 5e8e5dfe889a63747ffbd9429d8115e1715f53e6)
commit 9524600b322b271dcf23c2caa3996d7c2cb29824
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 7 16:19:26 2009 +0100
s3-spoolss: cleanup _spoolss_EnumPrinterDrivers().
Guenther
(cherry picked from commit 7770d1492bad12e778f9f4e0503dcf00983b2bb1)
commit 3dbb7c7c2b8be45f55431fde0999d2bef312d60a
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 7 16:18:55 2009 +0100
s3-spoolss: remove unused architecture from fill_printer_driver_info1().
Guenther
(cherry picked from commit 0efbd932b63af0232547571b249fa54de5e1bce2)
commit c466ca9ad382bbc0e5617e3e3de9143620c9e7ff
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 3 19:42:22 2009 +0100
s3-spoolss: remove ridiculous amount of duplicate driver code.
Guenther
(cherry picked from commit af08962c94b8f91c8a509881dece5720e914bc45)
commit 0263b52bee6bdc038b6440c3883bfd6aaac76409
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 3 19:11:53 2009 +0100
s3-spoolss: fully support level 8 drivers.
Guenther
(cherry picked from commit 1c9eba40ae8b329182fc3c4f073d1f18b8bad986)
commit 222f0bc0c233f33ae0d4dbdc5e4937c20cb47eaf
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 01:49:08 2009 +0100
s3-spoolss: use driver level info8 everywhere in spoolss server internally.
Guenther
(cherry picked from commit 35c50dcce35622b6f2806b9ae7f6ff6b54b6cbbf)
commit 52361a5c66773e2032b5b9a67b5c3d47ea0c3430
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 8 10:21:28 2009 +0100
s4-smbtorture: fill in COMPARE_STRING_ARRAY macro in spoolss driver test.
Guenther
(cherry picked from commit 35c067782b1dcd354dd825af3e853adf4c74e1d1)
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/cli_spoolss.c | 9 +-
librpc/gen_ndr/cli_spoolss.h | 6 +-
librpc/gen_ndr/ndr_spoolss.c | 259 +++++++++----
librpc/gen_ndr/ndr_spoolss.h | 5 +-
librpc/gen_ndr/spoolss.h | 25 +-
librpc/gen_ndr/srv_spoolss.c | 15 +-
librpc/idl/spoolss.idl | 27 +-
librpc/ndr/ndr_spoolss_buf.c | 73 +---
librpc/ndr/ndr_spoolss_buf.h | 4 +-
source3/include/proto.h | 10 +-
source3/printing/nt_printing.c | 295 ++++++++++-----
source3/registry/reg_backend_printing.c | 28 +-
source3/rpc_client/cli_spoolss.c | 7 +-
source3/rpc_server/srv_spoolss_nt.c | 647 +++++++++++--------------------
source3/rpcclient/cmd_spoolss.c | 13 +-
source3/script/tests/test_posix_s3.sh | 2 +-
source3/smbd/lanman.c | 50 ++--
source4/torture/ndr/README | 4 +
source4/torture/ndr/spoolss.c | 14 +
source4/torture/rpc/spoolss.c | 289 +++++++++++---
source4/torture/rpc/spoolss_win.c | 12 +-
21 files changed, 983 insertions(+), 811 deletions(-)
create mode 100644 source4/torture/ndr/README
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index e63a781..c6bb8ed 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -12207,7 +12207,8 @@ struct tevent_req *rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client *cli,
struct policy_handle *_handle /* [in] [ref] */,
const char *_key_name /* [in] [charset(UTF16)] */,
- struct spoolss_StringArray2 *_key_buffer /* [out] [ref] */,
+ uint32_t *__ndr_size /* [out] [ref] */,
+ union spoolss_KeyNames *_key_buffer /* [out] [subcontext_size(*_ndr_size*2),ref,subcontext(0),switch_is(*_ndr_size)] */,
uint32_t _offered /* [in] */,
uint32_t *_needed /* [out] [ref] */)
{
@@ -12229,6 +12230,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
state->orig.in.offered = _offered;
/* Out parameters */
+ state->orig.out._ndr_size = __ndr_size;
state->orig.out.key_buffer = _key_buffer;
state->orig.out.needed = _needed;
@@ -12278,6 +12280,7 @@ static void rpccli_spoolss_EnumPrinterKey_done(struct tevent_req *subreq)
}
/* Copy out parameters */
+ *state->orig.out._ndr_size = *state->tmp.out._ndr_size;
*state->orig.out.key_buffer = *state->tmp.out.key_buffer;
*state->orig.out.needed = *state->tmp.out.needed;
@@ -12317,7 +12320,8 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in] [ref] */,
const char *key_name /* [in] [charset(UTF16)] */,
- struct spoolss_StringArray2 *key_buffer /* [out] [ref] */,
+ uint32_t *_ndr_size /* [out] [ref] */,
+ union spoolss_KeyNames *key_buffer /* [out] [subcontext_size(*_ndr_size*2),ref,subcontext(0),switch_is(*_ndr_size)] */,
uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
@@ -12345,6 +12349,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
}
/* Return variables */
+ *_ndr_size = *r.out._ndr_size;
*key_buffer = *r.out.key_buffer;
*needed = *r.out.needed;
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index f2c1353..cae24be 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -1262,7 +1262,8 @@ struct tevent_req *rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client *cli,
struct policy_handle *_handle /* [in] [ref] */,
const char *_key_name /* [in] [charset(UTF16)] */,
- struct spoolss_StringArray2 *_key_buffer /* [out] [ref] */,
+ uint32_t *__ndr_size /* [out] [ref] */,
+ union spoolss_KeyNames *_key_buffer /* [out] [subcontext_size(*_ndr_size*2),ref,subcontext(0),switch_is(*_ndr_size)] */,
uint32_t _offered /* [in] */,
uint32_t *_needed /* [out] [ref] */);
NTSTATUS rpccli_spoolss_EnumPrinterKey_recv(struct tevent_req *req,
@@ -1272,7 +1273,8 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in] [ref] */,
const char *key_name /* [in] [charset(UTF16)] */,
- struct spoolss_StringArray2 *key_buffer /* [out] [ref] */,
+ uint32_t *_ndr_size /* [out] [ref] */,
+ union spoolss_KeyNames *key_buffer /* [out] [subcontext_size(*_ndr_size*2),ref,subcontext(0),switch_is(*_ndr_size)] */,
uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror);
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index e09802f..4467087 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -7960,15 +7960,6 @@ _PUBLIC_ void ndr_print_spoolss_StringArray(struct ndr_print *ndr, const char *n
ndr->depth--;
}
-_PUBLIC_ void ndr_print_spoolss_StringArray2(struct ndr_print *ndr, const char *name, const struct spoolss_StringArray2 *r)
-{
- ndr_print_struct(ndr, name, "spoolss_StringArray2");
- ndr->depth++;
- ndr_print_uint32(ndr, "_ndr_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?(ndr_size_spoolss_StringArray2(r, ndr->iconv_convenience, ndr->flags) - 4) / 2:r->_ndr_size);
- ndr_print_string_array(ndr, "string", r->string);
- ndr->depth--;
-}
-
static enum ndr_err_code ndr_push_spoolss_AddDriverInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_AddDriverInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -12895,6 +12886,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in
ndr->flags = _flags_save_string;
}
{
+ uint32_t _flags_save_string_array = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dependent_files));
+ ndr->flags = _flags_save_string_array;
+ }
+ {
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name));
@@ -12909,12 +12906,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in
{
uint32_t _flags_save_string_array = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dependent_files));
- ndr->flags = _flags_save_string_array;
- }
- {
- uint32_t _flags_save_string_array = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
NDR_CHECK(ndr_push_relative_ptr1(ndr, r->previous_names));
ndr->flags = _flags_save_string_array;
}
@@ -13035,6 +13026,15 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in
ndr->flags = _flags_save_string;
}
{
+ uint32_t _flags_save_string_array = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+ if (r->dependent_files) {
+ NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dependent_files));
+ NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files));
+ }
+ ndr->flags = _flags_save_string_array;
+ }
+ {
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
if (r->monitor_name) {
@@ -13055,15 +13055,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in
{
uint32_t _flags_save_string_array = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- if (r->dependent_files) {
- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dependent_files));
- NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files));
- }
- ndr->flags = _flags_save_string_array;
- }
- {
- uint32_t _flags_save_string_array = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
if (r->previous_names) {
NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous_names));
NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names));
@@ -13169,12 +13160,12 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in
TALLOC_CTX *_mem_save_config_file_0;
uint32_t _ptr_help_file;
TALLOC_CTX *_mem_save_help_file_0;
+ uint32_t _ptr_dependent_files;
+ TALLOC_CTX *_mem_save_dependent_files_0;
uint32_t _ptr_monitor_name;
TALLOC_CTX *_mem_save_monitor_name_0;
uint32_t _ptr_default_datatype;
TALLOC_CTX *_mem_save_default_datatype_0;
- uint32_t _ptr_dependent_files;
- TALLOC_CTX *_mem_save_dependent_files_0;
uint32_t _ptr_previous_names;
TALLOC_CTX *_mem_save_previous_names_0;
uint32_t _ptr_manufacturer_name;
@@ -13271,6 +13262,18 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in
ndr->flags = _flags_save_string;
}
{
+ uint32_t _flags_save_string_array = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dependent_files));
+ if (_ptr_dependent_files) {
+ NDR_PULL_ALLOC(ndr, r->dependent_files);
+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->dependent_files, _ptr_dependent_files));
+ } else {
+ r->dependent_files = NULL;
+ }
+ ndr->flags = _flags_save_string_array;
+ }
+ {
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name));
@@ -13297,18 +13300,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in
{
uint32_t _flags_save_string_array = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dependent_files));
- if (_ptr_dependent_files) {
- NDR_PULL_ALLOC(ndr, r->dependent_files);
- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->dependent_files, _ptr_dependent_files));
- } else {
- r->dependent_files = NULL;
- }
- ndr->flags = _flags_save_string_array;
- }
- {
- uint32_t _flags_save_string_array = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_previous_names));
if (_ptr_previous_names) {
NDR_PULL_ALLOC(ndr, r->previous_names);
@@ -13525,6 +13516,21 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in
ndr->flags = _flags_save_string;
}
{
+ uint32_t _flags_save_string_array = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+ if (r->dependent_files) {
+ uint32_t _relative_save_offset;
+ _relative_save_offset = ndr->offset;
+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->dependent_files));
+ _mem_save_dependent_files_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->dependent_files, 0);
+ NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->dependent_files));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dependent_files_0, 0);
+ ndr->offset = _relative_save_offset;
+ }
+ ndr->flags = _flags_save_string_array;
+ }
+ {
uint32_t _flags_save_string = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
if (r->monitor_name) {
@@ -13557,21 +13563,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in
{
uint32_t _flags_save_string_array = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
- if (r->dependent_files) {
- uint32_t _relative_save_offset;
- _relative_save_offset = ndr->offset;
- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->dependent_files));
- _mem_save_dependent_files_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->dependent_files, 0);
- NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->dependent_files));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dependent_files_0, 0);
- ndr->offset = _relative_save_offset;
- }
- ndr->flags = _flags_save_string_array;
- }
- {
- uint32_t _flags_save_string_array = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
if (r->previous_names) {
uint32_t _relative_save_offset;
_relative_save_offset = ndr->offset;
@@ -13764,6 +13755,12 @@ _PUBLIC_ void ndr_print_spoolss_DriverInfo8(struct ndr_print *ndr, const char *n
ndr_print_string(ndr, "help_file", r->help_file);
}
ndr->depth--;
+ ndr_print_ptr(ndr, "dependent_files", r->dependent_files);
+ ndr->depth++;
+ if (r->dependent_files) {
+ ndr_print_string_array(ndr, "dependent_files", r->dependent_files);
+ }
+ ndr->depth--;
ndr_print_ptr(ndr, "monitor_name", r->monitor_name);
ndr->depth++;
if (r->monitor_name) {
@@ -13776,12 +13773,6 @@ _PUBLIC_ void ndr_print_spoolss_DriverInfo8(struct ndr_print *ndr, const char *n
ndr_print_string(ndr, "default_datatype", r->default_datatype);
}
ndr->depth--;
- ndr_print_ptr(ndr, "dependent_files", r->dependent_files);
- ndr->depth++;
- if (r->dependent_files) {
- ndr_print_string_array(ndr, "dependent_files", r->dependent_files);
- }
- ndr->depth--;
ndr_print_ptr(ndr, "previous_names", r->previous_names);
ndr->depth++;
if (r->previous_names) {
@@ -15373,11 +15364,6 @@ _PUBLIC_ void ndr_print_spoolss_PrinterData(struct ndr_print *ndr, const char *n
}
}
-_PUBLIC_ size_t ndr_size_spoolss_PrinterData(const union spoolss_PrinterData *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
-{
- return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData, ic);
-}
-
static enum ndr_err_code ndr_push_spoolss_FormFlags(struct ndr_push *ndr, int ndr_flags, enum spoolss_FormFlags r)
{
NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
@@ -15630,7 +15616,8 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_relative_ptr1(ndr, r->display_name));
ndr->flags = _flags_save_string;
}
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->lang_id));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lang_id));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unused));
NDR_CHECK(ndr_push_trailer_align(ndr, 5));
}
if (ndr_flags & NDR_BUFFERS) {
@@ -15739,7 +15726,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int
}
ndr->flags = _flags_save_string;
}
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->lang_id));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lang_id));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unused));
NDR_CHECK(ndr_pull_trailer_align(ndr, 5));
}
if (ndr_flags & NDR_BUFFERS) {
@@ -15840,7 +15828,8 @@ _PUBLIC_ void ndr_print_spoolss_FormInfo2(struct ndr_print *ndr, const char *nam
ndr_print_string(ndr, "display_name", r->display_name);
}
ndr->depth--;
- ndr_print_uint32(ndr, "lang_id", r->lang_id);
+ ndr_print_uint16(ndr, "lang_id", r->lang_id);
+ ndr_print_uint16(ndr, "unused", r->unused);
ndr->depth--;
}
@@ -19199,6 +19188,105 @@ _PUBLIC_ size_t ndr_size_spoolss_PrinterEnumValues(const struct spoolss_PrinterE
return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterEnumValues, ic);
}
+static enum ndr_err_code ndr_push_spoolss_KeyNames(struct ndr_push *ndr, int ndr_flags, const union spoolss_KeyNames *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ int level = ndr_push_get_switch_value(ndr, r);
+ NDR_CHECK(ndr_push_union_align(ndr, 4));
+ switch (level) {
+ case 0: {
+ break; }
+
+ case 1: {
+ break; }
+
+ default: {
+ {
+ uint32_t _flags_save_string_array = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+ NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->string_array));
+ ndr->flags = _flags_save_string_array;
+ }
+ break; }
+
+ }
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ int level = ndr_push_get_switch_value(ndr, r);
+ switch (level) {
+ case 0:
+ break;
+
+ case 1:
+ break;
+
+ default:
+ break;
+
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_KeyNames(struct ndr_pull *ndr, int ndr_flags, union spoolss_KeyNames *r)
+{
+ int level;
+ level = ndr_pull_get_switch_value(ndr, r);
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_union_align(ndr, 4));
+ switch (level) {
+ case 0: {
+ break; }
+
+ case 1: {
+ break; }
+
+ default: {
+ {
+ uint32_t _flags_save_string_array = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+ NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->string_array));
+ ndr->flags = _flags_save_string_array;
+ }
+ break; }
+
+ }
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ switch (level) {
+ case 0:
+ break;
+
+ case 1:
+ break;
+
+ default:
+ break;
+
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_KeyNames(struct ndr_print *ndr, const char *name, const union spoolss_KeyNames *r)
+{
+ int level;
+ level = ndr_print_get_switch_value(ndr, r);
+ ndr_print_union(ndr, name, level, "spoolss_KeyNames");
+ switch (level) {
+ case 0:
+ break;
+
+ case 1:
+ break;
+
+ default:
+ ndr_print_string_array(ndr, "string_array", r->string_array);
+ break;
+
+ }
+}
+
_PUBLIC_ enum ndr_err_code ndr_push_spoolss_DeleteDriverFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
@@ -27725,10 +27813,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_EnumPrinterKey(struct ndr_push *ndr,
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
}
if (flags & NDR_OUT) {
+ if (r->out._ndr_size == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out._ndr_size));
if (r->out.key_buffer == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_spoolss_StringArray2(ndr, NDR_SCALARS, r->out.key_buffer));
+ {
+ struct ndr_push *_ndr_key_buffer;
+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_key_buffer, 0, *r->out._ndr_size * 2));
+ NDR_CHECK(ndr_push_set_switch_value(_ndr_key_buffer, r->out.key_buffer, *r->out._ndr_size));
+ NDR_CHECK(ndr_push_spoolss_KeyNames(_ndr_key_buffer, NDR_SCALARS|NDR_BUFFERS, r->out.key_buffer));
+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_key_buffer, 0, *r->out._ndr_size * 2));
+ }
if (r->out.needed == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
@@ -27741,6 +27839,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_EnumPrinterKey(struct ndr_push *ndr,
_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_EnumPrinterKey(struct ndr_pull *ndr, int flags, struct spoolss_EnumPrinterKey *r)
{
TALLOC_CTX *_mem_save_handle_0;
+ TALLOC_CTX *_mem_save__ndr_size_0;
TALLOC_CTX *_mem_save_key_buffer_0;
TALLOC_CTX *_mem_save_needed_0;
if (flags & NDR_IN) {
@@ -27761,6 +27860,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_EnumPrinterKey(struct ndr_pull *ndr,
NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.key_name), sizeof(uint16_t)));
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.key_name, ndr_get_array_length(ndr, &r->in.key_name), sizeof(uint16_t), CH_UTF16));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offered));
+ NDR_PULL_ALLOC(ndr, r->out._ndr_size);
+ ZERO_STRUCTP(r->out._ndr_size);
NDR_PULL_ALLOC(ndr, r->out.key_buffer);
ZERO_STRUCTP(r->out.key_buffer);
NDR_PULL_ALLOC(ndr, r->out.needed);
@@ -27768,11 +27869,24 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_EnumPrinterKey(struct ndr_pull *ndr,
}
if (flags & NDR_OUT) {
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->out._ndr_size);
+ }
+ _mem_save__ndr_size_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out._ndr_size, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out._ndr_size));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save__ndr_size_0, LIBNDR_FLAG_REF_ALLOC);
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.key_buffer);
}
_mem_save_key_buffer_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.key_buffer, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_spoolss_StringArray2(ndr, NDR_SCALARS, r->out.key_buffer));
+ {
+ struct ndr_pull *_ndr_key_buffer;
+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_key_buffer, 0, *r->out._ndr_size * 2));
+ NDR_CHECK(ndr_pull_set_switch_value(_ndr_key_buffer, r->out.key_buffer, *r->out._ndr_size));
+ NDR_CHECK(ndr_pull_spoolss_KeyNames(_ndr_key_buffer, NDR_SCALARS|NDR_BUFFERS, r->out.key_buffer));
+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_key_buffer, 0, *r->out._ndr_size * 2));
+ }
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_key_buffer_0, LIBNDR_FLAG_REF_ALLOC);
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.needed);
@@ -27807,9 +27921,14 @@ _PUBLIC_ void ndr_print_spoolss_EnumPrinterKey(struct ndr_print *ndr, const char
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "spoolss_EnumPrinterKey");
ndr->depth++;
+ ndr_print_ptr(ndr, "_ndr_size", r->out._ndr_size);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "_ndr_size", *r->out._ndr_size);
+ ndr->depth--;
ndr_print_ptr(ndr, "key_buffer", r->out.key_buffer);
ndr->depth++;
- ndr_print_spoolss_StringArray2(ndr, "key_buffer", r->out.key_buffer);
+ ndr_print_set_switch_value(ndr, r->out.key_buffer, *r->out._ndr_size);
+ ndr_print_spoolss_KeyNames(ndr, "key_buffer", r->out.key_buffer);
ndr->depth--;
--
Samba Shared Repository
More information about the samba-cvs
mailing list