diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-03 00:23:09 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-03 00:23:09 +0100 |
| commit | c7dc53b8514f83800184d2b20b1897e54843a614 (patch) | |
| tree | 4f09d783271dc5e38809ed02c8252d73f8b147e5 /source4/cldap_server/cldap_server.c | |
| parent | 375df425c5014dc852995038e8e5668f98af8ba3 (diff) | |
| parent | 85d53f7b603f7c15b007f8c3fdde1989f07a6eb2 (diff) | |
| download | samba-c7dc53b8514f83800184d2b20b1897e54843a614.tar.gz samba-c7dc53b8514f83800184d2b20b1897e54843a614.tar.bz2 samba-c7dc53b8514f83800184d2b20b1897e54843a614.zip | |
Merge branch 'v4-0-test' into id10ts-registry
(This used to be commit f98b59021a5ea39c7970ebc5520d17775e500b8c)
Diffstat (limited to 'source4/cldap_server/cldap_server.c')
| -rw-r--r-- | source4/cldap_server/cldap_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index 7858ee2cf0..783e31d1ae 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -92,7 +92,7 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_ NTSTATUS status; /* listen for unicasts on the CLDAP port (389) */ - cldapsock = cldap_socket_init(cldapd, cldapd->task->event_ctx); + cldapsock = cldap_socket_init(cldapd, cldapd->task->event_ctx, lp_iconv_convenience(cldapd->task->lp_ctx)); NT_STATUS_HAVE_NO_MEMORY(cldapsock); socket_address = socket_address_from_strings(cldapsock, cldapsock->sock->backend_name, |