[SCM] Samba Shared Repository - branch v3-5-test updated
Karolin Seeger
kseeger at samba.org
Thu Mar 11 02:30:55 MST 2010
The branch, v3-5-test has been updated
via a7bb145... s4-smbtorture: add --option=torture:spoolss_check_size=yes.
via 4be0bf1... s4-smbtorture: fix smbtorture after GetPrinterData{Ex} after IDL changes.
via 71a9d14... s4-smbtorture: fix RPC-SPOOLSS-WIN after PrinterData IDL changes.
via 1fef62b... s4-spoolss: fix dcesrv_spoolss_GetPrinterData build.
via ae74c1c... s4-spoolss: fix spoolss_GetPrinterData implementation after IDL change.
via ffbc521... s3: re-run make samba3-idl.
via 6c01c81... s3-libads: fix get_remote_printer_publishing_data after spoolss_EnumPrinterDataEx IDL change.
via e1527e2... s3-spoolss: fix _spoolss_EnumPrinterDataEx after idl
via 55511d7... s3-rpcclient: fix rpcclient after spoolss_EnumPrinterDataEx IDL change.
via 35b5b6f... s3-net: fix net after spoolss_EnumPrinterDataEx IDL change.
via c04c030... spoolss: fix spoolss_EnumPrinterDataEx IDL.
via 6b331e7... s3-rpcclient: fix rpcclient after spoolss_GetPrinterData{Ex} IDL change.
via 1336711... s3-spoolss: fix _spoolss_GetPrinterDataEx after IDL change.
via 20a9f02... spoolss: rollback GetPrinterData[Ex] IDL.
via 9d4b836... s3-rpcclient: fix rpcclient after spoolss_SetPrinterData{Ex} IDL change.
via cbc766e... s3-net: fix net after spoolss_SetPrinterData{Ex} IDL change.
via c98e6bf... s3-spoolss: fix _spoolss_SetPrinterData{Ex} after IDL change.
via 1aa1031... spoolss: rollback SetPrinterData{Ex} IDL.
from 8f30cb3... Fix bug #7234 - Symlink delete fails but incorrectly reports success to client.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit a7bb1455a12084ce7400507bc6351f7dead14c0a
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 19 14:25:19 2010 +0100
s4-smbtorture: add --option=torture:spoolss_check_size=yes.
This disables the size calculation comparison by default.
Guenther
(cherry picked from commit f2ecec3dcdafd63cd72d13019a998bf99539a9ba)
The last 18 patches address bug #6727 (Printer issues on 3.4.x).
commit 4be0bf13f019543c5cc0afc7b4bf074f23421f9c
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 22:40:31 2010 +0100
s4-smbtorture: fix smbtorture after GetPrinterData{Ex} after IDL changes.
Guenther
commit 71a9d145d365d09588ecea1ad8a53535c3638b4f
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 5 20:32:16 2010 +0100
s4-smbtorture: fix RPC-SPOOLSS-WIN after PrinterData IDL changes.
Guenther
(cherry picked from commit 58c9070746a3e0725f5d3a3ce6deda8fad0c5974)
commit 1fef62b5b8688984e00c4271d08d08aff9c27dd2
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 5 16:34:17 2010 +0100
s4-spoolss: fix dcesrv_spoolss_GetPrinterData build.
really not my day today...
Guenther
(cherry picked from commit 91ff11d50458a951ab0adc9b37bcb0ef4ee09e15)
commit ae74c1cf66ca463026a3cb68aa040c9df18a87b8
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 18:21:50 2010 +0100
s4-spoolss: fix spoolss_GetPrinterData implementation after IDL change.
Guenther
commit ffbc52150d7e2101da05fafd7ce8ed16967db253
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 5 17:17:49 2010 +0100
s3: re-run make samba3-idl.
Guenther
commit 6c01c8108b6d196415d056e185458a1bf0be592d
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 17:58:49 2010 +0100
s3-libads: fix get_remote_printer_publishing_data after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit 8e6dd25391d77b69859a3b622a1b116fa8000a40)
commit e1527e2c4ed276b3821c1d8157ef0cb512ce5c64
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:47:33 2010 +0100
s3-spoolss: fix _spoolss_EnumPrinterDataEx after idl
Guenther
(cherry picked from commit 55326549852a3ab1114a8cb1536578ae02183eb8)
commit 55511d7553b5163f56f1736d8a549b454cd5c460
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:47:10 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit becbb624eb90b84ff20b128de1aee5f5acfc3dbc)
commit 35b5b6f214efde97ae0412676ef0ea47501a780d
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:46:53 2010 +0100
s3-net: fix net after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit a99ac4f236d9a93d4ca8bd874cbab89b155c644a)
commit c04c030553cdec1f8490b844632e2f2c08467de2
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:40:31 2010 +0100
spoolss: fix spoolss_EnumPrinterDataEx IDL.
Guenther
(cherry picked from commit 4df1047e8398a9af4df94c7e245d993d1f60ef5f)
commit 6b331e7414c80f8f2bbe4c27b07af9ac27230101
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:46:28 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_GetPrinterData{Ex} IDL change.
Guenther
(cherry picked from commit 7643afa70e879efc059c75b8309bf89dbb3c459b)
commit 133671120889aa97102c2a056e3c5f54aba739f8
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:39:59 2010 +0100
s3-spoolss: fix _spoolss_GetPrinterDataEx after IDL change.
Guenther
(cherry picked from commit fbb6d00eed6bca960aa53a5967a2dea426cacfe2)
commit 20a9f029f10346bed2beb999979b06801b7b1c9e
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:38:18 2010 +0100
spoolss: rollback GetPrinterData[Ex] IDL.
Guenther
(cherry picked from commit 0e779b573bf5c27bf08ceefa09a7e2b07691f948)
commit 9d4b8360e208d06a739f34e40c206c9dbe7857ba
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:34:49 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_SetPrinterData{Ex} IDL change.
Guenther
(cherry picked from commit 4956650369156dfff96ccc827e55697ec642240d)
commit cbc766eb1fff67ba01cf57e1da215299c5927d0b
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:34:22 2010 +0100
s3-net: fix net after spoolss_SetPrinterData{Ex} IDL change.
Guenther
(cherry picked from commit 37ca9288d2631b48a8eb50c01d6c0cc462d8ee31)
commit c98e6bf312741ab410afb177ba74d809b1101bcc
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 17:00:34 2010 +0100
s3-spoolss: fix _spoolss_SetPrinterData{Ex} after IDL change.
Guenther
(cherry picked from commit 9a934832797c3e72859770719e05d19a5eefa14d)
commit 1aa10318d0c72ff07284d840e7d381d0f6aff727
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 3 18:22:57 2010 +0100
spoolss: rollback SetPrinterData{Ex} IDL.
Guenther
(cherry picked from commit 0528515be44c40603827bb153ff0e2bac7b0f041)
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/cli_spoolss.c | 48 ++--
librpc/gen_ndr/cli_spoolss.h | 32 ++--
librpc/gen_ndr/ndr_spoolss.c | 305 ++++++++++-----------------
librpc/gen_ndr/ndr_spoolss.h | 30 ---
librpc/gen_ndr/spoolss.h | 130 +-----------
librpc/gen_ndr/srv_spoolss.c | 8 +-
librpc/idl/spoolss.idl | 72 +------
librpc/ndr/ndr_spoolss_buf.c | 287 -------------------------
librpc/ndr/ndr_spoolss_buf.h | 6 -
source3/include/proto.h | 3 +-
source3/libads/ldap_printer.c | 40 ++---
source3/rpc_client/cli_spoolss.c | 16 ++-
source3/rpc_server/srv_spoolss_nt.c | 64 +++---
source3/rpcclient/cmd_spoolss.c | 61 ++++--
source3/utils/net_rpc_printer.c | 41 +---
source4/ntptr/simple_ldb/ntptr_simple_ldb.c | 122 +++++++----
source4/rpc_server/spoolss/dcesrv_spoolss.c | 3 +-
source4/torture/rpc/spoolss.c | 107 ++++++----
source4/torture/rpc/spoolss_win.c | 7 +-
19 files changed, 439 insertions(+), 943 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index c6bb8ed..c674f94 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -4152,9 +4152,9 @@ struct tevent_req *rpccli_spoolss_GetPrinterData_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client *cli,
struct policy_handle *_handle /* [in] [ref] */,
const char *_value_name /* [in] [charset(UTF16)] */,
- uint32_t _offered /* [in] */,
enum winreg_Type *_type /* [out] [ref] */,
- union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *_data /* [out] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */,
uint32_t *_needed /* [out] [ref] */)
{
struct tevent_req *req;
@@ -4226,7 +4226,7 @@ static void rpccli_spoolss_GetPrinterData_done(struct tevent_req *subreq)
/* Copy out parameters */
*state->orig.out.type = *state->tmp.out.type;
- *state->orig.out.data = *state->tmp.out.data;
+ memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.offered) * sizeof(*state->orig.out.data));
*state->orig.out.needed = *state->tmp.out.needed;
/* Copy result */
@@ -4265,9 +4265,9 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
- uint32_t offered /* [in] */,
enum winreg_Type *type /* [out] [ref] */,
- union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
{
@@ -4295,7 +4295,7 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
/* Return variables */
*type = *r.out.type;
- *data = *r.out.data;
+ memcpy(data, r.out.data, (r.in.offered) * sizeof(*data));
*needed = *r.out.needed;
/* Return result */
@@ -4321,8 +4321,8 @@ struct tevent_req *rpccli_spoolss_SetPrinterData_send(TALLOC_CTX *mem_ctx,
struct policy_handle *_handle /* [in] [ref] */,
const char *_value_name /* [in] [charset(UTF16)] */,
enum winreg_Type _type /* [in] */,
- union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */)
+ uint8_t *_data /* [in] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */)
{
struct tevent_req *req;
struct rpccli_spoolss_SetPrinterData_state *state;
@@ -4341,7 +4341,7 @@ struct tevent_req *rpccli_spoolss_SetPrinterData_send(TALLOC_CTX *mem_ctx,
state->orig.in.value_name = _value_name;
state->orig.in.type = _type;
state->orig.in.data = _data;
- state->orig.in._offered = __offered;
+ state->orig.in.offered = _offered;
/* Out parameters */
@@ -4423,8 +4423,8 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
WERROR *werror)
{
struct spoolss_SetPrinterData r;
@@ -4435,7 +4435,7 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
r.in.value_name = value_name;
r.in.type = type;
r.in.data = data;
- r.in._offered = _offered;
+ r.in.offered = offered;
status = cli->dispatch(cli,
mem_ctx,
@@ -11710,8 +11710,8 @@ struct tevent_req *rpccli_spoolss_SetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
const char *_key_name /* [in] [charset(UTF16)] */,
const char *_value_name /* [in] [charset(UTF16)] */,
enum winreg_Type _type /* [in] */,
- union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */)
+ uint8_t *_data /* [in] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */)
{
struct tevent_req *req;
struct rpccli_spoolss_SetPrinterDataEx_state *state;
@@ -11731,7 +11731,7 @@ struct tevent_req *rpccli_spoolss_SetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
state->orig.in.value_name = _value_name;
state->orig.in.type = _type;
state->orig.in.data = _data;
- state->orig.in._offered = __offered;
+ state->orig.in.offered = _offered;
/* Out parameters */
@@ -11814,8 +11814,8 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
WERROR *werror)
{
struct spoolss_SetPrinterDataEx r;
@@ -11827,7 +11827,7 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
r.in.value_name = value_name;
r.in.type = type;
r.in.data = data;
- r.in._offered = _offered;
+ r.in.offered = offered;
status = cli->dispatch(cli,
mem_ctx,
@@ -11868,9 +11868,9 @@ struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
struct policy_handle *_handle /* [in] [ref] */,
const char *_key_name /* [in] [charset(UTF16)] */,
const char *_value_name /* [in] [charset(UTF16)] */,
- uint32_t _offered /* [in] */,
enum winreg_Type *_type /* [out] [ref] */,
- union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *_data /* [out] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */,
uint32_t *_needed /* [out] [ref] */)
{
struct tevent_req *req;
@@ -11943,7 +11943,7 @@ static void rpccli_spoolss_GetPrinterDataEx_done(struct tevent_req *subreq)
/* Copy out parameters */
*state->orig.out.type = *state->tmp.out.type;
- *state->orig.out.data = *state->tmp.out.data;
+ memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.offered) * sizeof(*state->orig.out.data));
*state->orig.out.needed = *state->tmp.out.needed;
/* Copy result */
@@ -11983,9 +11983,9 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
- uint32_t offered /* [in] */,
enum winreg_Type *type /* [out] [ref] */,
- union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
{
@@ -12014,7 +12014,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
/* Return variables */
*type = *r.out.type;
- *data = *r.out.data;
+ memcpy(data, r.out.data, (r.in.offered) * sizeof(*data));
*needed = *r.out.needed;
/* Return result */
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index cae24be..f5e554d 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -478,9 +478,9 @@ struct tevent_req *rpccli_spoolss_GetPrinterData_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client *cli,
struct policy_handle *_handle /* [in] [ref] */,
const char *_value_name /* [in] [charset(UTF16)] */,
- uint32_t _offered /* [in] */,
enum winreg_Type *_type /* [out] [ref] */,
- union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *_data /* [out] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */,
uint32_t *_needed /* [out] [ref] */);
NTSTATUS rpccli_spoolss_GetPrinterData_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
@@ -489,9 +489,9 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
- uint32_t offered /* [in] */,
enum winreg_Type *type /* [out] [ref] */,
- union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror);
struct tevent_req *rpccli_spoolss_SetPrinterData_send(TALLOC_CTX *mem_ctx,
@@ -500,8 +500,8 @@ struct tevent_req *rpccli_spoolss_SetPrinterData_send(TALLOC_CTX *mem_ctx,
struct policy_handle *_handle /* [in] [ref] */,
const char *_value_name /* [in] [charset(UTF16)] */,
enum winreg_Type _type /* [in] */,
- union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */);
+ uint8_t *_data /* [in] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */);
NTSTATUS rpccli_spoolss_SetPrinterData_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
WERROR *result);
@@ -510,8 +510,8 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
WERROR *werror);
struct tevent_req *rpccli_spoolss_WaitForPrinterChange_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
@@ -1199,8 +1199,8 @@ struct tevent_req *rpccli_spoolss_SetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
const char *_key_name /* [in] [charset(UTF16)] */,
const char *_value_name /* [in] [charset(UTF16)] */,
enum winreg_Type _type /* [in] */,
- union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */);
+ uint8_t *_data /* [in] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */);
NTSTATUS rpccli_spoolss_SetPrinterDataEx_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
WERROR *result);
@@ -1210,8 +1210,8 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
WERROR *werror);
struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
@@ -1219,9 +1219,9 @@ struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
struct policy_handle *_handle /* [in] [ref] */,
const char *_key_name /* [in] [charset(UTF16)] */,
const char *_value_name /* [in] [charset(UTF16)] */,
- uint32_t _offered /* [in] */,
enum winreg_Type *_type /* [out] [ref] */,
- union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *_data /* [out] [ref,size_is(offered)] */,
+ uint32_t _offered /* [in] */,
uint32_t *_needed /* [out] [ref] */);
NTSTATUS rpccli_spoolss_GetPrinterDataEx_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
@@ -1231,9 +1231,9 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
- uint32_t offered /* [in] */,
enum winreg_Type *type /* [out] [ref] */,
- union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror);
struct tevent_req *rpccli_spoolss_EnumPrinterDataEx_send(TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index fe74901..af555d7 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -19532,8 +19532,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * strlen_m_term(r->value_name)));
NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->type));
- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_spoolss_PrinterData(r->data, r->type, ndr->iconv_convenience, ndr->flags)));
+ {
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data));
+ ndr->flags = _flags_save_DATA_BLOB;
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->data->length));
NDR_CHECK(ndr_push_trailer_align(ndr, 5));
}
if (ndr_flags & NDR_BUFFERS) {
@@ -19548,16 +19553,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n
}
ndr->flags = _flags_save_string;
}
- if (r->data) {
- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data));
- {
- struct ndr_push *_ndr_data;
- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, r->data_length));
- NDR_CHECK(ndr_push_set_switch_value(_ndr_data, r->data, r->type));
- NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, r->data));
- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data_length));
+ {
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+ if (r->data) {
+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data));
+ {
+ struct ndr_push *_ndr_data;
+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, r->data->length));
+ NDR_CHECK(ndr_push_DATA_BLOB(_ndr_data, NDR_SCALARS, *r->data));
+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data->length));
+ }
+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data));
}
- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data));
+ ndr->flags = _flags_save_DATA_BLOB;
}
}
ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
@@ -19588,12 +19597,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull *n
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->value_name_len));
NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->type));
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
- if (_ptr_data) {
- NDR_PULL_ALLOC(ndr, r->data);
- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->data, _ptr_data));
- } else {
- r->data = NULL;
+ {
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
+ if (_ptr_data) {
+ NDR_PULL_ALLOC(ndr, r->data);
+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->data, _ptr_data));
+ } else {
+ r->data = NULL;
+ }
+ ndr->flags = _flags_save_DATA_BLOB;
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->data_length));
NDR_CHECK(ndr_pull_trailer_align(ndr, 5));
@@ -19615,21 +19629,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull *n
}
ndr->flags = _flags_save_string;
}
- if (r->data) {
- uint32_t _relative_save_offset;
- _relative_save_offset = ndr->offset;
- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->data));
- _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->data, 0);
- {
- struct ndr_pull *_ndr_data;
- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 0, r->data_length));
- NDR_CHECK(ndr_pull_set_switch_value(_ndr_data, r->data, r->type));
- NDR_CHECK(ndr_pull_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, r->data));
- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 0, r->data_length));
+ {
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+ if (r->data) {
+ uint32_t _relative_save_offset;
+ _relative_save_offset = ndr->offset;
+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->data));
+ _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->data, 0);
+ {
+ struct ndr_pull *_ndr_data;
+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 0, r->data_length));
+ NDR_CHECK(ndr_pull_DATA_BLOB(_ndr_data, NDR_SCALARS, r->data));
+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 0, r->data_length));
+ }
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
+ ndr->offset = _relative_save_offset;
}
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
- ndr->offset = _relative_save_offset;
+ ndr->flags = _flags_save_DATA_BLOB;
}
}
ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
@@ -19651,11 +19669,10 @@ _PUBLIC_ void ndr_print_spoolss_PrinterEnumValues(struct ndr_print *ndr, const c
ndr_print_ptr(ndr, "data", r->data);
ndr->depth++;
if (r->data) {
- ndr_print_set_switch_value(ndr, r->data, r->type);
- ndr_print_spoolss_PrinterData(ndr, "data", r->data);
+ ndr_print_DATA_BLOB(ndr, "data", *r->data);
}
ndr->depth--;
- ndr_print_uint32(ndr, "data_length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_PrinterData(r->data, r->type, ndr->iconv_convenience, ndr->flags):r->data_length);
+ ndr_print_uint32(ndr, "data_length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->data->length:r->data_length);
ndr->depth--;
}
@@ -23405,7 +23422,7 @@ _PUBLIC_ void ndr_print_spoolss_ScheduleJob(struct ndr_print *ndr, const char *n
ndr->depth--;
}
-_PUBLIC_ enum ndr_err_code ndr_push__spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct _spoolss_GetPrinterData *r)
+static enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterData *r)
{
if (flags & NDR_IN) {
if (r->in.handle == NULL) {
@@ -23426,7 +23443,8 @@ _PUBLIC_ enum ndr_err_code ndr_push__spoolss_GetPrinterData(struct ndr_push *ndr
if (r->out.data == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, *r->out.data));
+ NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.offered));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, r->in.offered));
if (r->out.needed == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
@@ -23436,11 +23454,10 @@ _PUBLIC_ enum ndr_err_code ndr_push__spoolss_GetPrinterData(struct ndr_push *ndr
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_pull__spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct _spoolss_GetPrinterData *r)
+static enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterData *r)
{
TALLOC_CTX *_mem_save_handle_0;
TALLOC_CTX *_mem_save_type_0;
- TALLOC_CTX *_mem_save_data_0;
TALLOC_CTX *_mem_save_needed_0;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -23462,8 +23479,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull__spoolss_GetPrinterData(struct ndr_pull *ndr
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offered));
NDR_PULL_ALLOC(ndr, r->out.type);
ZERO_STRUCTP(r->out.type);
- NDR_PULL_ALLOC(ndr, r->out.data);
- ZERO_STRUCTP(r->out.data);
+ NDR_PULL_ALLOC_N(ndr, r->out.data, r->in.offered);
+ memset(r->out.data, 0, (r->in.offered) * sizeof(*r->out.data));
NDR_PULL_ALLOC(ndr, r->out.needed);
ZERO_STRUCTP(r->out.needed);
}
@@ -23475,13 +23492,11 @@ _PUBLIC_ enum ndr_err_code ndr_pull__spoolss_GetPrinterData(struct ndr_pull *ndr
NDR_PULL_SET_MEM_CTX(ndr, r->out.type, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, r->out.type));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_type_0, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->out.data));
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->out.data);
+ NDR_PULL_ALLOC_N(ndr, r->out.data, ndr_get_array_size(ndr, &r->out.data));
}
- _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.data, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, r->out.data));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->out.data, ndr_get_array_size(ndr, &r->out.data)));
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.needed);
}
@@ -23490,44 +23505,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull__spoolss_GetPrinterData(struct ndr_pull *ndr
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.needed));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_needed_0, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
- }
- return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push___spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct __spoolss_GetPrinterData *r)
-{
- if (flags & NDR_IN) {
- NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
- }
- if (flags & NDR_OUT) {
- if (r->out.data == NULL) {
- return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
- }
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.data, r->in.type));
- NDR_CHECK(ndr_push_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
- }
- return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull___spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct __spoolss_GetPrinterData *r)
-{
- TALLOC_CTX *_mem_save_data_0;
- if (flags & NDR_IN) {
- ZERO_STRUCT(r->out);
-
- NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
- NDR_PULL_ALLOC(ndr, r->out.data);
- ZERO_STRUCTP(r->out.data);
- }
- if (flags & NDR_OUT) {
- if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->out.data);
+ if (r->out.data) {
+ NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, r->in.offered));
}
- _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.data, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.data, r->in.type));
- NDR_CHECK(ndr_pull_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, LIBNDR_FLAG_REF_ALLOC);
}
return NDR_ERR_SUCCESS;
}
@@ -23559,8 +23539,7 @@ _PUBLIC_ void ndr_print_spoolss_GetPrinterData(struct ndr_print *ndr, const char
--
Samba Shared Repository
More information about the samba-cvs
mailing list