The branch, master has been updated
via 7e328e1... spoolss: regenerate hand-marshalled
ndr_pull_spoolss_DriverInfo101 after ndr64 changes.
via 95846bf... spoolss: make sure hand-marshalled spoolss_DriverInfo101
handles relative_highest_offset.
via 8f07339... spoolss: regenerate hand-marshalled
ndr_push_spoolss_DriverInfo101 after ndr64 changes.
from 9fc76f8... Remove the code replaced by widelinks warning.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7e328e1e1c0918bfde3e2cba4dfbbf9d52b45f46
Author: Günther Deschner <[email protected]>
Date: Fri Feb 12 11:32:08 2010 +0100
spoolss: regenerate hand-marshalled ndr_pull_spoolss_DriverInfo101 after
ndr64 changes.
Guenther
commit 95846bfee6961177c7676c8a5081de35e7d8228a
Author: Günther Deschner <[email protected]>
Date: Thu Feb 11 18:58:11 2010 +0100
spoolss: make sure hand-marshalled spoolss_DriverInfo101 handles
relative_highest_offset.
Guenther
commit 8f07339b6d979cbc75682303821a7ece43ddf0cc
Author: Günther Deschner <[email protected]>
Date: Fri Feb 12 11:25:59 2010 +0100
spoolss: regenerate hand-marshalled ndr_push_spoolss_DriverInfo101 after
ndr64 changes.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_spoolss_buf.c | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c
index b8d6f83..c5ee305 100644
--- a/librpc/ndr/ndr_spoolss_buf.c
+++ b/librpc/ndr/ndr_spoolss_buf.c
@@ -922,6 +922,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr,
NDR_CHECK(ndr_push_relative_ptr1(ndr, r->provider));
ndr->flags = _flags_save_string;
}
+ NDR_CHECK(ndr_push_trailer_align(ndr, 8));
}
if (ndr_flags & NDR_BUFFERS) {
{
@@ -945,7 +946,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr,
if (r->file_info) {
NDR_CHECK(ndr_push_relative_ptr2(ndr, r->file_info));
#if 0
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->file_count));
+ NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS,
r->file_count));
#endif
for (cntr_file_info_1 = 0; cntr_file_info_1 <
r->file_count; cntr_file_info_1++) {
NDR_CHECK(ndr_push_spoolss_DriverFileInfo(ndr,
NDR_SCALARS, &r->file_info[cntr_file_info_1]));
@@ -1166,6 +1167,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
}
ndr->flags = _flags_save_string;
}
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 8));
}
if (ndr_flags & NDR_BUFFERS) {
{
@@ -1179,6 +1181,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->driver_name, 0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->driver_name));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_driver_name_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1194,6 +1199,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->architecture, 0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->architecture));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_architecture_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1220,6 +1228,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
}
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_file_info_1, 0);
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_file_info_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset) {
+ ndr->relative_highest_offset = ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
{
@@ -1233,6 +1244,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->monitor_name, 0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->monitor_name));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_monitor_name_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1248,6 +1262,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->default_datatype,
0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->default_datatype));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_default_datatype_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1263,6 +1280,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->previous_names, 0);
NDR_CHECK(ndr_pull_string_array(ndr,
NDR_SCALARS, &r->previous_names));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_previous_names_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string_array;
@@ -1278,6 +1298,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->manufacturer_name,
0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->manufacturer_name));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_manufacturer_name_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1293,6 +1316,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->manufacturer_url,
0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->manufacturer_url));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_manufacturer_url_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1308,6 +1334,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->hardware_id, 0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->hardware_id));
NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_hardware_id_0, 0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
@@ -1323,6 +1352,9 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr,
NDR_PULL_SET_MEM_CTX(ndr, r->provider, 0);
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->provider));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_provider_0,
0);
+ if (ndr->offset > ndr->relative_highest_offset)
{
+ ndr->relative_highest_offset =
ndr->offset;
+ }
ndr->offset = _relative_save_offset;
}
ndr->flags = _flags_save_string;
--
Samba Shared Repository
