Commit c4a5c57d authored by Martin Pool's avatar Martin Pool

If the daemon is unable to fork a child to accept a connection, print

an error message.  (Colin Walters)
parent 404e813c
......@@ -30,4 +30,7 @@ rsync 2.5.3 (not released yet)
* Added --no-whole-file and --no-blocking-io options (Dave Dykstra)
* Made the --write-batch and --read-batch options actually work
and added documentation in the man page (Jos Backus)
and added documentation in the man page (Jos Backus)
* If the daemon is unable to fork a child to accept a connection,
print an error message. (Colin Walters)
......@@ -387,6 +387,7 @@ void start_accept_loop(int port, int (*fn)(int ))
for each incoming connection */
while (1) {
fd_set fds;
pid_t pid;
int fd;
struct sockaddr_storage addr;
socklen_t addrlen = sizeof addr;
......@@ -418,12 +419,22 @@ void start_accept_loop(int port, int (*fn)(int ))
while (waitpid(-1, NULL, WNOHANG) > 0);
#endif
if (fork()==0) {
if ((pid = fork()) == 0) {
close(s);
/* open log file in child before possibly giving
up privileges */
log_open();
_exit(fn(fd));
} else if (pid < 0) {
rprintf(FERROR,
RSYNC_NAME
": could not create child server process: %s\n",
strerror(errno));
close(fd);
/* This might have happened because we're
* overloaded. Sleep briefly before trying to
* accept again. */
sleep(2);
}
close(fd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment