summaryrefslogtreecommitdiffstats
path: root/source3/nsswitch/wb_common.c
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-05-07 04:32:40 +0000
committerTim Potter <tpot@samba.org>2001-05-07 04:32:40 +0000
commita36f9250e7c9446f3eece6d8db29fcbde99256fb (patch)
tree5b981dc1171e92f4a28232c3cc7b6d619054ea75 /source3/nsswitch/wb_common.c
parentc2887d57b5ff6da52aefac4657c23c142977ee2e (diff)
downloadsamba-a36f9250e7c9446f3eece6d8db29fcbde99256fb.tar.gz
samba-a36f9250e7c9446f3eece6d8db29fcbde99256fb.tar.xz
samba-a36f9250e7c9446f3eece6d8db29fcbde99256fb.zip
Preliminary merge of winbind into HEAD. Note that this compiles and links
but I haven't actually run it yet so it probably doesn't work. (-: (This used to be commit 59f95416b66db6df05289bde224de29c721978e5)
Diffstat (limited to 'source3/nsswitch/wb_common.c')
-rw-r--r--source3/nsswitch/wb_common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 4040e1cff2c..83760074243 100644
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -169,6 +169,7 @@ 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 +178,8 @@ int write_sock(void *buffer, int count)
FD_SET(established_socket, &r_fds);
ZERO_STRUCT(tv);
- if (select(established_socket + 1, &r_fds,
- NULL, NULL, &tv) == -1) {
+ if ((selret = select(established_socket + 1, &r_fds,
+ NULL, NULL, &tv)) == -1) {
close_sock();
return -1; /* Select error */
}