@@ -1,3 +1,9 @@

+Wed Aug 18 15:24:00 BST 2004 (trog)

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

+  * libclamav/chmunpack.c: make sure we don't get filename collisions

+

+  * clamd/server-th.c: don't queue requests when we are exiting

+

 Wed Aug 18 13:01:06 CEST 2004 (tk)

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

   * libclamav/filetypes.c: add new e-mail detection rule

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

 		sighup = 0;

 	}

-	if (new_sd >= 0) {

+	if (!progexit && new_sd >= 0) {

 		client_conn = (client_conn_t *) mmalloc(sizeof(struct client_conn_tag));

 		client_conn->sd = new_sd;

 		client_conn->options = options;

@@ -464,6 +464,9 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	pthread_mutex_lock(&exit_mutex);

 	if(progexit) {

+	    if (new_sd >= 0) {

+		close(new_sd);

+	    }

 	    pthread_mutex_unlock(&exit_mutex);

 	    break;

 	}

@@ -846,7 +846,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 	lzx_content_t *lzx_content=NULL;

 	lzx_reset_table_t *lzx_reset_table=NULL;

 	lzx_control_t *lzx_control=NULL;

-	int window_bits, length, ofd, retval=FALSE;

+	int window_bits, count, length, ofd, retval=FALSE;

 	uint64_t com_offset;

 	struct mspack_file_p mf_in, mf_out;

 	struct lzxd_stream * stream;

@@ -962,6 +962,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 	/* Delete the file */

 	unlink(filename);

+	count=0;

 	while(entry) {

 		if (entry->section != 1) {

 			entry = entry->next;

@@ -973,7 +974,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 			continue;

 		}

-		snprintf(filename, 1024, "%s/%llu.chm", dirname, entry->offset);

+		snprintf(filename, 1024, "%s/%d-%llu.chm", dirname, count, entry->offset);

 		ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

 		if (ofd < 0) {

 			entry = entry->next;

@@ -985,6 +986,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 		close(ofd);		

 		entry = entry->next;

+		count++;

 	}

 	close(mf_out.desc);

 	retval = TRUE;