From: drepper <drepper>
Date: Sat, 25 Sep 2004 06:48:36 +0000 (+0000)
Subject: (daemon): Don't succeed if /dev/null cannot be opened.
X-Git-Tag: fedora-glibc-20040925T0738~2
X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=commitdiff_plain;h=17cc0d1cf1b2f3ac357dc9e70ee0a98df4ba955e

(daemon): Don't succeed if /dev/null cannot be opened.
---

diff --git a/misc/daemon.c b/misc/daemon.c
index 775ef1aacf..7597ce9996 100644
--- a/misc/daemon.c
+++ b/misc/daemon.c
@@ -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