@@ -1,3 +1,10 @@

+Thu Apr 15 16:26:38 CEST 2004 (tk)

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

+  * libclamav: add a "clamav-" prefix to temporary file names (Dirk Mueller

+	       <dmuell*gmx.net>)

+  * clamd: clamuko: fix signal handling (problem reported by Claudio Alonso

+	   <cfalonso*yahoo.com>)

+

 Thu Apr 15 10:54:02 BST 2004 (njh)

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

   * clamav-milter:	Handle systems without inet_ntop()

@@ -56,6 +56,8 @@ void clamuko_exit(int sig)

     /* clamuko_running = 0; */

     logg("Clamuko stopped.\n");

+

+    pthread_exit(NULL);

 }

 void *clamukoth(void *arg)

@@ -340,7 +340,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     pthread_attr_init(&thattr);

     pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);

-    if(cfgopt(copt, "ClamukoScanOnLine"))

+    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess"))

 #ifdef CLAMUKO

     {

 	pthread_attr_init(&clamuko_attr);

@@ -476,7 +476,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 		exit(-1);

 	    }

 #ifdef CLAMUKO

-	    if(cfgopt(copt, "ClamukoScanOnLine")) {

+	    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess")) {

 		logg("Stopping and restarting Clamuko.\n");

 		pthread_kill(clamuko_pid, SIGUSR1);

 		pthread_join(clamuko_pid, NULL);

@@ -490,7 +490,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     }

 #ifdef CLAMUKO

-    if(cfgopt(copt, "ClamukoScanOnLine")) {

+    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess")) {

 	logg("Stopping Clamuko.\n");

 	pthread_kill(clamuko_pid, SIGUSR1);

 	pthread_join(clamuko_pid, NULL);

@@ -192,7 +192,7 @@ ArchiveMaxCompressionRatio 200

 ##

 # Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.

-#ClamukoScanOnLine

+#ClamukoScanOnAccess

 # Set access mask for Clamuko.

 ClamukoScanOnOpen

@@ -281,7 +281,7 @@ char *cl_gentemp(const char *dir)

     else

 	mdir = (char *) dir;

-    name = (char*) cli_calloc(strlen(mdir) + 1 + 16 + 1, sizeof(char));

+    name = (char*) cli_calloc(strlen(mdir) + 1 + 16 + 1 + 7, sizeof(char));

     if(name == NULL) {

 	cli_dbgmsg("cl_gentemp('%s'): out of memory\n", dir);

 	return NULL;

@@ -298,7 +298,7 @@ char *cl_gentemp(const char *dir)

 	    salt[i] = cl_rndnum(255);

 	tmp = cl_md5buff(( char* ) salt, 48);

-	sprintf(name, "%s/", mdir);

+	sprintf(name, "%s/clamav-", mdir);

 	strncat(name, tmp, 16);

 	free(tmp);

     } while(stat(name, &foo) != -1);

@@ -884,7 +884,7 @@ int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, cons

     return cli_magic_scandesc(desc, virname, scanned, root, limits, options, &reclev);

 }

-int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	int fd, ret;

@@ -91,7 +91,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"AllowSupplementaryGroups", OPT_NOARG},

 	    {"SelfCheck", OPT_NUM},

 	    {"VirusEvent", OPT_FULLSTR},

-	    {"ClamukoScanOnLine", OPT_NOARG},

+	    {"ClamukoScanOnLine", OPT_NOARG}, /* old name */

+	    {"ClamukoScanOnAccess", OPT_NOARG},

 	    {"ClamukoScanOnOpen", OPT_NOARG},

 	    {"ClamukoScanOnClose", OPT_NOARG},

 	    {"ClamukoScanOnExec", OPT_NOARG},