r7785: This looks much larger than it is. It changes the top-level functions of the

parent winbind not to return winbindd_result. This is to hopefully fix all the
problems where a result has been scheduled for write twice.

The problematic ones have been the functions that might have been delayed as
well as under other circumstances immediately gets answered from the cache.

Now a request needs to be explicitly replied to with a request_error() or
request_ok().

Volker
(This used to be commit 7365c9accf98ec1dd78a59dd7f62462bbb8528d4)

1 files changed, 16 insertions, 10 deletions

diff --git a/source3/nsswitch/winbindd_wins.c b/source3/nsswitch/winbindd_wins.c
index f199ebcb43..2e03becd5a 100644
--- a/source3/nsswitch/winbindd_wins.c
+++ b/source3/nsswitch/winbindd_wins.c
@@ -132,7 +132,7 @@ static struct in_addr *lookup_byname_backend(const char *name, int *count)
 
 /* Get hostname from IP  */
 
-enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
+void winbindd_wins_byip(struct winbindd_cli_state *state)
 {
 	fstring response;
 	int i, count, maxlen, size;
@@ -151,7 +151,8 @@ enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
 	    size = strlen(state->request.data.winsreq);
 	    if (size > maxlen) {
 		SAFE_FREE(status);
-		return WINBINDD_ERROR;
+		request_error(state);
+		return;
 	    }
 	    fstrcat(response,state->request.data.winsreq);
 	    fstrcat(response,"\t");
@@ -162,7 +163,8 @@ enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
 			size = sizeof(status[i].name) + strlen(response);
 			if (size > maxlen) {
 			    SAFE_FREE(status);
-			    return WINBINDD_ERROR;
+			    request_error(state);
+			    return;
 			}
 			fstrcat(response, status[i].name);
 			fstrcat(response, " ");
@@ -173,12 +175,12 @@ enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
 	    SAFE_FREE(status);
 	}
 	fstrcpy(state->response.data.winsresp,response);
-	return WINBINDD_OK;
+	request_ok(state);
 }
 
 /* Get IP from hostname */
 
-enum winbindd_result winbindd_wins_byname(struct winbindd_cli_state *state)
+void winbindd_wins_byname(struct winbindd_cli_state *state)
 {
 	struct in_addr *ip_list;
 	int i, count, maxlen, size;
@@ -200,7 +202,8 @@ enum winbindd_result winbindd_wins_byname(struct winbindd_cli_state *state)
 		    size = strlen(addr);
 		    if (size > maxlen) {
 			SAFE_FREE(ip_list);
-			return WINBINDD_ERROR;
+			request_error(state);
+			return;
 		    }
 		    if (i != 0) {
 			/* Clear out the newline character */
@@ -215,15 +218,18 @@ enum winbindd_result winbindd_wins_byname(struct winbindd_cli_state *state)
 		size = strlen(state->request.data.winsreq) + strlen(response);
 		if (size > maxlen) {
 		    SAFE_FREE(ip_list);
-		    return WINBINDD_ERROR;
+		    request_error(state);
+		    return;
 		}   
 		fstrcat(response,state->request.data.winsreq);
 		fstrcat(response,"\n");
 		SAFE_FREE(ip_list);
-	} else
-		return WINBINDD_ERROR;
+	} else {
+		request_error(state);
+		return;
+	}
 
 	fstrcpy(state->response.data.winsresp,response);
 
-	return WINBINDD_OK;
+	request_ok(state);
 }