@@ -1,3 +1,8 @@

+Thu Nov  3 23:04:20 CET 2005 (tk)

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

+  * clamd: properly handle ReadTimeout in SESSION

+	   Bug reported by Kamil Kaczkowski <kamil*kamil.eisp.pl>

+

 Thu Nov  3 22:46:21 CET 2005 (tk)

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

   * libclamav/mspack/cabd.c: fix possible infinite loop in cabd_find

@@ -81,7 +81,7 @@ void scanner_thread(void *arg)

     do {

     	ret = command(conn->sd, conn->root, conn->limits, conn->options, conn->copt, timeout);

-	if (ret == -1) {

+	if (ret < 0) {

 		break;

 	}

@@ -55,7 +55,7 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

     retval = poll_fd(desc, timeout);

     switch (retval) {

     case 0: /* timeout */

-	return COMMAND_TIMEOUT;

+	return -2;

     case -1:

 	mdprintf(desc, "ERROR\n");

 	logg("!Command: poll_fd failed.\n");

@@ -23,7 +23,6 @@

 #define COMMAND_RELOAD 2

 #define COMMAND_END 3

 #define COMMAND_SESSION 4

-#define COMMAND_TIMEOUT 5

 #define CMD1 "SCAN"

 #define CMD2 "RAWSCAN"