From a1f04e8abc761ef1ba211420ff1dbda50fcf527d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 20 Jun 2011 14:55:32 +1000 Subject: libcli/util Rename common map_nt_error_from_unix to avoid duplicate symbol The two error tables need to be combined, but for now seperate the names. (As the common parts of the tree now use the _common function, errmap_unix.c must be included in the s3 autoconf build). Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Mon Jun 20 08:12:03 CEST 2011 on sn-devel-104 --- libcli/cldap/cldap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libcli/cldap') diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 37b4f4913d..59c54eabea 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -284,7 +284,7 @@ static bool cldap_socket_recv_dgram(struct cldap_socket *c, nomem: in->recv_errno = ENOMEM; error: - status = map_nt_error_from_unix(in->recv_errno); + status = map_nt_error_from_unix_common(in->recv_errno); nterror: /* in connected mode the first pending search gets the error */ if (!c->connected) { @@ -337,7 +337,7 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx, NULL, 0, &any); if (ret != 0) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); goto nterror; } local_addr = any; @@ -351,7 +351,7 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx, ret = tdgram_inet_udp_socket(local_addr, remote_addr, c, &c->sock); if (ret != 0) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); goto nterror; } talloc_free(any); @@ -669,7 +669,7 @@ static void cldap_search_state_queue_done(struct tevent_req *subreq) talloc_free(subreq); if (ret == -1) { NTSTATUS status; - status = map_nt_error_from_unix(sys_errno); + status = map_nt_error_from_unix_common(sys_errno); DLIST_REMOVE(state->caller.cldap->searches.list, state); ZERO_STRUCT(state->caller.cldap); tevent_req_nterror(req, status); -- cgit