From 0523fd513c6baa8dbf45d1a7afea2044262aeb3d Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
Date: Fri, 23 Jun 2006 17:10:56 +1000
Subject: Further coverity related cleanups.

Greg Banks suggested some variations, particularly improved
use of xmalloc/xstrdup functions.  Thanks.
---
 utils/idmapd/idmapd.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'utils/idmapd/idmapd.c')

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 1231db4..5fc7811 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -1003,12 +1003,15 @@ mydaemon(int nochdir, int noclose)
 
 	if (noclose == 0) {
 		tempfd = open("/dev/null", O_RDWR);
+		if (tempfd < 0)
+			tempfd = open("/", O_RDONLY);
 		if (tempfd >= 0) {
 			dup2(tempfd, 0);
 			dup2(tempfd, 1);
 			dup2(tempfd, 2);
-		}
-		closeall(3);
+			closeall(3);
+		} else
+			closeall(0);
 	}
 
 	return;
-- 
cgit