From c3b9b6c8aae1dea8df5fc7bff873a015aaa92d6e Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Wed, 4 Feb 2009 09:07:36 +0100 Subject: async_sock: Use unix errnos instead of NTSTATUS This also switches wb_reqtrans to use wbcErr instead of NTSTATUS as it would be pointless to convert to errno first and to wbcErr later. --- source3/lib/util_sock.c | 18 ++--- source3/lib/wb_reqtrans.c | 181 +++++++++++++++++++++++++++++++--------------- source3/lib/wbclient.c | 138 ++++++++++++++++------------------- 3 files changed, 194 insertions(+), 143 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 78431d93c8..b9a7f8788d 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -1051,17 +1051,17 @@ static void open_socket_out_connected(struct async_req *subreq) subreq->async.priv, struct async_req); struct open_socket_out_state *state = talloc_get_type_abort( req->private_data, struct open_socket_out_state); - NTSTATUS status; + int err; int sys_errno; - status = async_connect_recv(subreq, &sys_errno); + err = async_connect_recv(subreq, &sys_errno); TALLOC_FREE(subreq); - if (NT_STATUS_IS_OK(status)) { + if (err == 0) { async_req_done(req); return; } - if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) + if ((sys_errno == ETIME) || (sys_errno == EINPROGRESS) || (sys_errno == EALREADY) || (sys_errno == EAGAIN)) { @@ -1082,7 +1082,7 @@ static void open_socket_out_connected(struct async_req *subreq) } if (!async_req_set_timeout(subreq, state->ev, timeval_set(0, state->wait_nsec))) { - async_req_nterror(req, NT_STATUS_NO_MEMORY); + async_req_error(req, ENOMEM); return; } subreq->async.fn = open_socket_out_connected; @@ -1098,17 +1098,17 @@ static void open_socket_out_connected(struct async_req *subreq) #endif /* real error */ - async_req_nterror(req, map_nt_error_from_unix(sys_errno)); + async_req_error(req, sys_errno); } NTSTATUS open_socket_out_recv(struct async_req *req, int *pfd) { struct open_socket_out_state *state = talloc_get_type_abort( req->private_data, struct open_socket_out_state); - NTSTATUS status; + int err; - if (async_req_is_nterror(req, &status)) { - return status; + if (async_req_is_errno(req, &err)) { + return map_nt_error_from_unix(err); } *pfd = state->fd; state->fd = -1; diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c index b56c0fd4d3..9bf6f29105 100644 --- a/source3/lib/wb_reqtrans.c +++ b/source3/lib/wb_reqtrans.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "winbindd/winbindd.h" +#include "wbc_async.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND @@ -32,6 +32,57 @@ struct req_read_state { int fd; }; +bool async_req_is_wbcerr(struct async_req *req, wbcErr *pwbc_err) +{ + enum async_req_state state; + uint64_t error; + if (!async_req_is_error(req, &state, &error)) { + *pwbc_err = WBC_ERR_SUCCESS; + return false; + } + + switch (state) { + case ASYNC_REQ_USER_ERROR: + *pwbc_err = error; + break; + case ASYNC_REQ_TIMED_OUT: + *pwbc_err = WBC_ERR_UNKNOWN_FAILURE; + break; + case ASYNC_REQ_NO_MEMORY: + *pwbc_err = WBC_ERR_NO_MEMORY; + break; + default: + *pwbc_err = WBC_ERR_UNKNOWN_FAILURE; + break; + } + return true; +} + +wbcErr map_wbc_err_from_errno(int error) +{ + switch(error) { + case EPERM: + case EACCES: + return WBC_ERR_AUTH_ERROR; + case ENOMEM: + return WBC_ERR_NO_MEMORY; + case EIO: + default: + return WBC_ERR_UNKNOWN_FAILURE; + } +} + +wbcErr async_req_simple_recv_wbcerr(struct async_req *req) +{ + wbcErr wbc_err; + + if (async_req_is_wbcerr(req, &wbc_err)) { + return wbc_err; + } + + return WBC_ERR_SUCCESS; +} + static void wb_req_read_len(struct async_req *subreq); static void wb_req_read_main(struct async_req *subreq); static void wb_req_read_extra(struct async_req *subreq); @@ -76,12 +127,13 @@ static void wb_req_read_len(struct async_req *subreq) subreq->async.priv, struct async_req); struct req_read_state *state = talloc_get_type_abort( req->private_data, struct req_read_state); - NTSTATUS status; + int err; + ssize_t ret; - status = recvall_recv(subreq); + ret = recvall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } @@ -89,7 +141,7 @@ static void wb_req_read_len(struct async_req *subreq) DEBUG(0, ("wb_req_read_len: Invalid request size received: " "%d (expected %d)\n", (int)state->wb_req->length, (int)sizeof(struct winbindd_request))); - async_req_nterror(req, NT_STATUS_INVALID_BUFFER_SIZE); + async_req_error(req, WBC_ERR_INVALID_RESPONSE); return; } @@ -110,12 +162,13 @@ static void wb_req_read_main(struct async_req *subreq) subreq->async.priv, struct async_req); struct req_read_state *state = talloc_get_type_abort( req->private_data, struct req_read_state); - NTSTATUS status; + int err; + ssize_t ret; - status = recvall_recv(subreq); + ret = recvall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } @@ -124,7 +177,7 @@ static void wb_req_read_main(struct async_req *subreq) DEBUG(3, ("Got request with %d bytes extra data on " "unprivileged socket\n", (int)state->wb_req->extra_len)); - async_req_nterror(req, NT_STATUS_INVALID_BUFFER_SIZE); + async_req_error(req, WBC_ERR_INVALID_RESPONSE); return; } @@ -156,30 +209,31 @@ static void wb_req_read_extra(struct async_req *subreq) { struct async_req *req = talloc_get_type_abort( subreq->async.priv, struct async_req); - NTSTATUS status; + int err; + ssize_t ret; - status = recvall_recv(subreq); + ret = recvall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } async_req_done(req); } -NTSTATUS wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx, - struct winbindd_request **preq) +wbcErr wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx, + struct winbindd_request **preq) { struct req_read_state *state = talloc_get_type_abort( req->private_data, struct req_read_state); - NTSTATUS status; + wbcErr wbc_err; - if (async_req_is_nterror(req, &status)) { - return status; + if (async_req_is_wbcerr(req, &wbc_err)) { + return wbc_err; } *preq = talloc_move(mem_ctx, &state->wb_req); - return NT_STATUS_OK; + return WBC_ERR_SUCCESS; } struct req_write_state { @@ -227,12 +281,13 @@ static void wb_req_write_main(struct async_req *subreq) subreq->async.priv, struct async_req); struct req_write_state *state = talloc_get_type_abort( req->private_data, struct req_write_state); - NTSTATUS status; + int err; + ssize_t ret; - status = sendall_recv(subreq); + ret = sendall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } @@ -256,21 +311,22 @@ static void wb_req_write_extra(struct async_req *subreq) { struct async_req *req = talloc_get_type_abort( subreq->async.priv, struct async_req); - NTSTATUS status; + int err; + ssize_t ret; - status = sendall_recv(subreq); + ret = sendall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } async_req_done(req); } -NTSTATUS wb_req_write_recv(struct async_req *req) +wbcErr wb_req_write_recv(struct async_req *req) { - return async_req_simple_recv_ntstatus(req); + return async_req_simple_recv_wbcerr(req); } struct resp_read_state { @@ -322,12 +378,13 @@ static void wb_resp_read_len(struct async_req *subreq) subreq->async.priv, struct async_req); struct resp_read_state *state = talloc_get_type_abort( req->private_data, struct resp_read_state); - NTSTATUS status; + int err; + ssize_t ret; - status = recvall_recv(subreq); + ret = recvall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } @@ -336,7 +393,7 @@ static void wb_resp_read_len(struct async_req *subreq) "%d (expected at least%d)\n", (int)state->wb_resp->length, (int)sizeof(struct winbindd_response))); - async_req_nterror(req, NT_STATUS_INVALID_BUFFER_SIZE); + async_req_error(req, WBC_ERR_INVALID_RESPONSE); return; } @@ -357,13 +414,14 @@ static void wb_resp_read_main(struct async_req *subreq) subreq->async.priv, struct async_req); struct resp_read_state *state = talloc_get_type_abort( req->private_data, struct resp_read_state); - NTSTATUS status; + int err; + ssize_t ret; size_t extra_len; - status = recvall_recv(subreq); + ret = recvall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } @@ -395,30 +453,31 @@ static void wb_resp_read_extra(struct async_req *subreq) { struct async_req *req = talloc_get_type_abort( subreq->async.priv, struct async_req); - NTSTATUS status; + int err; + ssize_t ret; - status = recvall_recv(subreq); + ret = recvall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } async_req_done(req); } -NTSTATUS wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx, - struct winbindd_response **presp) +wbcErr wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx, + struct winbindd_response **presp) { struct resp_read_state *state = talloc_get_type_abort( req->private_data, struct resp_read_state); - NTSTATUS status; + wbcErr wbc_err; - if (async_req_is_nterror(req, &status)) { - return status; + if (async_req_is_wbcerr(req, &wbc_err)) { + return wbc_err; } *presp = talloc_move(mem_ctx, &state->wb_resp); - return NT_STATUS_OK; + return WBC_ERR_SUCCESS; } struct resp_write_state { @@ -466,12 +525,13 @@ static void wb_resp_write_main(struct async_req *subreq) subreq->async.priv, struct async_req); struct resp_write_state *state = talloc_get_type_abort( req->private_data, struct resp_write_state); - NTSTATUS status; + int err; + ssize_t ret; - status = sendall_recv(subreq); + ret = sendall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (ret < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } @@ -496,19 +556,20 @@ static void wb_resp_write_extra(struct async_req *subreq) { struct async_req *req = talloc_get_type_abort( subreq->async.priv, struct async_req); - NTSTATUS status; + int err; + ssize_t ret; - status = sendall_recv(subreq); + ret = sendall_recv(subreq, &err); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (err < 0) { + async_req_error(req, map_wbc_err_from_errno(err)); return; } async_req_done(req); } -NTSTATUS wb_resp_write_recv(struct async_req *req) +wbcErr wb_resp_write_recv(struct async_req *req) { - return async_req_simple_recv_ntstatus(req); + return async_req_simple_recv_wbcerr(req); } diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c index ae9a034cc8..4d3a609530 100644 --- a/source3/lib/wbclient.c +++ b/source3/lib/wbclient.c @@ -18,8 +18,7 @@ */ #include "includes.h" -#include "winbindd/winbindd.h" -#include "winbindd/winbindd_proto.h" +#include "wbc_async.h" static int make_nonstd_fd(int fd) { @@ -131,12 +130,6 @@ static bool winbind_closed_fd(int fd) return false; } -struct wb_context { - struct async_req_queue *queue; - int fd; - bool is_priv; -}; - struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx) { struct wb_context *result; @@ -163,7 +156,7 @@ static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx, struct sockaddr_un sunaddr; struct stat st; char *path = NULL; - NTSTATUS status; + wbcErr wbc_err; if (wb_ctx->fd != -1) { close(wb_ctx->fd); @@ -173,13 +166,13 @@ static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx, /* Check permissions on unix socket directory */ if (lstat(dir, &st) == -1) { - status = NT_STATUS_OBJECT_NAME_NOT_FOUND; + wbc_err = WBC_ERR_WINBIND_NOT_AVAILABLE; goto post_status; } if (!S_ISDIR(st.st_mode) || (st.st_uid != 0 && st.st_uid != geteuid())) { - status = NT_STATUS_OBJECT_NAME_NOT_FOUND; + wbc_err = WBC_ERR_WINBIND_NOT_AVAILABLE; goto post_status; } @@ -202,13 +195,13 @@ static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx, if ((lstat(sunaddr.sun_path, &st) == -1) || !S_ISSOCK(st.st_mode) || (st.st_uid != 0 && st.st_uid != geteuid())) { - status = NT_STATUS_OBJECT_NAME_NOT_FOUND; + wbc_err = WBC_ERR_WINBIND_NOT_AVAILABLE; goto post_status; } wb_ctx->fd = make_safe_fd(socket(AF_UNIX, SOCK_STREAM, 0)); if (wb_ctx->fd == -1) { - status = map_nt_error_from_unix(errno); + wbc_err = map_wbc_err_from_errno(errno); goto post_status; } @@ -226,24 +219,22 @@ static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx, return req; nomem: - status = NT_STATUS_NO_MEMORY; + wbc_err = WBC_ERR_NO_MEMORY; post_status: req = async_req_new(mem_ctx); if (req == NULL) { return NULL; } - if (async_post_ntstatus(req, ev, status)) { + if (async_post_error(req, ev, wbc_err)) { return req; } TALLOC_FREE(req); return NULL; } -static NTSTATUS wb_connect_recv(struct async_req *req) +static wbcErr wb_connect_recv(struct async_req *req) { - int dummy; - - return async_connect_recv(req, &dummy); + return async_req_simple_recv_wbcerr(req); } static struct winbindd_request *winbindd_request_copy( @@ -295,8 +286,8 @@ static struct async_req *wb_int_trans_send(TALLOC_CTX *mem_ctx, } if (winbind_closed_fd(fd)) { - if (!async_post_ntstatus(result, ev, - NT_STATUS_PIPE_DISCONNECTED)) { + if (!async_post_error(result, ev, + WBC_ERR_WINBIND_NOT_AVAILABLE)) { goto fail; } return result; @@ -329,18 +320,18 @@ static void wb_int_trans_write_done(struct async_req *subreq) subreq->async.priv, struct async_req); struct wb_int_trans_state *state = talloc_get_type_abort( req->private_data, struct wb_int_trans_state); - NTSTATUS status; + wbcErr wbc_err; - status = wb_req_write_recv(subreq); + wbc_err = wb_req_write_recv(subreq); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (!WBC_ERROR_IS_OK(wbc_err)) { + async_req_error(req, wbc_err); return; } subreq = wb_resp_read_send(state, state->ev, state->fd); if (subreq == NULL) { - async_req_nterror(req, NT_STATUS_NO_MEMORY); + async_req_error(req, WBC_ERR_NO_MEMORY); } subreq->async.fn = wb_int_trans_read_done; subreq->async.priv = req; @@ -352,32 +343,32 @@ static void wb_int_trans_read_done(struct async_req *subreq) subreq->async.priv, struct async_req); struct wb_int_trans_state *state = talloc_get_type_abort( req->private_data, struct wb_int_trans_state); - NTSTATUS status; + wbcErr wbc_err; - status = wb_resp_read_recv(subreq, state, &state->wb_resp); + wbc_err = wb_resp_read_recv(subreq, state, &state->wb_resp); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (!WBC_ERROR_IS_OK(wbc_err)) { + async_req_error(req, wbc_err); return; } async_req_done(req); } -static NTSTATUS wb_int_trans_recv(struct async_req *req, - TALLOC_CTX *mem_ctx, - struct winbindd_response **presponse) +static wbcErr wb_int_trans_recv(struct async_req *req, + TALLOC_CTX *mem_ctx, + struct winbindd_response **presponse) { struct wb_int_trans_state *state = talloc_get_type_abort( req->private_data, struct wb_int_trans_state); - NTSTATUS status; + wbcErr wbc_err; - if (async_req_is_nterror(req, &status)) { - return status; + if (async_req_is_wbcerr(req, &wbc_err)) { + return wbc_err; } *presponse = talloc_move(mem_ctx, &state->wb_resp); - return NT_STATUS_OK; + return WBC_ERR_SUCCESS; } static const char *winbindd_socket_dir(void) @@ -448,13 +439,13 @@ static void wb_open_pipe_connect_nonpriv_done(struct async_req *subreq) subreq->async.priv, struct async_req); struct wb_open_pipe_state *state = talloc_get_type_abort( req->private_data, struct wb_open_pipe_state); - NTSTATUS status; + wbcErr wbc_err; - status = wb_connect_recv(subreq); + wbc_err = wb_connect_recv(subreq); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { + if (!WBC_ERROR_IS_OK(wbc_err)) { state->wb_ctx->is_priv = true; - async_req_nterror(req, status); + async_req_error(req, wbc_err); return; } @@ -478,12 +469,12 @@ static void wb_open_pipe_ping_done(struct async_req *subreq) struct wb_open_pipe_state *state = talloc_get_type_abort( req->private_data, struct wb_open_pipe_state); struct winbindd_response *wb_resp; - NTSTATUS status; + wbcErr wbc_err; - status = wb_int_trans_recv(subreq, state, &wb_resp); + wbc_err = wb_int_trans_recv(subreq, state, &wb_resp); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (!WBC_ERROR_IS_OK(wbc_err)) { + async_req_error(req, wbc_err); return; } @@ -511,12 +502,12 @@ static void wb_open_pipe_getpriv_done(struct async_req *subreq) struct wb_open_pipe_state *state = talloc_get_type_abort( req->private_data, struct wb_open_pipe_state); struct winbindd_response *wb_resp = NULL; - NTSTATUS status; + wbcErr wbc_err; - status = wb_int_trans_recv(subreq, state, &wb_resp); + wbc_err = wb_int_trans_recv(subreq, state, &wb_resp); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (!WBC_ERROR_IS_OK(wbc_err)) { + async_req_error(req, wbc_err); return; } @@ -540,21 +531,21 @@ static void wb_open_pipe_connect_priv_done(struct async_req *subreq) subreq->async.priv, struct async_req); struct wb_open_pipe_state *state = talloc_get_type_abort( req->private_data, struct wb_open_pipe_state); - NTSTATUS status; + wbcErr wbc_err; - status = wb_connect_recv(subreq); + wbc_err = wb_connect_recv(subreq); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - async_req_nterror(req, status); + if (!WBC_ERROR_IS_OK(wbc_err)) { + async_req_error(req, wbc_err); return; } state->wb_ctx->is_priv = true; async_req_done(req); } -static NTSTATUS wb_open_pipe_recv(struct async_req *req) +static wbcErr wb_open_pipe_recv(struct async_req *req) { - return async_req_simple_recv_ntstatus(req); + return async_req_simple_recv_wbcerr(req); } struct wb_trans_state { @@ -631,27 +622,26 @@ struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, static bool wb_trans_retry(struct async_req *req, struct wb_trans_state *state, - NTSTATUS status) + wbcErr wbc_err) { struct async_req *subreq; - if (NT_STATUS_IS_OK(status)) { + if (WBC_ERROR_IS_OK(wbc_err)) { return false; } - if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND) - || NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) { + if (wbc_err == WBC_ERR_WINBIND_NOT_AVAILABLE) { /* * Winbind not around or we can't connect to the pipe. Fail * immediately. */ - async_req_nterror(req, status); + async_req_error(req, wbc_err); return true; } state->num_retries -= 1; if (state->num_retries == 0) { - async_req_nterror(req, status); + async_req_error(req, wbc_err); return true; } @@ -685,7 +675,7 @@ static void wb_trans_retry_wait_done(struct async_req *subreq) ret = async_wait_recv(subreq); TALLOC_FREE(subreq); if (ret) { - async_req_nterror(req, NT_STATUS_INTERNAL_ERROR); + async_req_error(req, WBC_ERR_UNKNOWN_FAILURE); return; } @@ -704,12 +694,12 @@ static void wb_trans_connect_done(struct async_req *subreq) subreq->async.priv, struct async_req); struct wb_trans_state *state = talloc_get_type_abort( req->private_data, struct wb_trans_state); - NTSTATUS status; + wbcErr wbc_err; - status = wb_open_pipe_recv(subreq); + wbc_err = wb_open_pipe_recv(subreq); TALLOC_FREE(subreq); - if (wb_trans_retry(req, state, status)) { + if (wb_trans_retry(req, state, wbc_err)) { return; } @@ -729,29 +719,29 @@ static void wb_trans_done(struct async_req *subreq) subreq->async.priv, struct async_req); struct wb_trans_state *state = talloc_get_type_abort( req->private_data, struct wb_trans_state); - NTSTATUS status; + wbcErr wbc_err; - status = wb_int_trans_recv(subreq, state, &state->wb_resp); + wbc_err = wb_int_trans_recv(subreq, state, &state->wb_resp); TALLOC_FREE(subreq); - if (wb_trans_retry(req, state, status)) { + if (wb_trans_retry(req, state, wbc_err)) { return; } async_req_done(req); } -NTSTATUS wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx, - struct winbindd_response **presponse) +wbcErr wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx, + struct winbindd_response **presponse) { struct wb_trans_state *state = talloc_get_type_abort( req->private_data, struct wb_trans_state); - NTSTATUS status; + wbcErr wbc_err; - if (async_req_is_nterror(req, &status)) { - return status; + if (async_req_is_wbcerr(req, &wbc_err)) { + return wbc_err; } *presponse = talloc_move(mem_ctx, &state->wb_resp); - return NT_STATUS_OK; + return WBC_ERR_SUCCESS; } -- cgit