summaryrefslogtreecommitdiff
path: root/source4/libcli/cldap/cldap.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-28 18:27:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-28 18:27:29 +0100
commitfc6bc92e116d3891671a77bc4564047eefd69f95 (patch)
tree9fd31f538af9cea9f144ece7e7b7cd2333d2bd81 /source4/libcli/cldap/cldap.h
parentd70eafc5c635255feafc7121b381e7044ac11854 (diff)
parentafe8e533b9626fff8c59653972019d3f91bf136c (diff)
downloadsamba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.gz
samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.bz2
samba-fc6bc92e116d3891671a77bc4564047eefd69f95.zip
Merge branch 'v4-0-trivial' into v4-0-test
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)
Diffstat (limited to 'source4/libcli/cldap/cldap.h')
-rw-r--r--source4/libcli/cldap/cldap.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 7a222e0652..eb0191d0f4 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -73,6 +73,7 @@ struct cldap_request {
struct cldap_socket {
struct socket_context *sock;
struct event_context *event_ctx;
+ struct smb_iconv_convenience *iconv_convenience;
/* the fd event */
struct fd_event *fde;
@@ -111,7 +112,8 @@ struct cldap_search {
};
struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx,
- struct event_context *event_ctx);
+ struct event_context *event_ctx,
+ struct smb_iconv_convenience *iconv_convenience);
NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
void (*handler)(struct cldap_socket *, struct ldap_message *,
struct socket_address *),