update

git-svn: trunk@897

clamav-devel/ChangeLog

@@ -1,3 +1,9 @@
+Sat Sep 18 21:23:00 CEST 2004 (tk)
+----------------------------------
+  * clamd: remove obsolete StreamSaveToDisk directive
+  * sigtool: add --html-normalise
+  * cleanup
+
 Sat Sep 18 16:02:32 BST 2004 (njh)
 ----------------------------------
   * libclamav:	Some minor code tidies

clamav-devel/clamd/server-th.c

@@ -314,7 +314,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop
 
 	if(cfgopt(copt, "ArchiveBlockEncrypted")) {
 	    logg("Archive: Blocking encrypted archives.\n");
-	    options |= CL_SCAN_ENCRYPTED;
+	    options |= CL_SCAN_BLOCKENCRYPTED;
 	}
 
 	if(cfgopt(copt, "ArchiveBlockMax")) {

clamav-devel/clamscan/manager.c

@@ -171,7 +171,7 @@ int scanmanager(const struct optstruct *opt)
 	options |= CL_SCAN_BROKEN;
 
     if(optl(opt, "block-encrypted"))
-	options |= CL_SCAN_ENCRYPTED;
+	options |= CL_SCAN_BLOCKENCRYPTED;
 
     if(optl(opt, "block-max"))
 	options |= CL_SCAN_BLOCKMAX;

clamav-devel/docs/Makefile.am

@@ -15,5 +15,5 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = clamdoc.pdf DMS German Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
+EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf Polish
 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5

clamav-devel/docs/Makefile.in

@@ -179,7 +179,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-EXTRA_DIST = clamdoc.pdf DMS German Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
+EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf Polish
 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
 all: all-am
 

clamav-devel/docs/man/sigtool.1

@@ -1,5 +1,5 @@
 .\" Manual page created by Tomasz Kojm, 20020629
-.TH "sigtool" "1" "August 31, 2004" "Tomasz Kojm" "Clam AntiVirus"
+.TH "sigtool" "1" "September 18, 2004" "Tomasz Kojm" "Clam AntiVirus"
 .SH "NAME"
 .LP 
 sigtool \- signature and database management tool
@@ -9,7 +9,7 @@ sigtool [options]
 .SH "DESCRIPTION"
 .LP 
 sigtool can be used to generate MD5 checksums, convert data 
-into hexadecimal format, and build/unpack CVD databases. Also it can verify digital signatures of databases and list virus signature names.
+into hexadecimal format, and build/unpack CVD databases. It's  also to verify digital signatures of databases and list virus signature names.
 .SH "OPTIONS"
 .LP 
 
@@ -32,6 +32,9 @@ Read data from stdin and write hex string to stdout.
 \fB\-\-md5 [FILES]\fR
 Generate MD5 checksum from stdin or MD5 sigs for FILES.
 .TP 
+\fB\-\-html\-normalise=FILE\fR
+Create normalised HTML files comment.html, nocomment.html, and script.html in current working directory.
+.TP 
 \fB\-i, \-\-info\fR
 Print a CVD information and verify MD5 and a digital signature.
 .TP 

clamav-devel/etc/clamav.conf

@@ -65,7 +65,7 @@ Example
 LocalSocket /tmp/clamd
 
 # Remove stale socket after unclean shutdown.
-#FixStaleSocket
+FixStaleSocket
 
 # TCP port address.
 #TCPSocket 3310
@@ -80,10 +80,6 @@ LocalSocket /tmp/clamd
 # Default is 15.
 #MaxConnectionQueueLength 30
 
-# When activated, input stream (see STREAM command) will be saved to disk before
-# scanning - this allows scanning within archives.
-#StreamSaveToDisk
-
 # Close the connection if this limit is exceeded.
 #StreamMaxLength 10M
 

clamav-devel/libclamav/clamav.h

@@ -69,7 +69,7 @@ extern "C"
 #define CL_SCAN_MAIL		2
 #define CL_SCAN_DISABLERAR	4
 #define CL_SCAN_OLE2		8
-#define CL_SCAN_ENCRYPTED	16
+#define CL_SCAN_BLOCKENCRYPTED	16
 #define CL_SCAN_HTML		32
 #define CL_SCAN_PE		64
 #define CL_SCAN_BROKEN		128

clamav-devel/libclamav/scanners.c

@@ -82,7 +82,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *
 #define SCAN_HTML	    (options & CL_SCAN_HTML)
 #define SCAN_PE		    (options & CL_SCAN_PE)
 #define DISABLE_RAR	    (options & CL_SCAN_DISABLERAR)
-#define DETECT_ENCRYPTED    (options & CL_SCAN_ENCRYPTED)
+#define DETECT_ENCRYPTED    (options & CL_SCAN_BLOCKENCRYPTED)
 #define BLOCKMAX	    (options & CL_SCAN_BLOCKMAX)
 
 #define MAX_MAIL_RECURSION  15
@@ -1108,14 +1108,17 @@ static int cli_scanmail(int desc, const char **virname, long int *scanned, const
 	dir = cli_gentemp(tmpdir);
 	if(mkdir(dir, 0700)) {
 	    cli_dbgmsg("Mail: Can't create temporary directory %s\n", dir);
+	    free(dir);
 	    return CL_ETMPDIR;
 	}
 
 	/*
 	 * Extract the attachments into the temporary directory
 	 */
-	if((ret = cli_mbox(dir, desc, options)))
+	if((ret = cli_mbox(dir, desc, options))) {
+	    free(dir);
 	    return ret;
+	}
 
 	ret = cli_scandir(dir, virname, scanned, root, limits, options, arec, mrec);
 

clamav-devel/shared/cfgparser.c

@@ -83,7 +83,6 @@ struct cfgstruct *parsecfg(const char *cfgfile, int messages)
 	    {"TCPSocket", OPT_NUM},
 	    {"LocalSocket", OPT_STR},
 	    {"MaxConnectionQueueLength", OPT_NUM},
-	    {"StreamSaveToDisk", OPT_NOARG},
 	    {"StreamMaxLength", OPT_COMPSIZE},
 	    {"MaxThreads", OPT_NUM},
 	    {"ReadTimeout", OPT_NUM},

clamav-devel/sigtool/options.c

@@ -51,6 +51,7 @@ int main(int argc, char **argv)
 	    {"tempdir", 1, 0, 0},
 	    {"hex-dump", 0, 0, 0},
 	    {"md5", 0, 0, 0},
+	    {"html-normalise", 1, 0, 0},
 	    {"build", 1, 0, 'b'},
 	    {"server", 1, 0, 0},
 	    {"unpack", 1, 0, 'u'},

clamav-devel/sigtool/sigtool.c

@@ -29,6 +29,8 @@
 #include <time.h>
 #include <locale.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
@@ -128,6 +130,18 @@ void sigtool(struct optstruct *opt)
 	    free(md5);
 	}
 
+    } else if(optl(opt, "html-normalise")) {
+	    int fd;
+
+	if((fd = open(getargl(opt, "html-normalise"), O_RDONLY)) == -1) {
+	    mprintf("Can't open file %s\n", getargl(opt, "html-normalise"));
+	    exit(1);
+	}
+
+	html_normalise_fd(fd, ".", NULL);
+
+	close(fd);
+
     } else if(optc(opt, 'b')) {
 	if(!optl(opt, "server")) {
 	    mprintf("!--server is required in this mode\n");
@@ -785,6 +799,7 @@ void help(void)
     mprintf("                                           string and print it on stdout\n");
     mprintf("    --md5 [FILES]                          generate MD5 checksum from stdin\n");
     mprintf("                                           or MD5 sigs for FILES\n");
+    mprintf("    --html-normalise=FILE                  create normalised parts of HTML file\n");
     mprintf("    --info=FILE            -i FILE         print database information\n");
     mprintf("    --build=NAME           -b NAME         build a CVD file\n");
     mprintf("    --server=ADDR                          ClamAV Signing Service address\n");