diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-04-25 01:52:54 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-04-25 01:52:54 +0000 |
| commit | 77076b01d286ad296930cd83cafc3a4bf0ae5db6 (patch) | |
| tree | d59c7d7a884c27fad810ac69f5d7d73f99893e68 | |
| parent | 30c02f987186963ed768c843ff2fc411d0cc7166 (diff) | |
| download | samba-77076b01d286ad296930cd83cafc3a4bf0ae5db6.tar.gz samba-77076b01d286ad296930cd83cafc3a4bf0ae5db6.tar.bz2 samba-77076b01d286ad296930cd83cafc3a4bf0ae5db6.zip | |
merge from 2_2
(This used to be commit b9137b613dc8cb45cbebfc6e57e20fde0517347a)
| -rw-r--r-- | source3/nsswitch/wb_common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c index 3671cf2e4f..98a4b6758b 100644 --- a/source3/nsswitch/wb_common.c +++ b/source3/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 */ } |