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/common/util.c | |
| 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/common/util.c')
| -rw-r--r-- | source4/dsdb/common/util.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index efc1b20ae0..ea623a3d4a 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -31,6 +31,7 @@ #include "dsdb/common/flags.h" #include "dsdb/common/proto.h" #include "libcli/ldap/ldap_ndr.h" +#include "param/param.h" #include "libcli/auth/libcli_auth.h" /* @@ -674,7 +675,9 @@ int samdb_msg_add_dom_sid(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, stru struct ldb_val v; enum ndr_err_code ndr_err; - ndr_err = ndr_push_struct_blob(&v, mem_ctx, sid, + ndr_err = ndr_push_struct_blob(&v, mem_ctx, + lp_iconv_convenience(ldb_get_opaque(sam_ldb, "loadparm")), + sid, (ndr_push_flags_fn_t)ndr_push_dom_sid); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return -1; |