@@ -1,3 +1,9 @@

+Thu Mar 11 00:16:11 CET 2004 (tk)

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

+  * libclamav: rar support: due to a bug only first file in archive was

+	       scanned. Fixed and improved by Dirk Mueller <dmuell*gmx.net>.

+  * freshclam, clamscan: fixed logfile permissions (Dirk Mueller)

+

 Wed Mar 10 22:14:45 GMT 2004 (njh)

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

   * libclamav/mbox.c:	Fixed segfault which happens when a UNIX mailbox

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

 	pthread_mutex_lock(&logg_mutex);

 	if(!log_fd) {

-	    old_umask = umask(0036);

+	    old_umask = umask(0037);

 	    if((log_fd = fopen(logfile, "a")) == NULL) {

 		umask(old_umask);

 		pthread_mutex_unlock(&logg_mutex);

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

 /*

- *  Copyright (C) 1999-2003 Tomasz Kojm <zolw@konarski.edu.pl>

- *			    Magnus Ekdahl <magnus@debian.org>

+ *  Copyright (C) 1999 - 2004 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

@@ -127,6 +126,8 @@ int logg(const char *str, ...)

 {

 	va_list args;

 	static FILE *fd = NULL;

+	mode_t old_umask;

+

     if(logfile) {

@@ -136,10 +137,13 @@ int logg(const char *str, ...)

 	    fd = NULL;

 	}

 	if(!fd) {

+            old_umask = umask(0037);

 	    if((fd = fopen(logfile, "a")) == NULL) {

+                umask(old_umask);

 		mprintf("!LOGGER: Can't open %s for writing: %s.\n", logfile, strerror(errno));

 		return 1;

 	    }

+	    umask(old_umask);

 	}

 	if (str == NULL) {

 	    return 0;

@@ -172,7 +176,7 @@ void *mmalloc(size_t size)

     alloc = malloc(size);

     if(!alloc) {

-	printf("CRITICAL: Can't allocate memory (%ld bytes).\n", size);

+	printf("CRITICAL: Can't allocate memory (%ld bytes).\n", (long int) size);

 	exit(71);

 	return NULL;

     } else return alloc;

@@ -185,7 +189,7 @@ void *mcalloc(size_t nmemb, size_t size)

     alloc = calloc(nmemb, size);

     if(!alloc) {

-	printf("CRITICAL: Can't allocate memory (%ld bytes).\n", nmemb * size);

+	printf("CRITICAL: Can't allocate memory (%ld bytes).\n", (long int) nmemb * size);

 	exit(70);

 	return NULL;

     } else return alloc;

@@ -116,14 +116,14 @@ struct cl_cvd {

 /* file scanning */

 extern int cl_scanbuff(const char *buffer, unsigned int length, char **virname, const struct cl_node *root);

-extern int cl_scandesc(int desc, char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options);

+extern int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options);

-extern int cl_scanfile(const char *filename, char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options);

+extern int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options);

 /* database loading */

 extern int cl_loaddb(const char *filename, struct cl_node **root, int *virnum);

 extern int cl_loaddbdir(const char *dirname, struct cl_node **root, int *virnum);

-extern char *cl_retdbdir(void);

+extern const char *cl_retdbdir(void);

 extern int cl_retflevel(void);

 extern struct cl_cvd *cl_cvdhead(const char *file);

@@ -144,8 +144,8 @@ extern int cl_buildtrie(struct cl_node *root);

 extern void cl_freetrie(struct cl_node *root);

-extern char *cl_strerror(int clerror);

-extern char *cl_perror(int clerror); /* deprecated */

+extern const char *cl_strerror(int clerror);

+extern const char *cl_perror(int clerror); /* deprecated */

 extern char *cl_md5buff(const char *buffer, unsigned int length);

@@ -90,7 +90,7 @@ int cl_retflevel(void)

     return CL_FLEVEL;

 }

-char *cl_strerror(int clerror)

+const char *cl_strerror(int clerror)

 {

     switch(clerror) {

 	case CL_CLEAN:

@@ -142,7 +142,7 @@ char *cl_strerror(int clerror)

     }

 }

-char *cl_perror(int clerror)

+const char *cl_perror(int clerror)

 {

     return cl_strerror(clerror);

 }

@@ -291,7 +291,8 @@ unsigned int cl_rndnum(unsigned int max)

 /* it uses MD5 to avoid potential races in tmp */

 char *cl_gentemp(const char *dir)

 {

-	char *name, *mdir, *tmp;

+	char *name, *tmp;

+        const char *mdir;

 	unsigned char salt[32];

 	int cnt=0, i;

 	struct stat foo;

@@ -312,7 +313,7 @@ char *cl_gentemp(const char *dir)

 	for(i = 0; i < 32; i++)

 	    salt[i] = cl_rndnum(255);

-	tmp = cl_md5buff(salt, 32);

+	tmp = cl_md5buff(( char* ) salt, 32);

 	strncat(name, tmp, 16);

 	free(tmp);

     } while(stat(name, &foo) != -1);

