From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 21 Jan 2008 09:56:27 +0000 (+1100)
Subject: Be sure to pass iconv handle down to compression subcontexts (fixes
X-Git-Url: http://git.samba.org/samba.git/?p=jelmer%2Fsamba4-debian.git;a=commitdiff_plain;h=70c1e918e6bd01946425e2d89cb680f14152f9fc

Be sure to pass iconv handle down to compression subcontexts (fixes
segfaults in NET-API-BECOME-DC)

Andrew Bartlett
---

diff --git a/source/librpc/ndr/ndr_compression.c b/source/librpc/ndr/ndr_compression.c
index 310f8c4ce..86a5a2560 100644
--- a/source/librpc/ndr/ndr_compression.c
+++ b/source/librpc/ndr/ndr_compression.c
@@ -112,6 +112,8 @@ static enum ndr_err_code ndr_pull_compression_mszip(struct ndr_pull *subndr,
 	comndr->data_size	= uncompressed.length;
 	comndr->offset		= 0;
 
+	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]));
@@ -215,6 +217,8 @@ static enum ndr_err_code ndr_pull_compression_xpress(struct ndr_pull *subndr,
 	comndr->data_size	= uncompressed.length;
 	comndr->offset		= 0;
 
+	comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience);
+
 	*_comndr = comndr;
 	return NDR_ERR_SUCCESS;
 }