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

+Thu Dec  9 13:40:55 CET 2010 (tk)

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

+ * clamd: don't report file hashes to clients (bb#2409)

+

 Thu Dec  9 13:29:16 CET 2010 (tk)

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

  * libclamav: preserve callbacks during db reload (bb#2418)

@@ -239,7 +239,7 @@ int scan_callback(struct stat *sb, char *filename, const char *msg, enum cli_ftw

     if (ret == CL_VIRUS) {

 	scandata->infected++;

-	if (conn_reply_virus(scandata->conn, filename, virname, context.virhash, context.virsize) == -1) {

+	if (conn_reply_virus(scandata->conn, filename, virname) == -1) {

 	    free(filename);

 	    return CL_ETIMEOUT;

 	}

@@ -337,7 +337,7 @@ int scanfd(const int fd, const client_conn_t *conn, unsigned long int *scanned,

 	}

 	if(ret == CL_VIRUS) {

-		if (conn_reply_virus(conn, fdstr, virname, context.virhash, context.virsize) == -1)

+		if (conn_reply_virus(conn, fdstr, virname) == -1)

 		    ret = CL_ETIMEOUT;

 		if(context.virsize)

 		    detstats_add(virname, "NOFNAME", context.virsize, context.virhash);

@@ -156,18 +156,12 @@ int conn_reply(const client_conn_t *conn, const char *path,

 }

 int conn_reply_virus(const client_conn_t *conn, const char *file,

-	       const char *virname, const char *virhash, unsigned int virsize)

+	       const char *virname)

 {

     if (conn->id) {

-	if (virsize)

-	    return mdprintf(conn->sd, "%u: %s: %s(%s:%u) FOUND%c", conn->id, file,

-			virname, virhash, virsize, conn->term);

 	return mdprintf(conn->sd, "%u: %s: %s FOUND%c", conn->id, file, virname,

 	    conn->term);

     }

-    if (virsize)

-	return mdprintf(conn->sd, "%s: %s(%s:%u) FOUND%c", file, virname, virhash,

-	    virsize, conn->term);

     return mdprintf(conn->sd, "%s: %s FOUND%c", file, virname, conn->term);

 }

@@ -96,7 +96,7 @@ int execute_or_dispatch_command(client_conn_t *conn, enum commands command, cons

 int conn_reply(const client_conn_t *conn, const char *path, const char *msg, const char *status);

 int conn_reply_single(const client_conn_t *conn, const char *path, const char *status);

-int conn_reply_virus(const client_conn_t *conn, const char *file, const char *virname, const char *virhash, unsigned int virsize);

+int conn_reply_virus(const client_conn_t *conn, const char *file, const char *virname);

 int conn_reply_error(const client_conn_t *conn, const char *msg);

 int conn_reply_errno(const client_conn_t *conn, const char *path, const char *msg);

 #endif