diff options
author | Günther Deschner <gd@samba.org> | 2016-09-20 00:18:43 +0200 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2017-07-19 21:22:13 +0200 |
commit | a44bce6dfab59a6440ccc30ef0968d59b9f43fd3 (patch) | |
tree | a2b45632ea8f824d3a6c9e3c7632234765a90bcd | |
parent | 3b5442e77bc80f81a4c5ddd69d1544c25e125f4e (diff) | |
download | samba-a44bce6dfab59a6440ccc30ef0968d59b9f43fd3.tar.gz |
libndr/compression: pass down compressed length in ndr_pull_compression_start
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r-- | librpc/ndr/ndr_compression.c | 3 | ||||
-rw-r--r-- | librpc/ndr/ndr_compression.h | 3 | ||||
-rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c index 240fad8ffd5..fd915ccaaa6 100644 --- a/librpc/ndr/ndr_compression.c +++ b/librpc/ndr/ndr_compression.c @@ -383,7 +383,8 @@ static enum ndr_err_code ndr_push_compression_xpress_chunk(struct ndr_push *ndrp enum ndr_err_code ndr_pull_compression_start(struct ndr_pull *subndr, struct ndr_pull **_comndr, enum ndr_compression_alg compression_alg, - ssize_t decompressed_len) + ssize_t decompressed_len, + ssize_t compressed_len) { struct ndr_push *ndrpush; struct ndr_pull *comndr; diff --git a/librpc/ndr/ndr_compression.h b/librpc/ndr/ndr_compression.h index 1c22fbf7595..d682d4d3693 100644 --- a/librpc/ndr/ndr_compression.h +++ b/librpc/ndr/ndr_compression.h @@ -37,7 +37,8 @@ enum ndr_err_code ndr_pull_compression_start(struct ndr_pull *subndr, struct ndr_pull **_comndr, enum ndr_compression_alg compression_alg, - ssize_t decompressed_len); + ssize_t decompressed_len, + ssize_t compressed_len); enum ndr_err_code ndr_pull_compression_end(struct ndr_pull *subndr, struct ndr_pull *comndr, enum ndr_compression_alg compression_alg, diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 6739b5f4391..cfcd29e25a7 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -525,11 +525,12 @@ sub ParseCompressionPullStart($$$$$) my $comndr = "$ndr\_compressed"; my $alg = compression_alg($e, $l); my $dlen = compression_dlen($e, $l, $env); + my $clen = compression_clen($e, $l, $env); $self->pidl("{"); $self->indent; $self->pidl("struct ndr_pull *$comndr;"); - $self->pidl("NDR_CHECK(ndr_pull_compression_start($ndr, &$comndr, $alg, $dlen));"); + $self->pidl("NDR_CHECK(ndr_pull_compression_start($ndr, &$comndr, $alg, $dlen, $clen));"); return $comndr; } |