mirror of
https://github.com/samba-team/samba.git
synced 2025-11-16 20:23:50 +03:00
r26429: Avoid use of global_smb_iconv_convenience.
This commit is contained in:
committed by
Stefan Metzmacher
parent
5a3a851dc7
commit
d37136b7ab
@@ -27,6 +27,7 @@
|
||||
#include "librpc/gen_ndr/ndr_misc.h"
|
||||
#include "librpc/gen_ndr/ndr_drsuapi.h"
|
||||
#include "librpc/gen_ndr/ndr_drsblobs.h"
|
||||
#include "param/param.h"
|
||||
|
||||
WERROR dsdb_load_oid_mappings_drsuapi(struct dsdb_schema *schema, const struct drsuapi_DsReplicaOIDMapping_Ctr *ctr)
|
||||
{
|
||||
@@ -620,7 +621,7 @@ static struct drsuapi_DsReplicaAttribute *dsdb_find_object_attr_name(struct dsdb
|
||||
} \
|
||||
if (_a && _a->value_ctr.num_values >= 1) { \
|
||||
ssize_t _ret; \
|
||||
_ret = convert_string_talloc(mem_ctx, global_smb_iconv_convenience, CH_UTF16, CH_UNIX, \
|
||||
_ret = convert_string_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, \
|
||||
_a->value_ctr.values[0].blob->data, \
|
||||
_a->value_ctr.values[0].blob->length, \
|
||||
(void **)discard_const(&(p)->elem)); \
|
||||
|
||||
Reference in New Issue
Block a user