* misc/daemon.c (daemon): Don't succeed if /dev/null cannot be
	opened.
This commit is contained in:
Ulrich Drepper 2004-09-25 06:49:33 +00:00
parent 9435d38cb1
commit 5149942304
2 changed files with 7 additions and 4 deletions

View File

@ -1,5 +1,8 @@
2004-09-24 Ulrich Drepper <drepper@redhat.com>
* misc/daemon.c (daemon): Don't succeed if /dev/null cannot be
opened.
* nis/ypclnt.c (do_ypcall): Add one missing unlock. Simplify the
code a bit.

View File

@ -61,12 +61,12 @@ daemon(nochdir, noclose)
if (!nochdir)
(void)__chdir("/");
if (!noclose
&& (fd = open_not_cancel(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
if (!noclose) {
struct stat64 st;
if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) == 0)
{
if ((fd = open_not_cancel(_PATH_DEVNULL, O_RDWR, 0)) != -1
&& (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0)
== 0)) {
if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
#if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
&& (st.st_rdev