for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
rsyserr(FERROR, errno, "listen() on socket failed");
-#ifdef INET6
+#if INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
- "Try using --ipv4 or --ipv6 to avoid this listen() error.");
+ "Try using --ipv4 or --ipv6 to avoid this listen() error.\n");
}
#endif
exit_cleanup(RERR_SOCKETIO);
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
- /* open log file in child before possibly giving
- * up privileges */
- log_open();
ret = fn(fd, fd);
close_all();
_exit(ret);
close(fd);
}
}
- free(sp);
}
}
/* detach from the terminal */
-#ifdef HAVE_SETSID
+#if HAVE_SETSID
setsid();
#else
#ifdef TIOCNOTTY
struct sockaddr_in sock;
struct sockaddr_in sock2;
socklen_t socklen = sizeof sock;
- int errno_save, connect_done = 0;
+ int connect_done = 0;
fd[0] = fd[1] = listener = -1;
return 0;
failed:
- errno_save = errno;
if (fd[0] != -1)
close(fd[0]);
if (fd[1] != -1)
close(fd[1]);
if (listener != -1)
close(listener);
- errno = errno_save;
return -1;
}