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

+Fri Feb 13 19:21:24 EET 2009 (edwin)

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

+ * shared/output.c, unit_tests/check_clamd.c: mdprintf was also

+ taking %f and %l, and they have different size than int.  Make the

+ ARGLEN get the correct vaarg types, otherwise it was popping off the

+ stack an item of the wrong size!

+

 Fri Feb 13 16:48:01 EET 2009 (edwin)

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

  * clamd/server-th.c: fix nFILDES command

@@ -104,6 +104,14 @@ short int mprintf_disabled = 0, mprintf_verbose = 0, mprintf_quiet = 0,

 		    if(pt)			    \

 			arglen += strlen(pt);	    \

 		    break;			    \

+		case 'f':			    \

+		    va_arg(args, double);	    \

+		    arglen += 25;		    \

+		    break;			    \

+		case 'l':			    \

+		    va_arg(args, long);		    \

+		    arglen += 20;		    \

+		    break;			    \

 		default:			    \

 		    va_arg(args, int);		    \

 		    arglen += 10;		    \

@@ -134,6 +134,32 @@ END_TEST

 #define EXPECT_INSTREAM "stream: ClamAV-Test-File.UNOFFICIAL FOUND\n"

+#define STATS_REPLY "POOLS: 1\n\nSTATE: VALID PRIMARY\n"

+START_TEST (tc_stats)

+{

+    char *recvdata;

+    size_t len = strlen("nSTATS\n");

+    int rc;

+

+    conn_setup();

+    rc = send(sockd, "nSTATS\n", len, 0);

+    fail_unless_fmt((size_t)rc == len, "Unable to send(): %s\n", strerror(errno));

+

+    recvdata = recvfull(sockd, &len);

+

+    fail_unless_fmt(len > strlen(STATS_REPLY), "Reply has wrong size: %lu, minimum %lu, reply: %s\n",

+		    len, strlen(STATS_REPLY), recvdata);

+

+    if (len > strlen(STATS_REPLY))

+	len = strlen(STATS_REPLY);

+    rc = strncmp(recvdata, STATS_REPLY, len);

+

+    fail_unless_fmt(rc == 0, "Wrong reply: %s\n", recvdata);

+    free(recvdata);

+    conn_teardown();

+}

+END_TEST

+

 START_TEST (tc_instream)

 {

     int fd, nread, rc;

@@ -185,7 +211,7 @@ static Suite *test_clamd_suite(void)

     suite_add_tcase(s, tc_commands);

     tcase_add_loop_test(tc_commands, test_basic_commands, 0, sizeof(basic_tests)/sizeof(basic_tests[0]));

     tcase_add_test(tc_commands, tc_instream);

-

+    tcase_add_test(tc_commands, tc_stats);

     return s;

 }