summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-19 10:33:03 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-20 15:22:05 +0200
commitfbeb6d7801ab7dae46a4e255044bf849953a179c (patch)
treecd735a9497c3f11ace0e1df0916acc82a45d2180
parent17fcc4118f4d104d314e0acb0eae87954654a1a5 (diff)
downloadsamba-fbeb6d7801ab7dae46a4e255044bf849953a179c.tar.gz
samba-fbeb6d7801ab7dae46a4e255044bf849953a179c.tar.bz2
samba-fbeb6d7801ab7dae46a4e255044bf849953a179c.zip
ndr_compression: remove the type serialization handling from the compression layer
metze (This used to be commit 70a7b1f6c2e359102467ea270c2bb1efe736f64a)
-rw-r--r--source4/librpc/ndr/ndr_compression.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c
index ad8dda1f6e..f6de0a1319 100644
--- a/source4/librpc/ndr/ndr_compression.c
+++ b/source4/librpc/ndr/ndr_compression.c
@@ -212,10 +212,6 @@ enum ndr_err_code ndr_pull_compression_start(struct ndr_pull *subndr,
struct ndr_push *ndrpush;
struct ndr_pull *comndr;
DATA_BLOB uncompressed;
- uint32_t payload_header[4];
- uint32_t payload_size;
- uint32_t payload_offset;
- uint8_t *payload;
bool last = false;
z_stream z;
@@ -261,38 +257,6 @@ enum ndr_err_code ndr_pull_compression_start(struct ndr_pull *subndr,
comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience);
- NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[0]));
- NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[1]));
- NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[2]));
- NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[3]));
-
- if (payload_header[0] != 0x00081001) {
- return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
- "Bad XPRESS payload_header[0] [0x%08X] != [0x00081001] (PULL)",
- payload_header[0]);
- }
- if (payload_header[1] != 0xCCCCCCCC) {
- return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
- "Bad XPRESS payload_header[1] [0x%08X] != [0xCCCCCCCC] (PULL)",
- payload_header[1]);
- }
-
- payload_size = payload_header[2];
-
- if (payload_header[3] != 0x00000000) {
- return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
- "Bad XPRESS payload_header[3] [0x%08X] != [0x00000000] (PULL)",
- payload_header[3]);
- }
-
- payload_offset = comndr->offset;
- NDR_CHECK(ndr_pull_advance(comndr, payload_size));
- payload = comndr->data + payload_offset;
-
- comndr->data = payload;
- comndr->data_size = payload_size;
- comndr->offset = 0;
-
*_comndr = comndr;
return NDR_ERR_SUCCESS;
}