The branch, v4-0-test has been updated
via b99b604a5f8b7eb98a6285145188c0b94946df78 (commit)
via 70c1e918e6bd01946425e2d89cb680f14152f9fc (commit)
from c04cf0c0520ae35ebe173d733d5dc8ffa5bf4ed9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit b99b604a5f8b7eb98a6285145188c0b94946df78
Merge: 70c1e918e6bd01946425e2d89cb680f14152f9fc
c04cf0c0520ae35ebe173d733d5dc8ffa5bf4ed9
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Mon Jan 21 22:01:32 2008 +1100
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
commit 70c1e918e6bd01946425e2d89cb680f14152f9fc
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Mon Jan 21 20:56:27 2008 +1100
Be sure to pass iconv handle down to compression subcontexts (fixes
segfaults in NET-API-BECOME-DC)
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/librpc/ndr/ndr_compression.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/ndr/ndr_compression.c
b/source/librpc/ndr/ndr_compression.c
index 310f8c4..86a5a25 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;
}
--
Samba Shared Repository
