From: Petr Uzel <petr.uzel@suse.cz>
Date: Thu, 3 Feb 2011 14:04:53 +0000 (+0100)
Subject: uuidd: use daemon(3) library function
X-Git-Tag: v2.19~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83a4498d77889e235ec4598baf33273817e02179;p=thirdparty%2Futil-linux.git

uuidd: use daemon(3) library function

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 62f75e1719..0d61396055 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -65,26 +65,11 @@ static void die(const char *msg)
 
 static void create_daemon(void)
 {
-	pid_t pid;
 	uid_t euid;
 
-	pid = fork();
-	if (pid == -1) {
-		perror("fork");
-		exit(1);
-	} else if (pid != 0) {
-	    exit(0);
-	}
-
-	close(0);
-	close(1);
-	close(2);
-	open("/dev/null", O_RDWR);
-	open("/dev/null", O_RDWR);
-	open("/dev/null", O_RDWR);
+	if (daemon(0,0))
+		die("daemon");
 
-	if (chdir("/")) {}	/* Silence warn_unused_result warning */
-	(void) setsid();
 	euid = geteuid();
 	if (setreuid(euid, euid) < 0)
 		die("setreuid");