diff options
| author | Jeremy Allison <jra@samba.org> | 2006-03-29 18:55:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:46 -0500 |
| commit | 70b59a3b20bc3cd3e1456dc552c43cd1da22f1b0 (patch) | |
| tree | 299f6c067db37eb8078e0b81d02832002d8ffa66 | |
| parent | 57909a15402e64e53ec20661166b0914d0a6ca90 (diff) | |
| download | samba-70b59a3b20bc3cd3e1456dc552c43cd1da22f1b0.tar.gz samba-70b59a3b20bc3cd3e1456dc552c43cd1da22f1b0.tar.bz2 samba-70b59a3b20bc3cd3e1456dc552c43cd1da22f1b0.zip | |
r14760: Fix #3642, ensure we don't call FD_SET on read with fd == -1.
Jeremy.
(This used to be commit 6ae15544ccfc3ff5d97565ad41ba7f57c7d29b0f)
| -rw-r--r-- | source3/nsswitch/wb_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c index 0e20927941..dfefeb9f75 100644 --- a/source3/nsswitch/wb_common.c +++ b/source3/nsswitch/wb_common.c @@ -411,6 +411,10 @@ static int read_sock(void *buffer, int count) int result = 0, nread = 0; int total_time = 0, selret; + if (winbindd_fd == -1) { + return -1; + } + /* Read data from socket */ while(nread < count) { struct timeval tv; |