diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nscd/connections.c | 28 |
2 files changed, 23 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 926603a381..0601dcac05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-01 Ulrich Drepper <drepper@redhat.com> + + [BZ #2498] + * nscd/connections.c (main_loop_poll): If the connection cannot be + accepted because of user-imposed limits close the descriptor. + 2006-03-31 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/Versions: Export sync_file_range with diff --git a/nscd/connections.c b/nscd/connections.c index 802b7c02d2..d975b1818f 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -1556,18 +1556,24 @@ main_loop_poll (void) /* We have a new incoming connection. Accept the connection. */ int fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL)); - /* use the descriptor if we have not reached the limit. */ - if (fd >= 0 && firstfree < nconns) + /* Use the descriptor if we have not reached the limit. */ + if (fd >= 0) { - conns[firstfree].fd = fd; - conns[firstfree].events = POLLRDNORM; - starttime[firstfree] = now; - if (firstfree >= nused) - nused = firstfree + 1; - - do - ++firstfree; - while (firstfree < nused && conns[firstfree].fd != -1); + if (firstfree < nconns) + { + conns[firstfree].fd = fd; + conns[firstfree].events = POLLRDNORM; + starttime[firstfree] = now; + if (firstfree >= nused) + nused = firstfree + 1; + + do + ++firstfree; + while (firstfree < nused && conns[firstfree].fd != -1); + } + else + /* We cannot use the connection so close it. */ + close (fd); } --n; |