From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 25 Sep 2004 06:49:33 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20040925T0738
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51499423041892397b8ee123bbe45fd8eadda534;p=thirdparty%2Fglibc.git

Update.

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

diff --git a/ChangeLog b/ChangeLog
index d717f842204..30772a98bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/misc/daemon.c b/misc/daemon.c
index 775ef1aacfa..7597ce9996d 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