@@ -1,3 +1,7 @@

+Tue Jan 22 18:24:12 CET 2008 (tk)

+---------------------------------

+  * shared/misc.c: add error reporting to daemonize() (bb#729)

+

 Tue Jan 22 18:47:54 EET 2008 (edwin)

 -----------------------------------

   * libclamav/entconv.c: handle E2BIG correctly, avoid infinite loops on iconv

@@ -280,7 +280,12 @@ int main(int argc, char **argv)

     /* fork into background */

     if(!cfgopt(copt, "Foreground")->enabled) {

-	daemonize();

+	if(daemonize() == -1) {

+	    logg("!daemonize() failed\n");

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

+	}

 	if(!debug_mode)

 	    if(chdir("/") == -1)

 		logg("^Can't change current working directory to root\n");

@@ -54,7 +54,6 @@ struct thrwarg {

 int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigned int dboptions, const struct cfgstruct *copt);

 void sighandler(int sig);

 void sighandler_th(int sig);

-void daemonize(void);

 void sigsegv(int sig);

 #endif

@@ -481,8 +481,13 @@ int main(int argc, char **argv)

 	bigsleep = 24 * 3600 / checks;

 	if(!cfgopt(copt, "Foreground")->enabled) {

+	    if(daemonize() == -1) {

+		logg("!daemonize() failed\n");

+		opt_free(opt);

+		freecfg(copt);

+		return 70; /* FIXME */

+	    }

             foreground = 0;

-	    daemonize();

 	    mprintf_disabled = 1;

         }

@@ -283,30 +283,50 @@ int cvd_unpack(const char *cvd, const char *destdir)

 }

 #endif

-void daemonize(void)

+int daemonize(void)

 {

-#if	defined(C_OS2) || defined(C_WINDOWS)

-	fputs("Background mode is not supported on your operating system\n", stderr);

+#if defined(C_OS2) || defined(C_WINDOWS)

+    fputs("Background mode is not supported on your operating system\n", stderr);

     return;

 #else

-	int i;

+	int fds[3], i;

+	pid_t pid;

-    if((i = open("/dev/null", O_RDWR)) == -1) {

+    fds[0] = open("/dev/null", O_RDONLY);

+    fds[1] = open("/dev/null", O_WRONLY);

+    fds[2] = open("/dev/null", O_WRONLY);

+    if(fds[0] == -1 || fds[1] == -1 || fds[2] == -1) {

+	fputs("Can't open /dev/null\n", stderr);

 	for(i = 0; i <= 2; i++)

-	    close(i);

+	    if(fds[i] != -1)

+		close(fds[i]);

+	return -1;

+    }

-    } else {

-	dup2(i, 0);

-	dup2(i, 1);

-	dup2(i, 2);

-	if(i > 2)

-	    close(i);

+    for(i = 0; i <= 2; i++) {

+	if(dup2(fds[i], i) == -1) {

+	    fprintf(stderr, "dup2(%d, %d) failed\n", fds[i], i); /* may not be printed */

+	    for(i = 0; i <= 2; i++)

+		if(fds[i] != -1)

+		    close(fds[i]);

+	    return -1;

+	}

     }

-    if(fork())

+    for(i = 0; i <= 2; i++)

+	if(fds[i] > 2)

+	    close(fds[i]);

+

+    pid = fork();

+

+    if(pid == -1)

+	return -1;

+

+    if(pid)

 	exit(0);

     setsid();

+    return 0;

 #endif

 }

@@ -38,6 +38,6 @@ int filecopy(const char *src, const char *dest);

 int isnumb(const char *str);

 int dircopy(const char *src, const char *dest);

 int cvd_unpack(const char *cvd, const char *destdir);

-void daemonize(void);

+int daemonize(void);

 #endif