From: Volker Lendecke <vl@samba.org>
Date: Sun, 24 May 2009 11:22:26 +0000 (+0200)
Subject: Don't limit the number of retries in wb_trans.
X-Git-Tag: tdb-1.1.5~411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7043ef2a794e5bbd9ea8e738fb3dcb390b237351;p=thirdparty%2Fsamba.git

Don't limit the number of retries in wb_trans.

This is better done with a tevent_req_set_endtime the caller should issue.
---

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index 41f5c81afe7..164cfc96911 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -468,7 +468,6 @@ struct wb_trans_state {
 	struct tevent_context *ev;
 	struct winbindd_request *wb_req;
 	struct winbindd_response *wb_resp;
-	int num_retries;
 	bool need_priv;
 };
 
@@ -516,7 +515,6 @@ struct tevent_req *wb_trans_send(TALLOC_CTX *mem_ctx,
 	state->wb_ctx = wb_ctx;
 	state->ev = ev;
 	state->wb_req = wb_req;
-	state->num_retries = 10;
 	state->need_priv = need_priv;
 
 	if (!tevent_queue_add(wb_ctx->queue, ev, req, wb_trans_trigger,
@@ -578,12 +576,6 @@ static bool wb_trans_retry(struct tevent_req *req,
 		return true;
 	}
 
-	state->num_retries -= 1;
-	if (state->num_retries == 0) {
-		tevent_req_error(req, wbc_err);
-		return true;
-	}
-
 	/*
 	 * The transfer as such failed, retry after one second
 	 */