@@ -38,7 +38,7 @@

 #include "str.h"

 #include "defaults.h"

-int cli_parse_add(struct cl_node *root, const char *virname, const char *hexstr, int sigid, int parts, int partno)

+static int cli_parse_add(struct cl_node *root, const char *virname, const char *hexstr, int sigid, int parts, int partno)

 {

 	struct cli_patt *new;

 	const char *pt;

@@ -170,7 +170,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	    (*root)->partsigs++;

 	    sigid++;

 	    parts = 0;

-	    for(i = 0; i < strlen(pt); i++)

+	    for(i = 0; i < (int) strlen(pt); i++)

 		if(pt[i] == '*')

 		    parts++;

@@ -218,7 +218,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

     return 0;

 }

-char *cl_retdbdir(void)

+const char *cl_retdbdir(void)

 {

     return DATADIR;

 }

@@ -70,9 +70,9 @@ typedef enum {

 struct cl_magic_s {

     int offset;

-    char *magic;

+    const char *magic;

     size_t length;

-    char *descr;

+    const char *descr;

     cl_file_t type;

 };

@@ -97,7 +97,7 @@ static const struct cl_magic_s cl_magic[] = {

     {-1, NULL,              0, NULL,              CL_UNKNOWN_TYPE}

 };

-cl_file_t cl_filetype(const char *buf, size_t buflen)

+static cl_file_t cl_filetype(const char *buf, size_t buflen)

 {

 	int i;

@@ -113,9 +113,9 @@ cl_file_t cl_filetype(const char *buf, size_t buflen)

     return CL_UNKNOWN_TYPE;

 }

-int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

+static int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

-int cli_scandesc(int desc, char **virname, long int *scanned, const struct 

+static int cli_scandesc(int desc, const char **virname, long int *scanned, const struct 

 cl_node *root)

 {

  	char *buffer, *buff, *endbl, *pt;

@@ -163,18 +163,19 @@ cl_node *root)

 }

 #ifdef CL_THREAD_SAFE

-void cli_unlock_mutex(void *mtx)

+static void cli_unlock_mutex(void *mtx)

 {

     cli_dbgmsg("Pthread cancelled. Unlocking mutex.\n");

     pthread_mutex_unlock(mtx);

 }

 #endif

-int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scanrar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	FILE *tmp = NULL;

 	int files = 0, fd, ret = CL_CLEAN;

 	ArchiveList_struct *rarlist = NULL;

+	ArchiveList_struct *rarlist_head = NULL;

 	char *rar_data_ptr;

 	unsigned long rar_data_size;

@@ -195,6 +196,8 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 	return CL_ERAR;

     }

+    rarlist_head = rarlist;

+

     while(rarlist) {

 	if(limits) {

@@ -213,6 +216,12 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 	    }

 	}

+        if(!!( rarlist->item.FileAttr & RAR_FENTRY_ATTR_DIRECTORY)) {

+            rarlist = rarlist->next;

+            files++;

+            continue;

+        }

+

 	if((tmp = tmpfile()) == NULL) {

 	    cli_dbgmsg("RAR -> Can't generate tmpfile().\n");

 #ifdef CL_THREAD_SAFE

@@ -223,9 +232,9 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 	}

 	fd = fileno(tmp);

