@@ -1,3 +1,11 @@

+Fri Feb 20 16:49:05 CET 2004 (tk)

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

+  * clamscan, freshclam: removed --log-verbose (but it's still accepted by the

+    option parser)

+  * libclamav: cli_rmdirs() fixed directory permission problem (reported by

+	       Brian J. France <list*firehawksystems.com> and Nigel)

+  * doc: clamscan, clamdscan and freshclam manual pages updated

+

 Fri Feb 20 14:55:32 GMT 2004 (trog)

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

   * libclamav/vba_extract.c: vba_decompress returns explicit data length

@@ -22,6 +22,7 @@

 #include <stdio.h>

 #include <stdlib.h>

+#include <string.h>

 #include <unistd.h>

 #include <sys/time.h>

 #include <sys/types.h>

@@ -186,7 +186,7 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 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, flags, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd, tmpd, bread, count;

+	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd, tmpd, bread, count;

 	long int size = 0, maxsize = 0;

 	short bound = 0;

 	char *virname, buff[32768];

@@ -21,7 +21,10 @@

 #include <errno.h>

 #include <signal.h>

 #include <stdio.h>

+#include <string.h>

 #include <time.h>

+#include <sys/types.h>

+#include <sys/socket.h>

 #include "server.h"

 #include "thrmgr.h"

