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

+Wed Jan 26 18:37:45 CET 2005 (tk)

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

+  * minor cleanup

+

 Wed Jan 26 17:26:03 GMT 2005 (trog)

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

   * clamd/server-th.c clamd/session.c clamd/session.h: fixup SESSION mode.

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

+ *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -294,7 +294,7 @@ int scanfd(const int fd, unsigned long int *scanned, const struct cl_node *root,

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt)

 {

-	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd;

+	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port = 0, acceptd;

 	int tmpd, bread, retval, timeout, btread, min_port, max_port;

 	long int size = 0, maxsize = 0;

 	short bound = 0, rnd_port_first = 1;

@@ -49,7 +49,7 @@ pthread_mutex_t ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 int command(int desc, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int timeout)

 {

 	char buff[1025];

-	int bread, opt, ret, retval;

+	int bread, opt, retval;

 	struct cfgstruct *cpt;

@@ -116,8 +116,7 @@ int dsresult(int sockd, const struct optstruct *opt)

 int dsfile(int sockd, const char *filename, const struct optstruct *opt)

 {

 	int ret;

-	char buff[4096], *scancmd, *pt;

-	FILE *fd;

+	char *scancmd;

     scancmd = mcalloc(strlen(filename) + 20, sizeof(char));

@@ -503,7 +502,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(stat(filename, &fstat) == -1) {

-        mprintf("@Can't stat file %s\n", movefilename);

+        mprintf("@Can't stat file %s\n", filename);

 	mprintf("Try to run clamdscan with clamd privileges\n");

         notmoved++;

 	return;

@@ -10308,8 +10308,8 @@ else

     if test -n "$vuln"; then

 	if test "$zlib_check" = "yes"; then

-	    { { echo "$as_me:$LINENO: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net" >&5

-echo "$as_me: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net" >&2;}

+	    { { echo "$as_me:$LINENO: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stablility issues then!" >&5

+echo "$as_me: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stablility issues then!" >&2;}

    { (exit 1); exit 1; }; }

 	else

 	    { echo "$as_me:$LINENO: WARNING: ****** This ClamAV installation may be linked against" >&5

@@ -110,7 +110,7 @@ else

     if test -n "$vuln"; then

 	if test "$zlib_check" = "yes"; then

-	    AC_MSG_ERROR(The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net)

+	    AC_MSG_ERROR(The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stablility issues then!)

 	else

 	    AC_MSG_WARN([****** This ClamAV installation may be linked against])

 	    AC_MSG_WARN([****** a broken zlib version. Please DO NOT report any])

@@ -15,7 +15,7 @@

 @SET_MAKE@

 #

-#  Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>

+#  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

 #

 #  This program is free software; you can redistribute it and/or modify

 #  it under the terms of the GNU General Public License as published by

@@ -175,7 +175,7 @@ target_alias = @target_alias@

 target_cpu = @target_cpu@

 target_os = @target_os@

 target_vendor = @target_vendor@

-EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf MacOSX

+EXTRA_DIST = clamdoc.pdf man clamav-mirror-howto.pdf signatures.pdf MacOSX

 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5

 all: all-am

@@ -412,7 +412,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 /* proxy support finshed by njh@bandsman.co.uk */

 int wwwconnect(const char *server, const char *proxy, int pport, char *ip)

 {

-	int socketfd, port, i;

+	int socketfd = -1, port, i;

 	struct sockaddr_in name;

 	struct hostent *host;

 	char ipaddr[16];

@@ -482,7 +482,6 @@ int wwwconnect(const char *server, const char *proxy, int pport, char *ip)

 	return socketfd;

     }

-    close(socketfd);

     return -2;

 }

@@ -443,7 +443,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

     if(ep == EC32(section_hdr[nsections - 1].PointerToRawData)) {

 	lseek(desc, ep, SEEK_SET);

 	if(read(desc, buff, 4096) == 4096) {

-		char *pt = cli_memstr(buff, 4040, "\x47\x65\x74\x50\x72\x6f\x63\x41\x64\x64\x72\x65\x73\x73\x00", 15);

+		const char *pt = cli_memstr(buff, 4040, "\x47\x65\x74\x50\x72\x6f\x63\x41\x64\x64\x72\x65\x73\x73\x00", 15);

 	    if(pt) {

 		    uint32_t dw1, dw2;

@@ -68,6 +68,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *

 #include "htmlnorm.h"

 #include "untar.h"

 #include "special.h"

+#include "binhex.h"

 #ifdef HAVE_ZLIB_H

 #include <zlib.h>

@@ -28,6 +28,9 @@

 #include <ctype.h>

 #include <zzipformat.h>

+

+#include "others.h"

+

 /*

 #include "__debug.h"

 */

@@ -49,10 +49,12 @@

 #include "output.h"

 #include "cfgparser.h"

 #include "misc.h"

+#include "vba.h"

 #include "../clamscan/others.h"

 #include "../libclamav/others.h"

 #include "../libclamav/str.h"

-#include "vba.h"

+#include "../libclamav/ole2_extract.h"

+#include "../libclamav/htmlnorm.h"

 #ifndef	O_BINARY

 #define	O_BINARY	0

@@ -30,6 +30,7 @@

 #include "../libclamav/vba_extract.h"

 #include "../libclamav/others.h"

 #include "../libclamav/cltypes.h"

+#include "../libclamav/ole2_extract.h"

 typedef struct mac_token_tag

 {

@@ -44,6 +45,8 @@ typedef struct mac_token2_tag

 } mac_token2_t;

+int sigtool_vba_scandir(const char *dirname, int hex_output);

+

 static char *get_unicode_name (char *name, int size)

 {

     int i, j;

@@ -897,7 +900,7 @@ static int sigtool_scandir (const char *dirname, int hex_output)

     char *fname;

     const char *tmpdir;

     char *dir;

-    int retval, ret = CL_CLEAN, desc;

+    int ret = CL_CLEAN, desc;

     if ((dd = opendir (dirname)) != NULL) {