-	if(urarlib_get(&rar_data_ptr, &rar_data_size, rarlist->item.Name, desc, "clam")) {

+	if( urarlib_get(&rar_data_ptr, &rar_data_size, rarlist->item.Name, desc, "clam")) {

 	    cli_dbgmsg("RAR -> Extracted: %s, size: %d\n", rarlist->item.Name, rar_data_size);

-	    if(fwrite(rar_data_ptr, rar_data_size, 1, tmp) != 1) {

+	    if(fwrite(rar_data_ptr, 1, rar_data_size, tmp) != rar_data_size) {

 		cli_dbgmsg("RAR -> Can't write() file.\n");

 		fclose(tmp);

 		tmp = NULL;

@@ -244,7 +253,7 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 	    if(fflush(tmp) != 0) {

 		cli_dbgmsg("fflush() failed: %s\n", strerror(errno));

 		fclose(tmp);

-		urarlib_freelist(rarlist);

+		urarlib_freelist(rarlist_head);

 #ifdef CL_THREAD_SAFE

 		pthread_mutex_unlock(&cli_scanrar_mutex);

 		cli_scanrar_inuse = 0;

@@ -253,9 +262,8 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 	    }

 	    lseek(fd, 0, SEEK_SET);

-	    if((ret = cli_magic_scandesc(fd, virname, scanned, root, limits, options, reclev)) == CL_CLEAN ) {

-		if(ret == CL_VIRUS)

-		    cli_dbgmsg("RAR -> Found %s virus.\n", *virname);

+	    if((ret = cli_magic_scandesc(fd, virname, scanned, root, limits, options, reclev)) == CL_VIRUS ) {

+		cli_dbgmsg("RAR -> Found %s virus.\n", *virname);

 		fclose(tmp);

 		urarlib_freelist(rarlist);

@@ -263,7 +271,7 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 		pthread_mutex_unlock(&cli_scanrar_mutex);

 		cli_scanrar_inuse = 0;

 #endif

-		return ret;

+  		return ret;

 	    }

 	} else {

@@ -279,7 +287,7 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 	files++;

     }

-    urarlib_freelist(rarlist);

+    urarlib_freelist(rarlist_head);

 #ifdef CL_THREAD_SAFE

     pthread_mutex_unlock(&cli_scanrar_mutex);

     cli_scanrar_inuse = 0;

@@ -289,7 +297,7 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod

 }

 #ifdef HAVE_ZLIB_H

-int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	ZZIP_DIR *zdir;

 	ZZIP_DIRENT zdirent;

@@ -441,7 +449,7 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod

     return ret;

 }

-int cli_scangzip(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scangzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	int fd, bytes, ret = CL_CLEAN;

 	long int size = 0;

@@ -475,7 +483,7 @@ int cli_scangzip(int desc, char **virname, long int *scanned, const struct cl_no

 	if(limits)

 	    if(limits->maxfilesize && (size + FILEBUFF > limits->maxfilesize)) {

-		cli_dbgmsg("Gzip->desc(%d): Size exceeded (stopped at %d, max: %d)\n", desc, size, limits->maxfilesize);

+		cli_dbgmsg("Gzip->desc(%d): Size exceeded (stopped at %ld, max: %ld)\n", desc, size, limits->maxfilesize);

 		/* ret = CL_EMAXSIZE; */

 		break;

 	    }

@@ -517,7 +525,7 @@ int cli_scangzip(int desc, char **virname, long int *scanned, const struct cl_no

 #define BZ2_bzRead bzRead

 #endif

-int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	int fd, bytes, ret = CL_CLEAN, bzerror = 0;

 	short memlim = 0;

@@ -563,7 +571,7 @@ int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_no

 	if(limits)

 	    if(limits->maxfilesize && (size + FILEBUFF > limits->maxfilesize)) {

-		cli_dbgmsg("Bzip2->desc(%d): Size exceeded (stopped at %d, max: %d)\n", desc, size, limits->maxfilesize);

+		cli_dbgmsg("Bzip2->desc(%d): Size exceeded (stopped at %ld, max: %ld)\n", desc, size, limits->maxfilesize);

 		/* ret = CL_EMAXSIZE; */

 		break;

 	    }

@@ -598,7 +606,7 @@ int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_no

 }

 #endif

-int cli_scanole2(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scanole2(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	const char *tmpdir;

 	char *dir, *fullname;

@@ -674,7 +682,7 @@ int cli_scanole2(int desc, char **virname, long int *scanned, const struct cl_no

 	free(dir);

 	return ret;

 }

-int cli_scandir(char *dirname, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scandir(char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	DIR *dd;

 	struct dirent *dent;

@@ -716,7 +724,7 @@ int cli_scandir(char *dirname, char **virname, long int *scanned, const struct c

     return 0;

 }

-int cli_scanmail(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_scanmail(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	const char *tmpdir;

 	char *dir;

@@ -758,7 +766,7 @@ int cli_scanmail(int desc, char **virname, long int *scanned, const struct cl_no

 	return ret;

 }

-int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+static int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

 {

 	char magic[MAGIC_BUFFER_SIZE+1];

 	int ret = CL_CLEAN;

@@ -816,13 +824,13 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct

 		}

 		break;

-#ifdef HAVE_BZLIB_H

 	    case CL_BZFILE:

+#ifdef HAVE_BZLIB_H

 		if(SCAN_ARCHIVE) {

 		    ret = cli_scanbzip(desc, virname, scanned, root, limits, options, reclev);

 		}

-		break;

 #endif

+		break;

 	    case CL_MAILFILE:

 		if (SCAN_MAIL) {

@@ -834,6 +842,7 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct

 		if(SCAN_OLE2) {

 		    ret = cli_scanole2(desc, virname, scanned, root, limits, options, reclev);

 		}

+            case CL_UNKNOWN_TYPE:

 		break;

 	}

@@ -851,14 +860,14 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct

     return ret;

 }

-int cl_scandesc(int desc, char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options)

+int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options)

 {

 	int reclev = 0;

     return cli_magic_scandesc(desc, virname, scanned, root, limits, options, &reclev);

 }

-int cl_scanfile(const char *filename, char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options)

+int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options)

 {

 	int fd, ret;

@@ -105,6 +105,7 @@ typedef unsigned short   UWORD;

 typedef unsigned long    UDWORD;

 #endif

+#define RAR_FENTRY_ATTR_DIRECTORY ( 0x10 | 0x4000 )

 /* This structure is used for listing archive content                       */

 struct RAR20_archive_entry                  /* These infos about files are  */