The branch, v3-4-test has been updated
via 7586069... s3: re-run make samba3-idl.
via beeb98c... s3-spoolss: let _spoolss_DeletePrinterData call into
_spoolss_DeletePrinterDataEx.
via 9d5aa98... s3-libads: fix get_remote_printer_publishing_data after
spoolss_EnumPrinterDataEx IDL change.
via e616807... s3-rpcclient: fix rpcclient after
spoolss_EnumPrinterDataEx IDL change.
via 9c75285... s3-net: fix net after spoolss_EnumPrinterDataEx IDL
change.
via 6e677a1... s3-spoolss: fix _spoolss_EnumPrinterDataEx after idl
via a947b5f... spoolss: fix spoolss_EnumPrinterDataEx IDL.
via 345eba7... s3-rpcclient: fix rpcclient after
spoolss_GetPrinterData{Ex} IDL change.
via 017c4ac... s3-spoolss: fix _spoolss_GetPrinterDataEx after IDL
change.
via 697e615... s3-spoolss: let _spoolss_GetPrinterData call into
_spoolss_GetPrinterDataEx.
via 45195a2... spoolss: rollback GetPrinterData{Ex} IDL.
via b2adbea... s3-net: fix net after spoolss_SetPrinterData{Ex} IDL
change.
via 7711fe5... s3-rpcclient: fix rpcclient after
spoolss_SetPrinterData{Ex} IDL change.
via 20cc464... s3-spoolss: fix _spoolss_SetPrinterData{Ex} after IDL
change.
via 6f9d646... s3-spoolss: let _spoolss_SetPrinterData call into
_spoolss_SetPrinterDataEx.
via 8c00f95... spoolss: rollback SetPrinterData{Ex} IDL.
from de89fcc... s3:build: Fix automatic building of vfs_tsmsm if gpfs
and dmapi are present.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 7586069115f9b385bba40c7c022a5b516463736f
Author: Günther Deschner <[email protected]>
Date: Tue Mar 9 14:08:57 2010 +0100
s3: re-run make samba3-idl.
Guenther
The last 16 patches address bug #6727 (Printer issues on 3.4.x).
commit beeb98c693cba71573b1ff7fc6b0349ea4eda8ca
Author: Günther Deschner <[email protected]>
Date: Mon Dec 7 11:28:56 2009 +0100
s3-spoolss: let _spoolss_DeletePrinterData call into
_spoolss_DeletePrinterDataEx.
Guenther
(cherry picked from commit ef9d6580efc55ee040458b7cd76ebdc2e1276e98)
commit 9d5aa986357983fb6a422c0990a3f134e44874d5
Author: Günther Deschner <[email protected]>
Date: Thu Mar 4 17:58:49 2010 +0100
s3-libads: fix get_remote_printer_publishing_data after
spoolss_EnumPrinterDataEx IDL change.
Guenther
commit e6168075943bf01af1bcf8c0b0ff50b4dc1de82d
Author: Günther Deschner <[email protected]>
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 9c752851bc7291edf05e364ef2f8f387a9984bfa
Author: Günther Deschner <[email protected]>
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 6e677a1242115f57b84eff254ed55af2651df771
Author: Günther Deschner <[email protected]>
Date: Thu Mar 4 16:47:33 2010 +0100
s3-spoolss: fix _spoolss_EnumPrinterDataEx after idl
Guenther
(cherry picked from commit 55326549852a3ab1114a8cb1536578ae02183eb8)
commit a947b5f827884c18f0f4535f7be7e7cd5b42ee9c
Author: Günther Deschner <[email protected]>
Date: Thu Mar 4 16:40:31 2010 +0100
spoolss: fix spoolss_EnumPrinterDataEx IDL.
Guenther
(cherry picked from commit 4df1047e8398a9af4df94c7e245d993d1f60ef5f)
commit 345eba78f7fc72f067cd3d95a7698081e09be85f
Author: Günther Deschner <[email protected]>
Date: Thu Mar 4 15:46:28 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_GetPrinterData{Ex} IDL change.
Guenther
commit 017c4ac6c1c2a19345d1f79acf8179a995f38cb5
Author: Günther Deschner <[email protected]>
Date: Thu Mar 4 15:39:59 2010 +0100
s3-spoolss: fix _spoolss_GetPrinterDataEx after IDL change.
Guenther
(cherry picked from commit fbb6d00eed6bca960aa53a5967a2dea426cacfe2)
commit 697e615843e83d097c5479858a324195450f6c87
Author: Günther Deschner <[email protected]>
Date: Sat Dec 5 00:52:28 2009 +0100
s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx.
Guenther
commit 45195a2689f59be434037274f616083fd8930ffa
Author: Günther Deschner <[email protected]>
Date: Tue Mar 9 13:20:10 2010 +0100
spoolss: rollback GetPrinterData{Ex} IDL.
Guenther
commit b2adbea53007d560f95c09af407c1c51a8e78d14
Author: Günther Deschner <[email protected]>
Date: Thu Mar 4 15:34:22 2010 +0100
s3-net: fix net after spoolss_SetPrinterData{Ex} IDL change.
Guenther
commit 7711fe5ca643b32a3873a94d21dc5ec9155ef940
Author: Günther Deschner <[email protected]>
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 20cc464b000beab223aea4b58ff974da9a943806
Author: Günther Deschner <[email protected]>
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 6f9d646f8071543287466a4a616246b32c80e2ca
Author: Günther Deschner <[email protected]>
Date: Sat Dec 5 00:56:55 2009 +0100
s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx.
Guenther
(cherry picked from commit 167dca0cbf18baf40dd923f6f92421123d34b5a3)
commit 8c00f95c8d86f2c3c73ce84d3cc0f038d8e0ceb2
Author: Günther Deschner <[email protected]>
Date: Tue Mar 9 13:01:13 2010 +0100
spoolss: rollback SetPrinterData{Ex} IDL.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/cli_spoolss.c | 20 +-
librpc/gen_ndr/cli_spoolss.h | 12 +-
librpc/gen_ndr/ndr_spoolss.c | 235 +++++++++++---------------
librpc/gen_ndr/ndr_spoolss.h | 15 --
librpc/gen_ndr/spoolss.h | 71 +-------
librpc/gen_ndr/srv_spoolss.c | 12 +-
librpc/idl/spoolss.idl | 45 ++----
librpc/ndr/ndr_spoolss_buf.c | 140 ---------------
librpc/ndr/ndr_spoolss_buf.h | 3 -
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 | 318 ++++++++++-------------------------
source3/rpcclient/cmd_spoolss.c | 64 +++++---
source3/utils/net_rpc_printer.c | 29 +---
15 files changed, 312 insertions(+), 711 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 10dd8b4..8820971 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -1301,9 +1301,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)
{
@@ -1339,7 +1339,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 */
@@ -1355,8 +1355,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;
@@ -1367,7 +1367,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;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(spoolss_SetPrinterData, &r);
@@ -3652,7 +3652,7 @@ 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] */,
- uint8_t *buffer /* [in]
[ref,size_is(offered)] */,
+ uint8_t *data /* [in]
[ref,size_is(offered)] */,
uint32_t offered /* [in] */,
WERROR *werror)
{
@@ -3664,7 +3664,7 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct
rpc_pipe_client *cli,
r.in.key_name = key_name;
r.in.value_name = value_name;
r.in.type = type;
- r.in.buffer = buffer;
+ r.in.data = data;
r.in.offered = offered;
if (DEBUGLEVEL >= 10) {
@@ -3705,7 +3705,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct
rpc_pipe_client *cli,
const char *key_name /* [in]
[charset(UTF16)] */,
const char *value_name /* [in]
[charset(UTF16)] */,
enum winreg_Type *type /* [out] [ref]
*/,
- uint8_t *buffer /* [out]
[ref,size_is(offered)] */,
+ uint8_t *data /* [out]
[ref,size_is(offered)] */,
uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
@@ -3743,7 +3743,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct
rpc_pipe_client *cli,
/* Return variables */
*type = *r.out.type;
- memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
+ 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 eb1e8dd..0ee28e5 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -190,9 +190,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);
NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
@@ -200,8 +200,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);
NTSTATUS rpccli_spoolss_WaitForPrinterChange(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
@@ -471,7 +471,7 @@ 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] */,
- uint8_t *buffer /* [in]
[ref,size_is(offered)] */,
+ uint8_t *data /* [in]
[ref,size_is(offered)] */,
uint32_t offered /* [in] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
@@ -480,7 +480,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct
rpc_pipe_client *cli,
const char *key_name /* [in]
[charset(UTF16)] */,
const char *value_name /* [in]
[charset(UTF16)] */,
enum winreg_Type *type /* [out] [ref]
*/,
- uint8_t *buffer /* [out]
[ref,size_is(offered)] */,
+ uint8_t *data /* [out]
[ref,size_is(offered)] */,
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 cca1b12..59d987f 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -18650,8 +18650,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));
}
if (ndr_flags & NDR_BUFFERS) {
NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
@@ -18665,16 +18670,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);
@@ -18705,12 +18714,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));
}
@@ -18731,21 +18745,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);
@@ -18767,11 +18785,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--;
}
@@ -22235,7 +22252,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) {
@@ -22256,7 +22273,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_uint32(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");
}
@@ -22266,11 +22284,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);
@@ -22292,8 +22309,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);
}
@@ -22305,13 +22322,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);
}
@@ -22320,44 +22335,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;
}
@@ -22389,8 +22369,7 @@ _PUBLIC_ void ndr_print_spoolss_GetPrinterData(struct
ndr_print *ndr, const char
ndr->depth--;
ndr_print_ptr(ndr, "data", r->out.data);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->out.data, *r->out.type);
- ndr_print_spoolss_PrinterData(ndr, "data", r->out.data);
+ ndr_print_array_uint8(ndr, "data", r->out.data, r->in.offered);
ndr->depth--;
ndr_print_ptr(ndr, "needed", r->out.needed);
ndr->depth++;
@@ -22402,7 +22381,7 @@ _PUBLIC_ void ndr_print_spoolss_GetPrinterData(struct
ndr_print *ndr, const char
ndr->depth--;
}
-_PUBLIC_ enum ndr_err_code ndr_push__spoolss_SetPrinterData(struct ndr_push
*ndr, int flags, const struct _spoolss_SetPrinterData *r)
+static enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr,
int flags, const struct spoolss_SetPrinterData *r)
{
if (flags & NDR_IN) {
if (r->in.handle == NULL) {
@@ -22414,8 +22393,12 @@ _PUBLIC_ enum ndr_err_code
ndr_push__spoolss_SetPrinterData(struct ndr_push *ndr
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.value_name, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.value_name,
ndr_charset_length(r->in.value_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
- NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->in.data));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in._offered));
+ if (r->in.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data,
r->in.offered));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
}
if (flags & NDR_OUT) {
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
@@ -22423,21 +22406,6 @@ _PUBLIC_ enum ndr_err_code
ndr_push__spoolss_SetPrinterData(struct ndr_push *ndr
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_push___spoolss_SetPrinterData(struct ndr_push
*ndr, int flags, const struct __spoolss_SetPrinterData *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;
-}
-
static enum ndr_err_code ndr_pull_spoolss_SetPrinterData(struct ndr_pull *ndr,
int flags, struct spoolss_SetPrinterData *r)
{
TALLOC_CTX *_mem_save_handle_0;
@@ -22457,14 +22425,15 @@ static enum ndr_err_code
ndr_pull_spoolss_SetPrinterData(struct ndr_pull *ndr, i
NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->in.value_name), sizeof(uint16_t)));
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.value_name,
ndr_get_array_length(ndr, &r->in.value_name), sizeof(uint16_t), CH_UTF16));
NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
- {
- struct ndr_pull *_ndr_data;
- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 4,
-1));
- NDR_CHECK(ndr_pull_set_switch_value(_ndr_data,
&r->in.data, r->in.type));
- NDR_CHECK(ndr_pull_spoolss_PrinterData(_ndr_data,
NDR_SCALARS|NDR_BUFFERS, &r->in.data));
- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 4,
-1));
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->in.data));
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC_N(ndr, r->in.data,
ndr_get_array_size(ndr, &r->in.data));
+ }
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->in.data,
ndr_get_array_size(ndr, &r->in.data)));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offered));
+ if (r->in.data) {
+ NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data,
r->in.offered));
}
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in._offered));
}
if (flags & NDR_OUT) {
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
@@ -22488,9 +22457,11 @@ _PUBLIC_ void ndr_print_spoolss_SetPrinterData(struct
ndr_print *ndr, const char
ndr->depth--;
ndr_print_string(ndr, "value_name", r->in.value_name);
ndr_print_winreg_Type(ndr, "type", r->in.type);
- ndr_print_set_switch_value(ndr, &r->in.data, r->in.type);
- ndr_print_spoolss_PrinterData(ndr, "data", &r->in.data);
- ndr_print_uint32(ndr, "_offered", (ndr->flags &
LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_PrinterData(&r->in.data, r->in.type,
ndr->iconv_convenience, flags):r->in._offered);
+ ndr_print_ptr(ndr, "data", r->in.data);
+ ndr->depth++;
+ ndr_print_array_uint8(ndr, "data", r->in.data, r->in.offered);
+ ndr->depth--;
+ ndr_print_uint32(ndr, "offered", r->in.offered);
ndr->depth--;
}
if (flags & NDR_OUT) {
@@ -26571,11 +26542,11 @@ static enum ndr_err_code
ndr_push_spoolss_SetPrinterDataEx(struct ndr_push *ndr,
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.value_name, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.value_name,
ndr_charset_length(r->in.value_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
- if (r->in.buffer == NULL) {
+ if (r->in.data == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
- NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.buffer,
r->in.offered));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data,
r->in.offered));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
}
if (flags & NDR_OUT) {
@@ -26610,14 +26581,14 @@ static enum ndr_err_code
ndr_pull_spoolss_SetPrinterDataEx(struct ndr_pull *ndr,
NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->in.value_name), sizeof(uint16_t)));
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.value_name,
ndr_get_array_length(ndr, &r->in.value_name), sizeof(uint16_t), CH_UTF16));
NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
- NDR_CHECK(ndr_pull_array_size(ndr, &r->in.buffer));
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->in.data));
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC_N(ndr, r->in.buffer,
ndr_get_array_size(ndr, &r->in.buffer));
+ NDR_PULL_ALLOC_N(ndr, r->in.data,
ndr_get_array_size(ndr, &r->in.data));
}
- NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->in.buffer,
ndr_get_array_size(ndr, &r->in.buffer)));
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->in.data,
ndr_get_array_size(ndr, &r->in.data)));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offered));
- if (r->in.buffer) {
- NDR_CHECK(ndr_check_array_size(ndr,
(void*)&r->in.buffer, r->in.offered));
+ if (r->in.data) {
+ NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data,
r->in.offered));
}
}
if (flags & NDR_OUT) {
@@ -26643,9 +26614,9 @@ _PUBLIC_ void ndr_print_spoolss_SetPrinterDataEx(struct
ndr_print *ndr, const ch
ndr_print_string(ndr, "key_name", r->in.key_name);
ndr_print_string(ndr, "value_name", r->in.value_name);
ndr_print_winreg_Type(ndr, "type", r->in.type);
- ndr_print_ptr(ndr, "buffer", r->in.buffer);
+ ndr_print_ptr(ndr, "data", r->in.data);
ndr->depth++;
- ndr_print_array_uint8(ndr, "buffer", r->in.buffer,
r->in.offered);
+ ndr_print_array_uint8(ndr, "data", r->in.data, r->in.offered);
ndr->depth--;
ndr_print_uint32(ndr, "offered", r->in.offered);
--
Samba Shared Repository