@@ -83,8 +86,6 @@ void scanner_thread(void *arg)

 void sighandler_th(int sig)

 {

 	time_t currtime;

-	int maxwait = CL_DEFAULT_MAXWHILEWAIT * 5;

-	int i;

     switch(sig) {

 	case SIGINT:

@@ -183,7 +184,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	sigset_t sigset;

 	client_conn_t *client_conn;

 	struct cfgstruct *cpt;

-	char *buff[BUFFSIZE+1];

+	/* char *buff[BUFFSIZE+1]; */

 	unsigned int selfchk;

 	time_t start_time, current_time;

@@ -47,6 +47,7 @@

 #include <errno.h>

 #include "thrmgr.h"

+#include "others.h"

 /*

  * Thread start routine to serve the work queue.

@@ -80,9 +80,6 @@ void clamscan(struct optstruct *opt)

     /* initialize logger */

-    if(optl(opt, "log-verbose")) logverbose = 1;

-    else logverbose = 0;

-

     if(optc(opt, 'l')) {

 	logfile = getargc(opt, 'l');

 	if(logg("--------------------------------------\n")) {

@@ -104,9 +104,6 @@ void clamscan(struct optstruct *opt)

     /* initialize logger */

-    if(optl(opt, "log-verbose")) logverbose = 1;

-    else logverbose = 0;

-

     if(optc(opt, 'l')) {

 	logfile = getargc(opt, 'l');

 	if(logg("--------------------------------------\n")) {

@@ -203,8 +200,7 @@ void help(void)

     mprintf("    --tempdir=DIRECTORY                  create temporary files in DIRECTORY\n");

     mprintf("    --database=FILE/DIR   -d FILE/DIR    Load virus database from FILE or load\n");

     mprintf("                                         all .db and .db2 files from DIR\n");

-    mprintf("    --log=FILE            -l FILE        Save scan report in FILE\n");

-    mprintf("    --log-verbose                        Save additional informations\n");

+    mprintf("    --log=FILE            -l FILE        Save scan report to FILE\n");

     mprintf("    --recursive           -r             Scan directories recursively\n");

     mprintf("    --infected            -i             Print infected files only\n");

     mprintf("    --remove                             Remove infected files. Be careful.\n");

@@ -45,6 +45,10 @@ int main(int argc, char **argv)

 	const char *getopt_parameters = "hvd:wriVl:m";

 	static struct option long_options[] = {

+	    /* 

+	     * WARNING: For compatibility reasons options marked as "not used"

+	     *		must still be accepted !

+	     */

 	    {"help", 0, 0, 'h'},

 	    {"quiet", 0, 0, 0},

 	    {"verbose", 0, 0, 'v'},

@@ -61,7 +65,7 @@ int main(int argc, char **argv)

 	    {"no-summary", 0, 0, 0},

 	    {"infected", 0, 0, 'i'},

 	    {"log", 1, 0, 'l'},

-	    {"log-verbose", 0, 0, 0},

+	    {"log-verbose", 0, 0, 0}, /* not used */

 	    {"threads", 1, 0, 0}, /* not used */

 	    {"one-virus", 0, 0, 0}, /* not used */

 	    {"move", 1, 0, 0},

@@ -154,8 +154,7 @@ int logg(const char *str, ...)

 	    fprintf(fd, "WARNING: ");

 	    vfprintf(fd, ++str, args);

 	} else if(*str == '*') {

-	    if(logverbose)

-		vfprintf(fd, ++str, args);

+	    vfprintf(fd, ++str, args);

 	} else vfprintf(fd, str, args);

 	va_end(args);

@@ -32,7 +32,7 @@ struct s_info {

     long int blocks; /* number of read 16kb blocks */

 } claminfo;

-short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_stdout, logverbose, recursion, printinfected, bell;

+short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_stdout, recursion, printinfected, bell;

 const char *logfile;

 #endif

@@ -1,14 +1,14 @@

 .\" Manual page created by Tomasz Kojm, 20021121

-.TH "Clamd client" "1" "November 11, 2003" "Tomasz Kojm" "Clam AntiVirus"

+.TH "Clamd client" "1" "February 20, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 clamdscan \- scan files and directories against viruses using Clam AntiVirus Daemon

 .SH "SYNOPSIS"

 .LP 

-clamscan [options] [file/directory]

+clamdscan [options] [file/directory]

 .SH "DESCRIPTION"

 .LP 

-clamdscan is a simple clamd client, which may be used as a clamscan replacement. clamdscan accepts all the options implemented in clamscan. It's a part of the Clam AntiVirus package.

+clamdscan is a simple clamd client which may be used as a clamscan replacement. clamdscan accepts all the options implemented in clamscan but most of them will be ignored because its scanning abilities only depend on clamd. clamdscan is a part of the Clam AntiVirus package.

 .SH "OPTIONS"

 .LP 

@@ -28,6 +28,9 @@ Be quiet \- only output error messages.

 \fB\-\-stdout\fR

 Write all messages to the standard output (stdout) instead of the standard error output (stderr).

 .TP 

+\fB\-\-config\-file=FILE\fR

+Read clamd settings from FILE.

+.TP 

 \fB\-l FILE, \-\-log=FILE\fR

 Save the scan report to FILE.

 .TP 

@@ -64,4 +67,4 @@ Please check the full documentation for credits.

 Tomasz Kojm <tkojm@clamav.net>

 .SH "SEE ALSO"

 .LP 

-clamscan(1), clamd(8), freshclam(1), sigtool(1), clamav.conf(5), clamav\-milter(8)

+clamscan(1), clamd(8), freshclam(1), clamav.conf(5)

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

 .\" Manual page created by Tomasz Kojm, 14/15 IV 2002

-.TH "clamscan" "1" "January 13, 2004" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamscan" "1" "February 20, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 clamscan \- scan files and directories against viruses

@@ -8,43 +8,40 @@ clamscan \- scan files and directories against viruses

 clamscan [options] [file/directory/\-]

 .SH "DESCRIPTION"

 .LP 

-clamscan is a console anti\-virus scanner. It's a part of the Clam AntiVirus package.

+clamscan is a command line anti\-virus scanner. It's a part of the Clam AntiVirus package.

 .SH "OPTIONS"

 .LP 

 .TP 

 \fB\-h, \-\-help\fR

-Output help information and exit.

+Print help information and exit.

 .TP 

 \fB\-V, \-\-version\fR

-Print the version number and exit.

+Print version number and exit.

 .TP 

 \fB\-v, \-\-verbose\fR

 Be verbose.

 .TP 

 \fB\-\-debug\fR

-Enable debug messages (mainly from libclamav).

+Enable debug messages (from libclamav).

 .TP 

 \fB\-\-quiet\fR

-Be quiet \- output error messages only.

+Be quiet (only print error messages).

 .TP 

 \fB\-\-stdout\fR

-Write all messages to the standard output (stdout), instead of the standard error output (stderr). The buffer is automatically flushed (stdout unlike stderr is buffered), to avoid race conditions on output.

+Write all messages to the standard output (stdout) instead of the standard error output (stderr).

 .TP 

 \fB\-d FILE/DIR, \-\-database=FILE/DIR\fR

-Load the virus database from FILE or load all .db and .db2 files from DIR.

+Load virus database from FILE or load all virus database files from DIR.

 .TP 

 \fB\-l FILE, \-\-log=FILE\fR

-Save the scan report to FILE. By default the log isn't saved.

-.TP 

-\fB\-\-log\-verbose\fR

-Save an additional information (mostly needless) to the report file.

+Save scan report to FILE.

 .TP 

 \fB\-\-tempdir=DIRECTORY\fR

 Create temporary files in DIRECTORY. Directory must be writeable for the 'clamav' user or unprivileged user running clamscan.

 .TP 

 \fB\-r, \-\-recursive\fR

-Scan directories recursively. All the files in the given directory will be scanned. \fBThis option affects scanning subdirectories in archives, if you are using unpackers just turn it on.\fR

+Scan directories recursively. All the subdirectories in the given directory will be scanned.

 .TP 

 \fB\-\-bell\fR

 Sound bell on virus detection.

@@ -59,7 +56,7 @@ Don't scan file names containing PATT. It may be used multiple times.

 Only scan file names containing PATT. It may be used multiple times.

 .TP 

 \fB\-\-mbox\fR

-Enable scanning of Mbox, Maildir and raw mail files. (also treat stdin as a mailbox, for backward compatibility).

+Enable scanning of various mail file types (also treat stdin as a mailbox \- for backward compatibility).

 .TP 

 \fB\-i, \-\-infected\fR

 Only print infected files.

@@ -76,34 +73,34 @@ EXTRACTION OPTIONS:

 Disable archive support built in libclamav.

 .TP 

 \fB\-\-max\-files=#n\fR

-Extract first #n files from each archive. This option protects your system against DoS attacks.

+Extract first #n files from each archive. This option protects your system against DoS attacks (default: 500)

 .TP 

 \fB\-\-max\-space=#n\fR

-Extract first #n kilobytes from each archive. You may give the number in megabytes in format xM or xm, where x is a number.

+Extract first #n kilobytes from each archive. You may give the number in megabytes in format xM or xm, where x is a number. This option protects your system against DoS attacks (default: 10 MB)

 .TP 

 \fB\-\-max\-recursion=#n\fR

-Set archive recursion level limit.

+Set archive recursion level limit. This option protects your system against DoS attacks (default: 5).

 .TP 

 \fB\-\-unzip[=FULLPATH]\fR

-In most cases you don't need this option \- the built\-in unarchiver will do the work. This option however may be used as a backup for internal unpacker \- see clamdoc.pdf. When enabled without the argument, unzip program will be searched in $PATH. If unzip cannot be found in $PATH, you must supply it with =pathname. Remember about '=' between the option and the argument.

+In most cases you don't need this option \- the built\-in unarchiver will do extract Zip archives. This option however may be used as a backup for internal unpacker \- see the full documentation for more information. When enabled without an argument, unzip program will be searched in $PATH. If unzip cannot be found in $PATH, you must force it with =pathname. Remember about '=' between the option and an argument.

 .TP 

 \fB\-\-unrar[=FULLPATH]\fR

-Supports .rar files.

+Scan .rar files.

 .TP 

 \fB\-\-unace[=FULLPATH]\fR

-Supports .ace files.

+Scan .ace files.

 .TP 

 \fB\-\-unarj[=FULLPATH]\fR

-Supports .arj files.

+Scan .arj files.

 .TP 

 \fB\-\-unzoo[=FULLPATH]\fR

-Supports .zoo files.

+Scan .zoo files.

 .TP 

 \fB\-\-lha[=FULLPATH]\fR

-Supports .lzh files.

+Scan .lzh files.

 .TP 

 \fB\-\-jar[=FULLPATH]\fR

-clamscan uses unzip for .jar files, so optionally give a full path to unzip.

+clamscan uses unzip for .jar files, so optionally eventually you will need to pass a full path to unzip.

 .TP 

 \fB\-\-deb[=FULLPATH]\fR

 This option supports debian binary packages. Implies \-\-tgz, but doesn't conflict with \-\-tgz=FULLPATH. It requires ar utility.

@@ -112,15 +109,15 @@ This option supports debian binary packages. Implies \-\-tgz, but doesn't confli

 This option supports non\-compressed archives.

 .TP 

 \fB\-\-tgz[=FULLPATH]\fR

-This option supports tar.gz and .tgz files. You need GNU tar, on non\-Linux system you probably have it installed as gtar. If it's in $PATH, please use \-\-tgz=gtar in other case please use a full pathname.

+This option supports tar.gz and .tgz files. You need GNU tar, on non\-Linux system you probably have it installed as gtar. If it's in $PATH, please use \-\-tgz=gtar in other case please pass a full path.

 .SH "EXAMPLES"

 .LP 

 .TP 

-(0) Scan a selected file:

+(0) Scan selected file:

 \fBclamscan file\fR

 .TP 

-(1) Scan a current working directory:

+(1) Scan current working directory:

 \fBclamscan\fR

 .TP 

@@ -128,20 +125,20 @@ This option supports tar.gz and .tgz files. You need GNU tar, on non\-Linux syst

 \fBclamscan \-r /home\fR

 .TP 

-(3) Load the database from selected file and limit a disk usage to 50 Mb:

+(3) Load database from selected file and limit disk usage to 50 Mb:

 \fBclamscan \-d /tmp/newclamdb \-\-max\-space=50m \-r /tmp\fR

 .TP 

-(4) Scan a data stream:

+(4) Scan data stream:

 \fBcat testfile | clamscan \-\fR

 .TP 

-(5) Scan a mail spool directory:

+(5) Scan mail spool directory:

 \fBclamscan \-r \-\-mbox /var/spool/mail\fR

 .SH "RETURN CODES"

 .LP 

-Note: some return codes may only appear in a one file mode (clamscan is started with file argument). These ones are marked with \fB(ofm)\fR.

+Note: some return codes may only appear in a one file mode (clamscan is started with file argument). Those are marked with \fB(ofm)\fR.

 0 : No virus found.

 .TP 

@@ -151,8 +148,6 @@ Note: some return codes may only appear in a one file mode (clamscan is started

 .TP 

 50: Database initialization error.

 .TP 

-51: Wrong number of threads given.

-.TP 

 52: Not supported file type.

 .TP 

 53: Can't open directory.

@@ -163,9 +158,9 @@ Note: some return codes may only appear in a one file mode (clamscan is started

 .TP 

 56: Can't stat input file / directory.

 .TP 

-57: Can't get absolute pathname of current working directory.

+57: Can't get absolute path name of current working directory.

 .TP 

-58: I/O error, check your filesystem.

+58: I/O error, please check your filesystem.

 .TP 

 59: Can't get information about current user from /etc/passwd.

 .TP 

@@ -175,7 +170,7 @@ Note: some return codes may only appear in a one file mode (clamscan is started

 .TP 

 63: Can't create temporary files/directories (check permissions).

 .TP 

-64: Can't write to temporary directory, please specify another one.

+64: Can't write to temporary directory (please specify another one).

 .TP 

 70: Can't allocate and clear memory (calloc).

 .TP 

@@ -187,4 +182,4 @@ Please check the full documentation for credits.

 Tomasz Kojm <tkojm@clamav.net>

 .SH "SEE ALSO"

 .LP 

-clamd(8), clamdscan(1), freshclam(1), sigtool(1), clamav.conf(5), clamav\-milter(8)

+clamdscan(1), freshclam(1)

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

 .\" Manual page created by Tomasz Kojm, 20020415

-.TH "freshclam" "1" "November 11, 2003" "Tomasz Kojm" "Clam AntiVirus"

+.TH "freshclam" "1" "February 20, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 freshclam \- update virus databases

@@ -11,7 +11,7 @@ freshclam [options]

 freshclam updates the virus database. It's a part of the Clam AntiVirus package. It requires an Internet connection.

 .SH "OPTIONS"

 .LP 

-

+Freshclam reads its configuration from freshclam.conf. The settings will be overwritten with command line options.

 .TP 

 \fB\-h, \-\-help\fR

 Output help information and exit.

@@ -31,11 +31,8 @@ Write all messages to the standard output (stdout), instead of the standard erro

 \fB\-l FILE, \-\-log=FILE\fR

 Save download report in FILE.

 .TP 

-\fB\-\-log\-verbose\fR

-Save additional information (mostly needless) to the report file.

-.TP 

 \fB\-\-datadir=DIRECTORY\fR

-Install downloaded database in DIRECTORY. The directory must be writeable for the 'clamav' user or unprivileged user running freshclam.

+Install new database in DIRECTORY. The directory must be writeable for the 'clamav' user or unprivileged user running freshclam.

 .TP 

 \fB\-u USER, \-\-user USER\fR

 Run as USER. By default (when started by root) freshclam drops privileges and works as the 'clamav' user.

@@ -44,13 +41,7 @@ Run as USER. By default (when started by root) freshclam drops privileges and wo

 Run in a daemon mode. This option requires \-\-checks.

 .TP 

 \fB\-c #n, \-\-checks=#n\fR

-Check #n times pet day for new database. #n must be between 1 and 50.

-.TP 

-\fB\-\-http\-proxy=hostname[:port]\fR

-Connect via a proxy server.

-.TP 

-\fB\-\-proxy\-user=user:password\fR

-Do proxy authorization for user. Password is required.

+Check #n times day for new database. #n must be between 1 and 50.

 .TP 

 \fB\-\-daemon\-notify=/path/to/clamav.conf\fR

 Notify the daemon about the new database. By default it reads a hardcoded config file but you can use an another one. Both local and TCP sockets are supported.

@@ -101,4 +92,4 @@ Please check the full documentation for credits.

 Tomasz Kojm <tk@clamav.net>

 .SH "SEE ALSO"

 .LP 

-clamd(8), clamdscan(1), clamscan(1), sigtool(1), clamav.conf(5), clamav\-milter(8)

+clamd(8), clamdscan(1), clamscan(1), sigtool(1), clamav.conf(5)

@@ -169,11 +169,6 @@ int freshclam(struct optstruct *opt)

     /* initialize logger */

-    if(optl(opt, "log-verbose") || cfgopt(copt, "LogVerbose"))

-	logverbose = 1;

-    else

-	logverbose = 0;

-

     if(optc(opt, 'l')) {

 	logfile = getargc(opt, 'l');

 	if(logg("--------------------------------------\n")) {

@@ -369,7 +364,6 @@ void help(void)

     mprintf("\n");

     mprintf("    --config-file=FILE                   read configuration from FILE.\n");

     mprintf("    --log=FILE           -l FILE         log into FILE\n");

-    mprintf("    --log-verbose                        log additional information\n");

     mprintf("    --daemon             -d              run in daemon mode\n");

     mprintf("    --pid                -p FILE         save daemon's pid in FILE\n");

     mprintf("    --user=USER          -u USER         run as USER\n");

@@ -37,6 +37,10 @@ int main(int argc, char **argv)

 	const char *getopt_parameters = "hvdp:Vl:c:u:";

 	static struct option long_options[] = {

+	    /* 

+	     * WARNING: For compatibility reasons options marked as "not used"

+	     *		must still be accepted !

+	     */

 	    {"help", 0, 0, 'h'},

 	    {"quiet", 0, 0, 0},

 	    {"verbose", 0, 0, 'v'},

@@ -44,7 +48,7 @@ int main(int argc, char **argv)

 	    {"version", 0, 0, 'V'},

 	    {"datadir", 1, 0, 0},

 	    {"log", 1, 0, 'l'},

-	    {"log-verbose", 0, 0, 0},

+	    {"log-verbose", 0, 0, 0}, /* not used */

 	    {"stdout", 0, 0, 0},

 	    {"daemon", 0, 0, 'd'},

 	    {"pid", 1, 0, 'p'},

@@ -327,6 +327,8 @@ int cli_rmdirs(const char *dirname)

 	struct stat maind, statbuf;

 	char *fname;

+

+    chmod(dirname, 0700);

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

 	while(stat(dirname, &maind) != -1) {

 	    if(!rmdir(dirname)) break;