diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
commit | 3eef0664c59c7afef117132c1d2ebccf22ad748e (patch) | |
tree | 17f4ae2a47cc7d3bac266f5ca2033140e6a4e81e /source4/torture/ldap/cldap.c | |
parent | 3abf47fe87e72b18c94157c3f993b7f2fca8c248 (diff) | |
parent | 2ba62662f8e2578153be3125eb557b9349ccfd3b (diff) | |
download | samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.gz samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.bz2 samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 04db9b184491415b3479fd79e1c07ba738818eb9)
Diffstat (limited to 'source4/torture/ldap/cldap.c')
-rw-r--r-- | source4/torture/ldap/cldap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c index 4e58059770..dbe9d2f9a4 100644 --- a/source4/torture/ldap/cldap.c +++ b/source4/torture/ldap/cldap.c @@ -38,7 +38,7 @@ */ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) { - struct cldap_socket *cldap = cldap_socket_init(tctx, NULL); + struct cldap_socket *cldap = cldap_socket_init(tctx, NULL, lp_iconv_convenience(tctx->lp_ctx)); NTSTATUS status; struct cldap_netlogon search, empty_search; union nbt_cldap_netlogon n1; @@ -244,7 +244,7 @@ static void cldap_dump_results(struct cldap_search *search) */ static bool test_cldap_generic(struct torture_context *tctx, const char *dest) { - struct cldap_socket *cldap = cldap_socket_init(tctx, NULL); + struct cldap_socket *cldap = cldap_socket_init(tctx, NULL, lp_iconv_convenience(tctx->lp_ctx)); NTSTATUS status; struct cldap_search search; const char *attrs1[] = { "currentTime", "highestCommittedUSN", NULL }; |