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 --- source4/libcli/resolve/dns_ex.c | 4 ++-- source4/libcli/smb2/connect.c | 2 +- source4/libcli/smb2/session.c | 2 +- source4/libcli/smb_composite/smb2.c | 2 +- source4/libcli/wrepl/winsrepl.c | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/libcli') diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c index 1d56a4b4d5..5921212579 100644 --- a/source4/libcli/resolve/dns_ex.c +++ b/source4/libcli/resolve/dns_ex.c @@ -518,7 +518,7 @@ struct composite_context *resolve_name_dns_ex_send(TALLOC_CTX *mem_ctx, /* setup a pipe to chat to our child */ ret = pipe(fd); if (ret == -1) { - composite_error(c, map_nt_error_from_unix(errno)); + composite_error(c, map_nt_error_from_unix_common(errno)); return c; } @@ -542,7 +542,7 @@ struct composite_context *resolve_name_dns_ex_send(TALLOC_CTX *mem_ctx, state->child = fork(); if (state->child == (pid_t)-1) { - composite_error(c, map_nt_error_from_unix(errno)); + composite_error(c, map_nt_error_from_unix_common(errno)); return c; } diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index c5cacc3e0b..0e3bf1512b 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -381,7 +381,7 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx, ok = tevent_req_poll(subreq, ev); if (!ok) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); TALLOC_FREE(frame); return status; } diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 0f285ecd87..d46cdefc69 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -318,7 +318,7 @@ NTSTATUS smb2_session_setup_spnego(struct smb2_session *session, ok = tevent_req_poll(subreq, ev); if (!ok) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); TALLOC_FREE(frame); return status; } diff --git a/source4/libcli/smb_composite/smb2.c b/source4/libcli/smb_composite/smb2.c index 1f8ec834ca..5c93869b5c 100644 --- a/source4/libcli/smb_composite/smb2.c +++ b/source4/libcli/smb_composite/smb2.c @@ -430,7 +430,7 @@ NTSTATUS smb2_composite_setpathinfo(struct smb2_tree *tree, union smb_setfileinf ok = tevent_req_poll(subreq, ev); if (!ok) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); TALLOC_FREE(frame); return status; } diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 0dee2c56cf..72c040d3a1 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -181,7 +181,7 @@ struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx, our_ip, 0, &state->local_address); if (ret != 0) { - NTSTATUS status = map_nt_error_from_unix(errno); + NTSTATUS status = map_nt_error_from_unix_common(errno); tevent_req_nterror(req, status); return tevent_req_post(req, ev); } @@ -190,7 +190,7 @@ struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx, peer_ip, WINS_REPLICATION_PORT, &state->remote_address); if (ret != 0) { - NTSTATUS status = map_nt_error_from_unix(errno); + NTSTATUS status = map_nt_error_from_unix_common(errno); tevent_req_nterror(req, status); return tevent_req_post(req, ev); } @@ -250,7 +250,7 @@ static void wrepl_connect_done(struct tevent_req *subreq) ret = tstream_inet_tcp_connect_recv(subreq, &sys_errno, state, &state->stream, NULL); if (ret != 0) { - NTSTATUS status = map_nt_error_from_unix(sys_errno); + NTSTATUS status = map_nt_error_from_unix_common(sys_errno); tevent_req_nterror(req, status); return; } @@ -443,7 +443,7 @@ static void wrepl_request_writev_done(struct tevent_req *subreq) ret = tstream_writev_recv(subreq, &sys_errno); TALLOC_FREE(subreq); if (ret == -1) { - NTSTATUS status = map_nt_error_from_unix(sys_errno); + NTSTATUS status = map_nt_error_from_unix_common(sys_errno); TALLOC_FREE(state->caller.wrepl_socket->stream); tevent_req_nterror(req, status); return; @@ -494,7 +494,7 @@ static void wrepl_request_disconnect_done(struct tevent_req *subreq) ret = tstream_disconnect_recv(subreq, &sys_errno); TALLOC_FREE(subreq); if (ret == -1) { - NTSTATUS status = map_nt_error_from_unix(sys_errno); + NTSTATUS status = map_nt_error_from_unix_common(sys_errno); TALLOC_FREE(state->caller.wrepl_socket->stream); tevent_req_nterror(req, status); return; -- cgit