From: Andrew Tridgell <tridge@samba.org> 
Date: Wed, 25 Apr 2001 01:52:54 +0000 (+0000)
Subject: merge from 2_2
X-Git-Tag: samba-2.2.5pre1~2220^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9137b613dc8cb45cbebfc6e57e20fde0517347a;p=thirdparty%2Fsamba.git

merge from 2_2
---

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 3671cf2e4fb..98a4b6758bc 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -168,7 +168,6 @@ int write_sock(void *buffer, int count)
 	while(nwritten < count) {
 		struct timeval tv;
 		fd_set r_fds;
-		int selret;
 		
 		/* Catch pipe close on other end by checking if a read()
 		   call would not block by calling select(). */
@@ -177,8 +176,8 @@ int write_sock(void *buffer, int count)
 		FD_SET(established_socket, &r_fds);
 		ZERO_STRUCT(tv);
 		
-		if ((selret = select(established_socket + 1, &r_fds, 
-				     NULL, NULL, &tv)) == -1) {
+		if (select(established_socket + 1, &r_fds, 
+				     NULL, NULL, &tv) == -1) {
 			close_sock();
 			return -1;                   /* Select error */
 		}