diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
| commit | c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (patch) | |
| tree | 8efaf6b885543a006a91294923324fc580d01bbf /source4/dsdb/schema/schema_syntax.c | |
| parent | 11061499e182b9c41ec793d4eefb8a2cf7c88bfe (diff) | |
| parent | cab677a33f0376cd1bf96ec561dc0463bbf80edd (diff) | |
| download | samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.gz samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.bz2 samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
Diffstat (limited to 'source4/dsdb/schema/schema_syntax.c')
| -rw-r--r-- | source4/dsdb/schema/schema_syntax.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 9bc51c676e..2c133b6424 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -939,7 +939,7 @@ static WERROR dsdb_syntax_DN_BINARY_drsuapi_to_ldb(const struct dsdb_schema *sch } ndr_err = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob, - out->values, NULL, &id3b, + out->values, lp_iconv_convenience(global_loadparm), &id3b, (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3Binary); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { NTSTATUS status = ndr_map_error2ntstatus(ndr_err); @@ -997,7 +997,7 @@ static WERROR dsdb_syntax_DN_BINARY_ldb_to_drsuapi(const struct dsdb_schema *sch id3b.dn = (const char *)in->values[i].data; id3b.binary = data_blob(NULL, 0); - ndr_err = ndr_push_struct_blob(&blobs[i], blobs, NULL, &id3b, + ndr_err = ndr_push_struct_blob(&blobs[i], blobs, lp_iconv_convenience(global_loadparm), &id3b, (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { NTSTATUS status = ndr_map_error2ntstatus(ndr_err); |