Author: ngie
Date: Sat Dec 24 12:50:17 2016
New Revision: 310504
URL: https://svnweb.freebsd.org/changeset/base/310504
Log:
Unbreak syslogd after r310494
Don't close all file descriptors greater than STDERR_FILENO (2) in
waitdaemon(..) -- only close fd (file descriptor for /dev/null used in
subsequent calls to dup2) if it's greater than STDERR_FILENO.
Reported by: sub...@gmail.com, da...@cs.huji.ac.il
Pointyhat to: hrs
X-MFC with: r310494
Modified:
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.c
==============================================================================
--- head/usr.sbin/syslogd/syslogd.c Sat Dec 24 11:49:25 2016
(r310503)
+++ head/usr.sbin/syslogd/syslogd.c Sat Dec 24 12:50:17 2016
(r310504)
@@ -2348,7 +2348,8 @@ waitdaemon(int maxwait)
(void)dup2(fd, STDIN_FILENO);
(void)dup2(fd, STDOUT_FILENO);
(void)dup2(fd, STDERR_FILENO);
- closefrom(STDERR_FILENO + 1);
+ if (fd > STDERR_FILENO)
+ (void)close(fd);
}
return (getppid());
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
