diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-01 22:05:05 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-01 16:12:11 -0600 |
| commit | 86dc05e99f124db47f2743d1fc23117a7f5145ab (patch) | |
| tree | de35ed7a8a34c9efb04cfe7f94d72551ae78e176 /source4/dsdb/repl | |
| parent | cf80a01591d57d346e42a0a0f9d662cc24ddff51 (diff) | |
| download | samba-86dc05e99f124db47f2743d1fc23117a7f5145ab.tar.gz samba-86dc05e99f124db47f2743d1fc23117a7f5145ab.tar.bz2 samba-86dc05e99f124db47f2743d1fc23117a7f5145ab.zip | |
r26638: libndr: Require explicitly specifying iconv_convenience for ndr_struct_push_blob().
(This used to be commit 61ad78ac98937ef7a9aa32075a91a1c95b7606b3)
Diffstat (limited to 'source4/dsdb/repl')
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index c47108559d..8aff1340a5 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -28,6 +28,7 @@ #include "librpc/gen_ndr/ndr_drsblobs.h" #include "lib/crypto/crypto.h" #include "libcli/auth/libcli_auth.h" +#include "param/param.h" static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, const DATA_BLOB *gensec_skey, @@ -322,7 +323,9 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, whenChanged_s = ldb_timestring(msg, whenChanged_t); W_ERROR_HAVE_NO_MEMORY(whenChanged_s); - ndr_err = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, + ndr_err = ndr_push_struct_blob(&guid_value, msg, + lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")), + &in->object.identifier->guid, (ndr_push_flags_fn_t)ndr_push_GUID); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { nt_status = ndr_map_error2ntstatus(ndr_err); |