sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

fixed a bug in handling select in the main daemon - this stops the daemon spinning if a signal is received at an inconvenient moment

Browse Source
This commit is contained in:
Andrew Tridgell -
parent 73ba155a6b
commit d8d7dd523d
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/select.c
View File

@ -102,6 +102,12 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
}
if (FD_ISSET(select_pipe[0], readfds2)) {
char c;
saved_errno = errno;
if (read(select_pipe[0], &c, 1) == 1) {
pipe_read++;
}
errno = saved_errno;
FD_CLR(select_pipe[0], readfds2);
ret--;
if (ret == 0) {
@ -110,18 +116,6 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
}
}
saved_errno = errno;
while (pipe_written != pipe_read) {
char c;
/* Due to the linux kernel bug in 2.0.x, we
* always increment here even if the read failed... */
read(select_pipe[0], &c, 1);
pipe_read++;
}
errno = saved_errno;
return ret;
}