From 47d61ca8db78e5976400dbe08f426c0985e6e801 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sat, 7 Nov 2009 12:59:17 -0500 Subject: Fix tevent_req error checking. When possible using a macro that correctly deals with tstate --- server/providers/ldap/sdap_async.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'server/providers/ldap/sdap_async.c') diff --git a/server/providers/ldap/sdap_async.c b/server/providers/ldap/sdap_async.c index e02f3787..9e35c643 100644 --- a/server/providers/ldap/sdap_async.c +++ b/server/providers/ldap/sdap_async.c @@ -601,14 +601,10 @@ int sdap_exop_modify_passwd_recv(struct tevent_req *req, { struct sdap_exop_modify_passwd_state *state = tevent_req_data(req, struct sdap_exop_modify_passwd_state); - enum tevent_req_state tstate; - uint64_t err; *result = SDAP_ERROR; - if (tevent_req_is_error(req, &tstate, &err)) { - return err; - } + TEVENT_REQ_RETURN_ON_ERROR(req); if (state->result == LDAP_SUCCESS) { *result = SDAP_SUCCESS; @@ -702,13 +698,8 @@ int sdap_get_rootdse_recv(struct tevent_req *req, { struct sdap_get_rootdse_state *state = tevent_req_data(req, struct sdap_get_rootdse_state); - enum tevent_req_state tstate; - uint64_t err; - if (tevent_req_is_error(req, &tstate, &err)) { - if (err) return err; - return EIO; - } + TEVENT_REQ_RETURN_ON_ERROR(req); *rootdse = talloc_steal(memctx, state->rootdse); @@ -912,13 +903,8 @@ int sdap_get_generic_recv(struct tevent_req *req, { struct sdap_get_generic_state *state = tevent_req_data(req, struct sdap_get_generic_state); - enum tevent_req_state tstate; - uint64_t err; - if (tevent_req_is_error(req, &tstate, &err)) { - if (err) return err; - return EIO; - } + TEVENT_REQ_RETURN_ON_ERROR(req); *reply_count = state->reply_count; *reply = talloc_steal(mem_ctx, state->reply); -- cgit