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

+Fri Feb 15 18:24:22 CET 2008 (tk)

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

+  * clamd: delay the call to daemonize() (bb#839)

+

 Fri Feb 15 13:15:42 CET 2008 (acab)

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

   * configure: provide a way to specify the version of sendmail

@@ -279,58 +279,43 @@ int main(int argc, char **argv)

     if(cfgopt(copt, "LeaveTemporaryFiles")->enabled)

 	cl_settempdir(NULL, 1);

-    /* fork into background */

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

-	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");

-

-    } else

-        foreground = 1;

-

-    logg("clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

+    logg("#clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

     if(user)

-	logg("Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);

+	logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);

     if(logg_size)

-	logg("Log file size limited to %d bytes.\n", logg_size);

+	logg("#Log file size limited to %d bytes.\n", logg_size);

     else

-	logg("Log file size limit disabled.\n");

+	logg("#Log file size limit disabled.\n");

     /* load the database(s) */

     dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

-    logg("Reading databases from %s\n", dbdir);

+    logg("#Reading databases from %s\n", dbdir);

     if(cfgopt(copt, "DetectPUA")->enabled)

 	dboptions |= CL_DB_PUA;

     else

-	logg("Not loading PUA signatures.\n");

+	logg("#Not loading PUA signatures.\n");

     if(cfgopt(copt, "PhishingSignatures")->enabled)

 	dboptions |= CL_DB_PHISHING;

     else

-	logg("Not loading phishing signatures.\n");

+	logg("#Not loading phishing signatures.\n");

     if(cfgopt(copt,"PhishingScanURLs")->enabled)

 	dboptions |= CL_DB_PHISHING_URLS;

     else

-	logg("Disabling URL based phishing detection.\n");

+	logg("#Disabling URL based phishing detection.\n");

     if(cfgopt(copt,"DevACOnly")->enabled) {

-	logg("Only using the A-C matcher.\n");

+	logg("#Only using the A-C matcher.\n");

 	dboptions |= CL_DB_ACONLY;

     }

     if((cpt = cfgopt(copt, "DevACDepth"))->enabled) {

 	cli_ac_setdepth(AC_DEFAULT_MIN_DEPTH, cpt->numarg);

-	logg("Max A-C depth set to %u\n", cpt->numarg);

+	logg("#Max A-C depth set to %u\n", cpt->numarg);

     }

     if((ret = cl_load(dbdir, &engine, &sigs, dboptions))) {

@@ -347,7 +332,7 @@ int main(int argc, char **argv)

 	return 1;

     }

-    logg("Loaded %d signatures.\n", sigs);

+    logg("#Loaded %u signatures.\n", sigs);

     if((ret = cl_build(engine)) != 0) {

 	logg("!Database initialization error: %s\n", cl_strerror(ret));;

 	logg_close();

@@ -387,6 +372,22 @@ int main(int argc, char **argv)

 	nlsockets++;

     }

+    /* fork into background */

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

+	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");

+

+    } else

+        foreground = 1;

+

+

     ret = acceptloop_th(lsockets, nlsockets, engine, dboptions, copt);

 #ifdef C_WINDOWS

@@ -67,52 +67,52 @@ int localserver(const struct cfgstruct *copt)

     if((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

-	logg("!Socket allocation error: %s\n", estr);

+	logg("!LOCAL: Socket allocation error: %s\n", estr);

 	return -1;

     }

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) == -1) {

 	if(errno == EADDRINUSE) {

 	    if(connect(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) >= 0) {

-		logg("!Socket file %s is in use by another process.\n", server.sun_path);

+		logg("!LOCAL: Socket file %s is in use by another process.\n", server.sun_path);

 		close(sockfd);

 		return -1;

 	    }

 	    if(cfgopt(copt, "FixStaleSocket")->enabled) {

-		logg("^Socket file %s exists. Unclean shutdown? Removing...\n", server.sun_path);

+		logg("#LOCAL: Removing stale socket file %s\n", server.sun_path);

 		if(unlink(server.sun_path) == -1) {

 		    estr = strerror(errno);

-		    logg("!Socket file %s could not be removed: %s\n", server.sun_path, estr);

+		    logg("!LOCAL: Socket file %s could not be removed: %s\n", server.sun_path, estr);

 		    close(sockfd);

 		    return -1;

 		}

 		if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) == -1) {

 		    estr = strerror(errno);

-		    logg("!Socket file %s could not be bound: %s (unlink tried)\n", server.sun_path, estr);

+		    logg("!LOCAL: Socket file %s could not be bound: %s (unlink tried)\n", server.sun_path, estr);

 		    close(sockfd);

 		    return -1;

 		}

 	    } else if(stat(server.sun_path, &foo) != -1) {

-		logg("!Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

+		logg("!LOCAL: Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

 		close(sockfd);

 		return -1;

 	    }

 	} else {

 	    estr = strerror(errno);

-	    logg("!Socket file %s could not be bound: %s\n", server.sun_path, estr);

+	    logg("!LOCAL: Socket file %s could not be bound: %s\n", server.sun_path, estr);

 	    close(sockfd);

 	    return -1;

 	}

     }

