diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-09 17:20:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:30 +0200 |
| commit | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch) | |
| tree | 9a0a6cb6617d855c28eb891396898096c4214e88 /libcli/cldap | |
| parent | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff) | |
| download | samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.bz2 samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip | |
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'libcli/cldap')
| -rw-r--r-- | libcli/cldap/cldap.c | 7 | ||||
| -rw-r--r-- | libcli/cldap/cldap.h | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 191d0eeee4..896319e75c 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -946,7 +946,6 @@ static void cldap_netlogon_state_done(struct tevent_req *subreq) receive a cldap netlogon reply */ NTSTATUS cldap_netlogon_recv(struct tevent_req *req, - struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct cldap_netlogon *io) { @@ -974,7 +973,6 @@ NTSTATUS cldap_netlogon_recv(struct tevent_req *req, data = state->search.out.response->attributes[0].values; status = pull_netlogon_samlogon_response(data, mem_ctx, - iconv_convenience, &io->out.netlogon); if (!NT_STATUS_IS_OK(status)) { goto failed; @@ -994,7 +992,6 @@ failed: sync cldap netlogon search */ NTSTATUS cldap_netlogon(struct cldap_socket *cldap, - struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct cldap_netlogon *io) { @@ -1017,7 +1014,7 @@ NTSTATUS cldap_netlogon(struct cldap_socket *cldap, return NT_STATUS_INTERNAL_ERROR; } - status = cldap_netlogon_recv(req, iconv_convenience, mem_ctx, io); + status = cldap_netlogon_recv(req, mem_ctx, io); talloc_free(req); return status; @@ -1081,7 +1078,6 @@ NTSTATUS cldap_error_reply(struct cldap_socket *cldap, send a netlogon reply */ NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap, - struct smb_iconv_convenience *iconv_convenience, uint32_t message_id, struct tsocket_address *dest, uint32_t version, @@ -1095,7 +1091,6 @@ NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap, DATA_BLOB blob; status = push_netlogon_samlogon_response(&blob, tmp_ctx, - iconv_convenience, netlogon); if (!NT_STATUS_IS_OK(status)) { talloc_free(tmp_ctx); diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h index 111fa2cfc4..d05e5b9936 100644 --- a/libcli/cldap/cldap.h +++ b/libcli/cldap/cldap.h @@ -116,16 +116,13 @@ struct tevent_req *cldap_netlogon_send(TALLOC_CTX *mem_ctx, struct cldap_socket *cldap, const struct cldap_netlogon *io); NTSTATUS cldap_netlogon_recv(struct tevent_req *req, - struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct cldap_netlogon *io); NTSTATUS cldap_netlogon(struct cldap_socket *cldap, - struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct cldap_netlogon *io); NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap, - struct smb_iconv_convenience *iconv_convenience, uint32_t message_id, struct tsocket_address *dst, uint32_t version, |