diff options
Diffstat (limited to 'libcli/echo')
| -rw-r--r-- | libcli/echo/echo.c | 10 | ||||
| -rw-r--r-- | libcli/echo/tests/echo.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libcli/echo/echo.c b/libcli/echo/echo.c index 271f71b0ae8..b6005cb32c0 100644 --- a/libcli/echo/echo.c +++ b/libcli/echo/echo.c @@ -75,20 +75,20 @@ struct tevent_req *echo_request_send(TALLOC_CTX *mem_ctx, ret = tsocket_address_inet_from_strings(state, "ip", NULL, 0, &local_addr); if (ret != 0) { - tevent_req_nterror(req, map_nt_error_from_unix(ret)); + tevent_req_nterror(req, map_nt_error_from_unix_common(ret)); return tevent_req_post(req, ev); } ret = tsocket_address_inet_from_strings(state, "ip", server_addr_string, ECHO_PORT, &server_addr); if (ret != 0) { - tevent_req_nterror(req, map_nt_error_from_unix(ret)); + tevent_req_nterror(req, map_nt_error_from_unix_common(ret)); return tevent_req_post(req, ev); } ret = tdgram_inet_udp_socket(local_addr, server_addr, state, &dgram); if (ret != 0) { - tevent_req_nterror(req, map_nt_error_from_unix(ret)); + tevent_req_nterror(req, map_nt_error_from_unix_common(ret)); return tevent_req_post(req, ev); } @@ -132,7 +132,7 @@ static void echo_request_get_reply(struct tevent_req *subreq) TALLOC_FREE(subreq); if (len == -1 && err != 0) { - tevent_req_nterror(req, map_nt_error_from_unix(err)); + tevent_req_nterror(req, map_nt_error_from_unix_common(err)); return; } @@ -168,7 +168,7 @@ static void echo_request_done(struct tevent_req *subreq) TALLOC_FREE(subreq); if (len == -1 && err != 0) { - tevent_req_nterror(req, map_nt_error_from_unix(err)); + tevent_req_nterror(req, map_nt_error_from_unix_common(err)); return; } diff --git a/libcli/echo/tests/echo.c b/libcli/echo/tests/echo.c index c47b7d0d0fc..6424c810016 100644 --- a/libcli/echo/tests/echo.c +++ b/libcli/echo/tests/echo.c @@ -64,8 +64,10 @@ static bool torture_echo_udp(struct torture_context *tctx) make_nbt_name_server(&name, torture_setting_string(tctx, "host", NULL)); - status = resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, - &address, tctx->ev); + status = resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx), + 0, 0, + &name, tctx, + &address, tctx->ev); if (!NT_STATUS_IS_OK(status)) { printf("Failed to resolve %s - %s\n", name.name, nt_errstr(status)); |