The branch, v3-5-stable has been updated via 2b0f402... WHATSNEW: Update changes since 3.5.0pre1. via 5511fd4... s3: Allow up to 20480 entries in LookupSids, as mandated by the official IDL via ebe81ca... spoolss: fix spoolss_PrinterData size calculation. via c760b75... spoolss: trivial fix for spoolss_FormInfo2 IDL. via 581982d... s4-smbtorture: check whether a returned buffer size is a multiple of 4 in RPC-SPOOLSS. via 78c80fe... s3-selftest: enable RPC-SAMBA3-WINREG. via 3a29aab... s3-rpcclient: allow to set offered size for enumkey command. via 22f30db... s4-smbtorture: add more spoolss_EnumPrinterKey tests for local NDR test. via f33b191... spoolss: remove unused spoolss_StringArray2. via e5d0a0b... s4-smbtorture: fix and extend enum printerkey test. via 60d8b62... s3-spoolss: fix enumprinter key client and server. via aec9d64... s3: re-run make samba3-idl. via 6a5ffe8... spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey. via b4fc954... spoolss: add spoolss_KeyNames union. via 93fb4f1... s4-smbtorture: enhance spoolss_EnumPrinterKey torture test. via 371c423... s3-spoolss: use SPOOLSS_ARCHITECTURE_ALL in driver enum server code. via 47ac175... spoolss: add more spoolss architectures to IDL. via cacdb92... spoolss: fix spoolss_DriverInfo8 IDL. via 7053b13... s4-smbtorture: make level 8 the reference for PrinterDriverEnum test. via 9982340... s3-spoolss: cleanup _spoolss_EnumPrinterDrivers(). via ee88c71... s3-spoolss: remove unused architecture from fill_printer_driver_info1(). via 5b8753b... s3-spoolss: remove ridiculous amount of duplicate driver code. via b979e0b... s3-spoolss: fully support level 8 drivers. via 82fbd83... s3-spoolss: use driver level info8 everywhere in spoolss server internally. via d5efd83... s4-smbtorture: fill in COMPARE_STRING_ARRAY macro in spoolss driver test. from ec1e4fb... s3:docs: Fix 'make manpages3'.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log ----------------------------------------------------------------- commit 2b0f402f113bd51ce8bdae6062af0533d3b44b49 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Dec 15 08:26:11 2009 +0100 WHATSNEW: Update changes since 3.5.0pre1. Karolin (cherry picked from commit c289e6e3f0a1faf1dcd39d1af7825335af8a89ca) commit 5511fd4193f75d0a911f86fe859af9eb9df2310d Author: Volker Lendecke <v...@samba.org> Date: Mon Dec 14 16:48:38 2009 +0100 s3: Allow up to 20480 entries in LookupSids, as mandated by the official IDL Seen in the wild by putting >1000 users into BUILTIN\Users (cherry picked from commit 477edb8bdf3def827c398c4fc01dffd2071ea77e) commit ebe81ca6f19ec10173cdd4d867e9ca3440d47fd7 Author: Günther Deschner <g...@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) (cherry picked from commit 4520862918ba2cff025b15d84922fbb08d8abbf6) commit c760b755f637d0b91f8758c963de903133d847f5 Author: Günther Deschner <g...@samba.org> Date: Sat Dec 12 02:51:44 2009 +0100 spoolss: trivial fix for spoolss_FormInfo2 IDL. Guenther (cherry picked from commit 5ae61cfbc281f346fd3712a975c5796f9cfbc6c2) (cherry picked from commit 43ff4f2628882f9fa51bbe37f6cbe776f62241a3) commit 581982da3bcfb0533f28f0e667df47528250e61e Author: Günther Deschner <g...@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) (cherry picked from commit 73da0de2eaa2dec3ef1ebeee9dccaf81201dc7ba) commit 78c80fe6633f9f8c56c634902dfd05607a0dcfb7 Author: Günther Deschner <g...@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) (cherry picked from commit 4e218472de4c5a2b79fd6c8115e8877d253c33b5) commit 3a29aab1e0db7f4f352a2204c11890a986c38dce Author: Günther Deschner <g...@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) (cherry picked from commit ee7944ed987bd0e4dc1315ffcac09fd2fd37bfe9) commit 22f30db8d006ccb0610ce0a4473d9266bfaf1080 Author: Günther Deschner <g...@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) (cherry picked from commit 2f49b911249b71c5aa68d14203e322c750acaef2) commit f33b191f6545c47a55fa2f36855cefd79c1a20d8 Author: Günther Deschner <g...@samba.org> Date: Thu Dec 10 14:23:49 2009 +0100 spoolss: remove unused spoolss_StringArray2. Guenther (cherry picked from commit 835e7d6c98406725dc9dab891d3025b9a11b7eb9) (cherry picked from commit 3db86bea7b4f6168b482a3f243500ffe9a3fc35a) commit e5d0a0b5ee99504b9123afddce1e9666a0e91b1a Author: Günther Deschner <g...@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) (cherry picked from commit c3943161f7dd5d0c42b50f7689a2032652dc8ff6) commit 60d8b62d9c825d2b69d52242f9079648982b99da Author: Günther Deschner <g...@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) (cherry picked from commit fc1dd12c4ac9eb2994023c4e748c12b0b41e5841) commit aec9d6450bea145d5e181071d586f8a5653325b0 Author: Günther Deschner <g...@samba.org> Date: Thu Dec 10 14:27:33 2009 +0100 s3: re-run make samba3-idl. Guenther (cherry picked from commit fa413d167bc3ea9aff3dcff97152ef07a1173939) (cherry picked from commit 537e06a33e130bb8f638fe76f7c80668d801ec25) commit 6a5ffe8d6a899eb3385a80fe5e7c3c0bcd1c2305 Author: Günther Deschner <g...@samba.org> Date: Thu Dec 10 14:19:28 2009 +0100 spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey. Guenther (cherry picked from commit 0ecb7f6ab28d7b7c1844554289f5ae8e876b1dcf) (cherry picked from commit 081456f03789f1f5e10bf1361fe5d5fa776c8fa4) commit b4fc9543154839134041b23fe71541921f3b78c3 Author: Günther Deschner <g...@samba.org> Date: Thu Dec 10 14:18:46 2009 +0100 spoolss: add spoolss_KeyNames union. Guenther (cherry picked from commit cf2561473f7bd0bcef5c562c1e901d4ad17e6ee3) (cherry picked from commit 0668b8bd9c37de6df1d2af05b04ea2da441c8b20) commit 93fb4f1dd31b978af8945da2cbc36d26e0b4db2a Author: Günther Deschner <g...@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) (cherry picked from commit d9a3bc084dafa7616c617fcaae5ed78fd27c3521) commit 371c4239a9b0a0ebc07c419781cbd6ea6d2a1f25 Author: Günther Deschner <g...@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) (cherry picked from commit 085f4137fbbceb8297dadcea6cf17cc73553cf00) commit 47ac1754a3391b4661579fbb6eecb309d9112d40 Author: Günther Deschner <g...@samba.org> Date: Wed Dec 2 00:59:21 2009 +0100 spoolss: add more spoolss architectures to IDL. Guenther (cherry picked from commit fb3b0987f7f9d7026701ab8b3034ff6084ae2143) (cherry picked from commit df1b90465c7b78c6d85cc59d087d21fd76880ad8) commit cacdb92184f7cc3ec99d28be216fc41f344289e8 Author: Günther Deschner <g...@samba.org> Date: Mon Dec 7 18:55:08 2009 +0100 spoolss: fix spoolss_DriverInfo8 IDL. found by RPC-SPOOLSS torture teset. Guenther (cherry picked from commit efdd60fd9d0b36f924ef467040a1c5e1de5e68c2) commit 7053b138a4f1620e54de4ba46580e27d4b0f1253 Author: Günther Deschner <g...@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) (cherry picked from commit c65e5dec09c14454b6d5ae22bb8aa21c414e36d7) commit 9982340d141c74727f1c75c16c7b71dad2827b94 Author: Günther Deschner <g...@samba.org> Date: Mon Dec 7 16:19:26 2009 +0100 s3-spoolss: cleanup _spoolss_EnumPrinterDrivers(). Guenther (cherry picked from commit 7770d1492bad12e778f9f4e0503dcf00983b2bb1) (cherry picked from commit 9524600b322b271dcf23c2caa3996d7c2cb29824) commit ee88c7171ada417a42878e88de6ee8a8dcf6ac63 Author: Günther Deschner <g...@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) (cherry picked from commit 3dbb7c7c2b8be45f55431fde0999d2bef312d60a) commit 5b8753b2de63fc85650dfb19b827028ca95e3df9 Author: Günther Deschner <g...@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) (cherry picked from commit c466ca9ad382bbc0e5617e3e3de9143620c9e7ff) commit b979e0befc55cba2e91321afc92354b29fbed646 Author: Günther Deschner <g...@samba.org> Date: Thu Dec 3 19:11:53 2009 +0100 s3-spoolss: fully support level 8 drivers. Guenther (cherry picked from commit 1c9eba40ae8b329182fc3c4f073d1f18b8bad986) (cherry picked from commit 0263b52bee6bdc038b6440c3883bfd6aaac76409) commit 82fbd8315be61437810dcafa8bcba62c09e65d2a Author: Günther Deschner <g...@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) (cherry picked from commit 222f0bc0c233f33ae0d4dbdc5e4937c20cb47eaf) commit d5efd83325d0c0f9ca5efcc2b40dd712851c73aa Author: Günther Deschner <g...@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) (cherry picked from commit 52361a5c66773e2032b5b9a67b5c3d47ea0c3430) ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 6 + librpc/gen_ndr/cli_spoolss.c | 9 +- librpc/gen_ndr/cli_spoolss.h | 6 +- librpc/gen_ndr/lsa.h | 4 +- librpc/gen_ndr/ndr_lsa.c | 4 +- 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/lsa.idl | 4 +- 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 +- 25 files changed, 995 insertions(+), 817 deletions(-) create mode 100644 source4/torture/ndr/README Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 9a18f60..d165113 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -66,6 +66,7 @@ smb.conf changes ctdb timeout New 0 cups encrypt New no debug hires timestamp Changed Default yes + ldap deref New auto ldap follow referral New auto @@ -125,6 +126,10 @@ o Günther Deschner <g...@samba.org> * Fix several printing issues. * Fix the build on Mac OS X 10.6.2. * Fix net and rpcclient after setprinterdataex changes. + * Add full support for level 8 printer drivers. + * Add more spoolss architectures to IDL. + * Fix enumprinter key client and server. + * Fix crash in EnumPrinterDataEx. o Björn Jacke <b...@sernet.de> @@ -145,6 +150,7 @@ o Volker Lendecke <v...@samba.org> * Add rpcclient wkssvc_enumerateusers. * De-deprecate "write cache size" to prevent its removal without a proper alternative. + * Allow more than 1000 users in BUILTIN\Users. o Jim McDonough <j...@samba.org> 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/lsa.h b/librpc/gen_ndr/lsa.h index a0af571..4a4a95d 100644 --- a/librpc/gen_ndr/lsa.h +++ b/librpc/gen_ndr/lsa.h @@ -312,7 +312,7 @@ struct lsa_SidPtr { }; struct lsa_SidArray { - uint32_t num_sids;/* [range(0,1000)] */ + uint32_t num_sids;/* [range(0,20480)] */ struct lsa_SidPtr *sids;/* [unique,size_is(num_sids)] */ }/* [public] */; @@ -397,7 +397,7 @@ struct lsa_TranslatedName { }; struct lsa_TransNameArray { - uint32_t count;/* [range(0,1000)] */ + uint32_t count;/* [range(0,20480)] */ struct lsa_TranslatedName *names;/* [unique,size_is(count)] */ }; diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c index 6050714..f1b87ec 100644 --- a/librpc/gen_ndr/ndr_lsa.c +++ b/librpc/gen_ndr/ndr_lsa.c @@ -1945,7 +1945,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_SidArray(struct ndr_pull *ndr, int ndr_f if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 5)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_sids)); - if (r->num_sids > 1000) { + if (r->num_sids > 20480) { return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range"); } NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids)); @@ -2444,7 +2444,7 @@ static enum ndr_err_code ndr_pull_lsa_TransNameArray(struct ndr_pull *ndr, int n if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 5)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count)); - if (r->count > 1000) { + if (r->count > 20480) { return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range"); } NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names)); 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) { -- Samba Shared Repository