-    logg("Unix socket file %s\n", server.sun_path);

+    logg("#LOCAL: Unix socket file %s\n", server.sun_path);

     backlog = cfgopt(copt, "MaxConnectionQueueLength")->numarg;

-    logg("Setting connection queue length to %d\n", backlog);

+    logg("#LOCAL: Setting connection queue length to %d\n", backlog);

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

-	logg("!listen() error: %s\n", estr);

+	logg("!LOCAL: listen() error: %s\n", estr);

 	close(sockfd);

 	return -1;

     }

@@ -66,7 +66,7 @@ int tcpserver(const struct cfgstruct *copt)

     if((taddr = cfgopt(copt, "TCPAddr"))->enabled) {

 	if(r_gethostbyname(taddr->strarg, &he, buf, sizeof(buf)) == -1) {

-	    logg("!r_gethostbyname(%s) error: %s\n", taddr->strarg, strerror(errno));

+	    logg("!TCP: r_gethostbyname(%s) error: %s\n", taddr->strarg, strerror(errno));

 	    return -1;

 	}

 	server.sin_addr = *(struct in_addr *) he.h_addr_list[0];

@@ -76,32 +76,32 @@ int tcpserver(const struct cfgstruct *copt)

     if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

-	logg("!socket() error: %s\n", estr);

+	logg("!TCP: socket() error: %s\n", estr);

 	return -1;

     }

     if(setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void *) &true, sizeof(true)) == -1) {

-	logg("!setsocktopt(SO_REUSEADDR) error: %s\n", strerror(errno));

+	logg("!TCP: setsocktopt(SO_REUSEADDR) error: %s\n", strerror(errno));

     }

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

 	estr = strerror(errno);

-	logg("!bind() error: %s\n", estr);

+	logg("!TCP: bind() error: %s\n", estr);

 	close(sockfd);

 	return -1;

     } else {

 	if(taddr->enabled)

-	    logg("Bound to address %s on tcp port %d\n", taddr->strarg, cfgopt(copt, "TCPSocket")->numarg);

+	    logg("#TCP: Bound to address %s on port %u\n", taddr->strarg, cfgopt(copt, "TCPSocket")->numarg);

 	else

-	    logg("Bound to tcp port %d\n", cfgopt(copt, "TCPSocket")->numarg);

+	    logg("#TCP: Bound to port %u\n", cfgopt(copt, "TCPSocket")->numarg);

     }

     backlog = cfgopt(copt, "MaxConnectionQueueLength")->numarg;

-    logg("Setting connection queue length to %d\n", backlog);

+    logg("#TCP: Setting connection queue length to %d\n", backlog);

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

-	logg("!listen() error: %s\n", estr);

+	logg("!TCP: listen() error: %s\n", estr);

 	close(sockfd);

 	return -1;

     }