@@ -1,3 +1,10 @@

+Mon Dec 29 06:19:54 CET 2003 (tk)

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

+  * freshclam: it's now configurable via freshclam.conf (which may be merged

+	       with clamav.conf). The old command line options are accepted

+	       but most of them will have no effect. WARNING: Some things

+	       may be temporary broken.

+

 Sat Dec 27 17:29:30 GMT 2003 (njh)

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

   * clamav-devel: Moved --sign data to private area

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.15 2003/12/08 18:57:39 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.16 2003/12/29 05:31:52 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.15 2003/12/08 18:57:39 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.16 2003/12/29 05:31:52 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -41,7 +41,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"LogFileUnlock", OPT_NOARG},

 	    {"LogFileMaxSize", OPT_COMPSIZE},

 	    {"LogTime", OPT_NOARG},

-	    {"LogVerbose", OPT_NOARG},

+	    {"LogVerbose", OPT_NOARG}, /* clamd + freshclam */

 	    {"LogSyslog", OPT_NOARG},

 	    {"PidFile", OPT_STR},

 	    {"MaxFileSize", OPT_COMPSIZE},

@@ -53,7 +53,8 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"ArchiveMaxFiles", OPT_NUM},

 	    {"ArchiveMaxCompressionRatio", OPT_NUM},

 	    {"ArchiveLimitMemoryUsage", OPT_NOARG},

-	    {"DataDirectory", OPT_STR},

+	    {"DataDirectory", OPT_STR}, /* obsolete */

+	    {"DatabaseDirectory", OPT_STR}, /* clamd + freshclam */

 	    {"TCPAddr", OPT_STR},

 	    {"TCPSocket", OPT_NUM},

 	    {"LocalSocket", OPT_STR},

@@ -81,12 +82,23 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"ClamukoExcludePath", OPT_STR},

 	    {"ClamukoMaxFileSize", OPT_COMPSIZE},

 	    {"ClamukoScanArchive", OPT_NOARG},

+	    {"DatabaseOwner", OPT_STR}, /* freshclam */

+	    {"Checks", OPT_NUM}, /* freshclam */

+	    {"UpdateLogFile", OPT_STR}, /* freshclam */

+	    {"DatabaseMirror", OPT_STR}, /* freshclam */

+	    {"MaxAttempts", OPT_NUM}, /* freshclam */

+	    {"HTTPProxyServer", OPT_STR}, /* freshclam */

+	    {"HTTPProxyPort", OPT_STR}, /* freshclam */

+	    {"HTTPProxyUsername", OPT_STR}, /* freshclam */

+	    {"HTTPProxyPassword", OPT_STR}, /* freshclam */

+	    {"NotifyClamd", OPT_OPTARG}, /* freshclam */

+	    {"OnUpdateExecute", OPT_FULLSTR}, /* freshclam */

+	    {"OnErrorExecute", OPT_FULLSTR}, /* freshclam */

 	    {0, 0}

 	};

     if((fs = fopen(cfgfile, "r")) == NULL) {

-	fprintf(stderr, "ERROR: Can't open config file %s !\n", cfgfile);

 	return NULL;

     }

@@ -70,7 +70,7 @@ void clamd(struct optstruct *opt)

 	cfgfile = CL_DEFAULT_CFG;

     if((copt = parsecfg(cfgfile)) == NULL) {

-	fprintf(stderr, "ERROR: Can't parse the config file %s\n", cfgfile);

+	fprintf(stderr, "ERROR: Can't open/parse the config file %s\n", cfgfile);

 	exit(1);

     }

@@ -170,7 +170,7 @@ void clamd(struct optstruct *opt)

     /* load the database(s) */

-    if((cpt = cfgopt(copt, "DataDirectory")))

+    if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

 	dbdir = cpt->strarg;

     else

 	dbdir = cl_retdbdir();

@@ -113,7 +113,7 @@ int acceptloop_proc(int socketd, struct cl_node *root, const struct cfgstruct *c

     logg("Maximal number of childs: %d\n", childs);

     session = (int *) mcalloc(childs, sizeof(int));

-    if((cpt = cfgopt(copt, "DataDirectory")))

+    if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

 	dbdir = cpt->strarg;

     else

         dbdir = cl_retdbdir();

@@ -165,7 +165,7 @@ void *threadwatcher(void *arg)

     } else

 	logg("Timeout set to %d seconds.\n", timeout);

-    if((cpt = cfgopt(thwarg->copt, "DataDirectory")))

+    if((cpt = cfgopt(thwarg->copt, "DatabaseDirectory")) || (cpt = cfgopt(thwarg->copt, "DataDirectory")))

 	dbdir = cpt->strarg;

     else

 	dbdir = cl_retdbdir();

@@ -9294,11 +9294,21 @@ _ACEOF

 if test ! -r "$cfg_dir/clamav.conf"; then

-  INSTALL_CONF_TRUE=

-  INSTALL_CONF_FALSE='#'

+  INSTALL_CLAMAV_CONF_TRUE=

+  INSTALL_CLAMAV_CONF_FALSE='#'

 else

-  INSTALL_CONF_TRUE='#'

-  INSTALL_CONF_FALSE=

+  INSTALL_CLAMAV_CONF_TRUE='#'

+  INSTALL_CLAMAV_CONF_FALSE=

+fi

+

+

+

+if test ! -r "$cfg_dir/freshclam.conf"; then

+  INSTALL_FRESHCLAM_CONF_TRUE=

+  INSTALL_FRESHCLAM_CONF_FALSE='#'

+else

+  INSTALL_FRESHCLAM_CONF_TRUE='#'

+  INSTALL_FRESHCLAM_CONF_FALSE=

 fi

@@ -10228,10 +10238,17 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.

 Usually this means the macro was only invoked conditionally." >&2;}

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

 fi

-if test -z "${INSTALL_CONF_TRUE}" && test -z "${INSTALL_CONF_FALSE}"; then

-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_CONF\" was never defined.

+if test -z "${INSTALL_CLAMAV_CONF_TRUE}" && test -z "${INSTALL_CLAMAV_CONF_FALSE}"; then

+  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_CLAMAV_CONF\" was never defined.

+Usually this means the macro was only invoked conditionally." >&5

+echo "$as_me: error: conditional \"INSTALL_CLAMAV_CONF\" was never defined.

+Usually this means the macro was only invoked conditionally." >&2;}

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

+fi

+if test -z "${INSTALL_FRESHCLAM_CONF_TRUE}" && test -z "${INSTALL_FRESHCLAM_CONF_FALSE}"; then

+  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_FRESHCLAM_CONF\" was never defined.

 Usually this means the macro was only invoked conditionally." >&5

-echo "$as_me: error: conditional \"INSTALL_CONF\" was never defined.

+echo "$as_me: error: conditional \"INSTALL_FRESHCLAM_CONF\" was never defined.

 Usually this means the macro was only invoked conditionally." >&2;}

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

 fi

@@ -10794,8 +10811,10 @@ s,@CPP@,$CPP,;t t

 s,@LIBTOOL@,$LIBTOOL,;t t

 s,@DBDIR@,$DBDIR,;t t

 s,@CFGDIR@,$CFGDIR,;t t

-s,@INSTALL_CONF_TRUE@,$INSTALL_CONF_TRUE,;t t

-s,@INSTALL_CONF_FALSE@,$INSTALL_CONF_FALSE,;t t

+s,@INSTALL_CLAMAV_CONF_TRUE@,$INSTALL_CLAMAV_CONF_TRUE,;t t

+s,@INSTALL_CLAMAV_CONF_FALSE@,$INSTALL_CLAMAV_CONF_FALSE,;t t

+s,@INSTALL_FRESHCLAM_CONF_TRUE@,$INSTALL_FRESHCLAM_CONF_TRUE,;t t

+s,@INSTALL_FRESHCLAM_CONF_FALSE@,$INSTALL_FRESHCLAM_CONF_FALSE,;t t

 s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t

 s,@CLAMD_LIBS@,$CLAMD_LIBS,;t t

 s,@FRESHCLAM_LIBS@,$FRESHCLAM_LIBS,;t t

@@ -196,7 +196,8 @@ AC_SUBST(CFGDIR)

 AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",)

 dnl Do not overwrite the current config file

-AM_CONDITIONAL(INSTALL_CONF, test ! -r "$cfg_dir/clamav.conf")

+AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf")

+AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf")

 if test "$test_urandom" = "yes"

 then

@@ -17,12 +17,14 @@

 #  along with this program; if not, write to the Free Software

 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-EXTRA_DIST = clamav.conf

+EXTRA_DIST = clamav.conf freshclam.conf

 CFGINST = @CFGDIR@

-if INSTALL_CONF

-

 install:

 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)

+if INSTALL_CLAMAV_CONF

 	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)

 endif

+if INSTALL_FRESHCLAM_CONF

+	@$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST)

+endif

@@ -117,7 +117,7 @@ am__include = @am__include@

 am__quote = @am__quote@

 install_sh = @install_sh@

-EXTRA_DIST = clamav.conf

+EXTRA_DIST = clamav.conf freshclam.conf

 CFGINST = @CFGDIR@

 subdir = etc

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -176,8 +176,6 @@ check: check-am

 all-am: Makefile

 installdirs:

-

-@INSTALL_CONF_FALSE@install: install-am

 install-exec: install-exec-am

 install-data: install-data-am

 uninstall: uninstall-am

@@ -247,9 +245,10 @@ uninstall-am: uninstall-info-am

 	mostlyclean-libtool uninstall uninstall-am uninstall-info-am

-@INSTALL_CONF_TRUE@install:

-@INSTALL_CONF_TRUE@	$(mkinstalldirs) $(DESTDIR)$(CFGINST)

-@INSTALL_CONF_TRUE@	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)

+install:

+	$(mkinstalldirs) $(DESTDIR)$(CFGINST)

+@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)

+@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST)

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT:

@@ -39,10 +39,10 @@ Example

 # daemon (main thread).

 #PidFile /var/run/clamd.pid

-# Path to a directory containing .db files.

+# Path to the database directory.

 # Default is the hardcoded directory (mostly /usr/local/share/clamav,

-# it depends on installation options).

-#DataDirectory /var/lib/clamav

+# but it depends on installation options).

+#DatabaseDirectory /var/lib/clamav

 # The daemon works in local or network mode. Currently the local mode is

 # recommended for security reasons.

new file mode 100644

@@ -0,0 +1,34 @@

+##

+## Example config file for freshclam

+## Please read the clamav.conf(5) manual before editing this file.

+##

+

+# Comment or remove the line below.

+Example

+

+# Path to the database directory.

+#DatabaseDirectory /var/lib/clamav

+

+#UpdateLogFile /var/log/freshclam.log

+

+# Enable verbose logging.

+#LogVerbose

+

+# Freshclam must be able to write to the database directory.

+#DatabaseOwner clamav

+

+DatabaseMirror database.clamav.net

+MaxAttempts 3

+

+#Checks 12

+

+#HTTPProxyServer myproxy.com

+#HTTPProxyPort 1234

+#HTTPProxyUsername myusername

+#HTTPProxyPassword mypass

+

+#NotifyClamd [/optional/config/file/path]

+

+#OnUpdateExecute command

+

+#OnErrorExecute command

deleted file mode 100644

@@ -1,273 +0,0 @@

-/*

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

- *

- *  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

- *  the Free Software Foundation; either version 2 of the License, or

- *  (at your option) any later version.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

- */

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <ctype.h>

-

-#include "options.h"

-#include "cfgfile.h"

-#include "others.h"

-#include "defaults.h"

-

-

-struct cfgstruct *parsecfg(const char *cfgfile)

-{

-	char buff[LINE_LENGTH], *name, *arg;

-	FILE *fs;

-	int line = 0, i, found, ctype, calc;

-	struct cfgstruct *copt = NULL;

-	struct cfgoption *pt;

-

-	struct cfgoption cfg_options[] = {

-	    {"LogFile", OPT_STR},

-	    {"LogFileUnlock", OPT_NOARG},

-	    {"LogFileMaxSize", OPT_COMPSIZE},

-	    {"LogTime", OPT_NOARG},

-	    {"LogVerbose", OPT_NOARG},

-	    {"LogSyslog", OPT_NOARG},

-	    {"PidFile", OPT_STR},

-	    {"MaxFileSize", OPT_COMPSIZE},

-	    {"ScanMail", OPT_NOARG},

-	    {"ScanArchive", OPT_NOARG},

-	    {"ArchiveMaxFileSize", OPT_COMPSIZE},

-	    {"ArchiveMaxRecursion", OPT_NUM},

-	    {"ArchiveMaxFiles", OPT_NUM},

-	    {"ArchiveLimitMemoryUsage", OPT_NOARG},

-	    {"DataDirectory", OPT_STR},

-	    {"TCPSocket", OPT_NUM},

-	    {"LocalSocket", OPT_STR},

-	    {"MaxConnectionQueueLength", OPT_NUM},

-	    {"StreamSaveToDisk", OPT_NOARG},

-	    {"StreamMaxLength", OPT_COMPSIZE},

-	    {"MaxThreads", OPT_NUM},

-	    {"ThreadTimeout", OPT_NUM},

-	    {"MaxDirectoryRecursion", OPT_NUM},

-	    {"FollowDirectorySymlinks", OPT_NOARG},

-	    {"FollowFileSymlinks", OPT_NOARG},

-	    {"Foreground", OPT_NOARG},

-	    {"Debug", OPT_NOARG},

-	    {"FixStaleSocket", OPT_NOARG},

-	    {"User", OPT_STR},

-	    {"AllowSupplementaryGroups", OPT_NOARG},

-	    {"SelfCheck", OPT_NUM},

-	    {"VirusEvent", OPT_FULLSTR},

-	    {"ClamukoScanOnLine", OPT_NOARG},

-	    {"ClamukoScanOnOpen", OPT_NOARG},

-	    {"ClamukoScanOnClose", OPT_NOARG},

-	    {"ClamukoScanOnExec", OPT_NOARG},

-	    {"ClamukoIncludePath", OPT_STR},

-	    {"ClamukoExcludePath", OPT_STR},

-	    {"ClamukoMaxFileSize", OPT_COMPSIZE},

-	    {"ClamukoScanArchive", OPT_NOARG},

-	    {0, 0}

-	};

-

-

-    if((fs = fopen(cfgfile, "r")) == NULL) {

-	fprintf(stderr, "ERROR: Can't open config file %s !\n", cfgfile);

-	return NULL;

-    }

-

-

-    while(fgets(buff, LINE_LENGTH, fs)) {

-

-	line++;

-

-	if(buff[0] == '#')

-	    continue;

-

-	if(!strncmp("Example", buff, 7)) {

-	    fprintf(stderr, "ERROR: Please edit the example config file %s.\n", cfgfile);

-	    return NULL;

-	}

-

-

-	if((name = tok(buff, 1))) {

-	    arg = tok(buff, 2);

-	    found = 0;

-	    for(i = 0; ; i++) {

-		pt = &cfg_options[i];

-		if(pt->name) {

-		    if(!strcmp(name, pt->name)) {

-			found = 1;

-			switch(pt->argtype) {

-			    case OPT_STR:

-				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

-				    return NULL;

-				}

-				copt = regcfg(copt, name, arg, 0);

-				break;

-			    case OPT_FULLSTR:

-				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

-				    return NULL;

-				}

-				// FIXME: this one is an ugly hack of the above

-				// case

-				free(arg);

-				arg = strstr(buff, " ");

-				arg = strdup(++arg);

-				copt = regcfg(copt, name, arg, 0);

-				break;

-			    case OPT_NUM:

-				if(!isnumb(arg)) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical argument.\n", line, name);

-				    return NULL;

-				}

-				copt = regcfg(copt, name, NULL, atoi(arg));

-				break;

-			    case OPT_COMPSIZE:

-				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires argument.\n", line, name);

-				    return NULL;

-				}

-				ctype = tolower(arg[strlen(arg) - 1]);

-				if(ctype == 'm' || ctype == 'k') {

-				    char *cpy = mcalloc(strlen(arg), sizeof(char));

-				    strncpy(cpy, arg, strlen(arg) - 1);

-				    if(!isnumb(cpy)) {

-					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

-					return NULL;

-				    }

-				    if(ctype == 'm')

-					calc = atoi(cpy) * 1024 * 1024;

-				    else

-					calc = atoi(cpy) * 1024;

-				    free(cpy);

-				} else {

-				    if(!isnumb(arg)) {

-					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

-					return NULL;

-				    }

-				    calc = atoi(arg);

-				}

-				copt = regcfg(copt, name, NULL, calc);

-				break;

-			    case OPT_NOARG:

-				if(arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s doesn't support arguments.\n", line, name);

-				    return NULL;

-				}

-				copt = regcfg(copt, name, NULL, 0);

-				break;

-			    case OPT_OPTARG:

-				copt = regcfg(copt, name, arg, 0);

-				break;

-			}

-		    }

-		} else

-		    break;

-	    } 

-

-	    if(!found) {

-		fprintf(stderr, "ERROR: Parse error at line %d: Unknown option %s.\n", line, name);

-		return NULL;

-	    }

-	}

-    }

-

-    fclose(fs);

-    return copt;

-}

-

-char *tok(const char *line, int field)

-{

-        int length, counter = 0, i, j = 0, k;

-        char *buffer;

-

-

-    length = strlen(line);

-    buffer = (char *) mcalloc(length, sizeof(char));

-

-    for(i = 0; i < length; i++) {

-        if(line[i] == ' ' || line[i] == '\n') {

-            counter++;

-            if(counter == field)

-		break;

-

-            for(k = 0; k < length; k++)

-		buffer[k] = 0;

-

-            j = 0;

-	    while((line[i+1] == ' ' || line[i+1] == '\n') && i < length)

-		i++;

-        } else {

-	    if(line[i] != ' ') {

-		buffer[j]=line[i];

-		j++;

-	    }

-	}

-    }

-

-    chomp(buffer); /* preventive */

-

-    if(strlen(buffer) == 0) {

-	free(buffer);

-	return NULL;

-    } else

-	return realloc(buffer, strlen(buffer) + 1);

-}

-

-struct cfgstruct *regcfg(struct cfgstruct *copt, const char *optname, const char *strarg, int numarg)

-{

-	struct cfgstruct *newnode, *pt;

-

-    newnode = (struct cfgstruct *) mmalloc(sizeof(struct cfgstruct));

-    newnode->optname = optname;

-    newnode->nextarg = NULL;

-    newnode->next = NULL;

-

-    if(strarg)

-	newnode->strarg = strarg;

-    else {

-	newnode->strarg = NULL;

-	newnode->numarg = numarg;

-    }

-

-    if((pt = cfgopt(copt, optname))) {

-	while(pt->nextarg)

-	    pt = pt->nextarg;

-

-	pt->nextarg = newnode;

-	return copt;

-    } else {

-	newnode->next = copt;

-	return newnode;

-    }

-}

-

-struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname)

-{

-	struct cfgstruct *handler;

-

-    handler = (struct cfgstruct *) copt;

-

-    while(1) {

-	if(handler) {

-	    if(handler->optname)

-		if(!strcmp(handler->optname, optname))

-		    return handler;

-	} else break;

-	handler = handler->next;

-    }

-

-    return NULL;

-}

@@ -22,8 +22,6 @@

 #define VIRUSDBDIR DATADIR

-#define DEFAULT_CFG CONFDIR"/clamav.conf"

-

 #define MIRROR_CFG "/mirrors.txt"

 #define MIRROR "/mirror"

@@ -41,3 +39,5 @@

 #else

 #define UNPGROUP "clamav"

 #endif

+

+#define CL_DEFAULT_CHECKS 6

@@ -42,18 +42,36 @@

 int freshclam(struct optstruct *opt)

 {

 	int ret;

-	char *newdir;

+	char *newdir, *cfgfile;

+	struct cfgstruct *copt, *cpt;

 #ifndef C_CYGWIN

-	struct passwd *user;

 	char *unpuser;

+	struct passwd *user;

+#endif

-    if(optc(opt, 'u'))

-        unpuser = getargc(opt, 'u');

-    else

-        unpuser = UNPUSER;

+    /* parse the config file */

+    if((cfgfile = getargc(opt, 'c'))) {

+	copt = parsecfg(cfgfile);

+    } else {

+	/* TODO: force strict permissions on freshclam.conf */

+	if((copt = parsecfg((cfgfile = CONFDIR"/freshclam.conf"))) == NULL)

+	    copt = parsecfg((cfgfile = CONFDIR"/clamav.conf"));

+    }

+

+    if(!copt) {

+	mprintf("!Can't parse the config file %s\n", cfgfile);

+	return 56;

+    }

+

+#ifndef C_CYGWIN

     /* freshclam shouldn't work with root priviledges */

-    if(!getuid()) { 

+    if((cpt = cfgopt(copt, "DatabaseOwner")) == NULL)

+	unpuser = UNPUSER;

+    else 

+	unpuser = cpt->strarg;

+

+    if(!getuid()) {

 	if((user = getpwnam(unpuser)) == NULL) {

 	    mprintf("@Can't get information about user %s.\n", unpuser);

 	    exit(60); /* this is critical problem, so we just exit here */

@@ -67,7 +85,7 @@ int freshclam(struct optstruct *opt)

     /* initialize some important variables */

-    if(optl(opt, "debug"))

+    if(optl(opt, "debug") || cfgopt(copt, "Debug"))

 	cl_debug();

     mprintf_disabled = 0;

@@ -93,23 +111,29 @@ int freshclam(struct optstruct *opt)

     /* initialize logger */

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

-    else logverbose = 0;

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

+	logverbose = 1;

+    else

+	logverbose = 0;

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

-	logfile = getargc(opt, 'l');

+    if((cpt = cfgopt(copt, "UpdateLogFile"))) {

+	logfile = cpt->strarg; 

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

 	    mprintf("!Problem with internal logger.\n");

 	    mexit(1);

 	}

-    } else 

+    } else

 	logfile = NULL;

-    /* change current working directory */

-    if(optl(opt, "datadir"))

+    /* change the current working directory */

+    if(optl(opt, "datadir")) {

 	newdir = getargl(opt, "datadir");

-    else

-	newdir = VIRUSDBDIR;

+    } else {

+	if((cpt = cfgopt(copt, "DatabaseDirectory")))

+	    newdir = cpt->strarg;

+	else

+	    newdir = VIRUSDBDIR;

+    }

     if(chdir(newdir)) {

 	mprintf("Can't change dir to %s\n", newdir);

@@ -121,38 +145,36 @@ int freshclam(struct optstruct *opt)

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

 	    int bigsleep, checks;

-	if(!optc(opt, 'c')) {

-	    mprintf("@Daemon mode requires -c (--checks) option.\n");

-	    mexit(40);

-	}

-

-	checks = atoi(getargc(opt, 'c'));

+	if((cpt = cfgopt(copt, "Checks")))

+	    checks = cpt->numarg;

+	else

+	    checks = CL_DEFAULT_CHECKS;

 	if(checks <= 0 || checks > 50) {

-	    mprintf("@Wrong number of checks\n");

+	    mprintf("@Number of checks must be between 1 and 50.\n");

 	    mexit(41);

 	}

-	bigsleep = 24*3600 / checks;

+	bigsleep = 24 * 3600 / checks;

 	daemonize();

 	while(1) {

-	    ret = download(opt);

+	    ret = download(copt);

-	    if(optl(opt, "on-error-execute"))

+	    if((cpt = cfgopt(copt, "OnErrorExecute")))

 		if(ret > 1)

-		    system(getargl(opt, "on-error-execute"));

+		    system(cpt->strarg);

 	    logg("\n--------------------------------------\n");

 	    sleep(bigsleep);

 	}

     } else

-	ret = download(opt);

+	ret = download(copt);

-    if(optl(opt, "on-error-execute"))

+    if((cpt = cfgopt(copt, "OnErrorExecute")))

 	if(ret > 1)

-	    system(getargl(opt, "on-error-execute"));

+	    system(cpt->strarg);

     return(ret);

 }

@@ -163,151 +185,54 @@ void d_timeout(int sig)

     exit(1);

 }

-int download(struct optstruct *opt)

+int download(const struct cfgstruct *copt)

 {

-	int ret = 0;

-	mirrors *m = NULL, *h = NULL;

-	int mirror_used = 0;

+	int ret = 0, try = 0, maxattempts = 0;

 	struct sigaction sigalrm;

+	struct cfgstruct *cpt;

     memset(&sigalrm, 0, sizeof(struct sigaction));

     sigalrm.sa_handler = d_timeout;

     sigaction(SIGALRM, &sigalrm, NULL);

-    /*

-     * There's an error in __nss_hostname_digits_dots () from /lib/libc.so.6

-     * which gets triggered here for some reason.....

-     * Calling fflush is a temp workaround

-     */    

-    fflush(NULL);

-    

-    h = m = parse_mirrorcfg(opt);

-    

-    while(m != NULL)

-    {

-	alarm(TIMEOUT);

-	ret = downloadmanager(opt, m->mirror);

-	alarm(0);

-

-        if(ret == 0)

-        {

-            if(mirror_used)

-            {

-                logg("Database updated from mirror %s.\n", m->mirror);

-                mprintf("Database updated from mirror %s.\n", m->mirror);

-            }

-

-            FREE_MIRROR(h);

-            return ret;

-        }

-

-        /* Only continue if there is an error connecting to the host */

-        if((ret != 52) && (ret != 54))

-        {

-            FREE_MIRROR(h);

-            return ret;

-        }

-

-	mprintf("Waiting 10 seconds...\n");

-	sleep(10);

-        mirror_used++;

-        m = m->next;

+    if((cpt = cfgopt(copt, "MaxAttempts")))

+	maxattempts = cpt->numarg;

+

+    mprintf("*Max retries == %d\n", maxattempts);

+

+    if((cpt = cfgopt(copt, "DatabaseMirror")) == NULL) {

+	mprintf("@You must specify at least one database mirror.\n");

+	return 57;

+    } else {

+

+	while(cpt) {

+	    alarm(TIMEOUT);

+	    ret = downloadmanager(copt, cpt->strarg);

+	    alarm(0);

+

+	    if(ret == 52 || ret == 54) {

+		if(try < maxattempts - 1) {

+		    mprintf("Trying again...\n");

+		    logg("Trying again...\n");

+		    try++;

+		    sleep(1);

+		    continue;

+		} else {

+		    mprintf("Giving up...\n");

+		    logg("Giving up...\n");

+		    cpt = (struct cfgstruct *) cpt->nextarg;

+		    try = 0;

+		}

+

+	    } else {

+		return ret;

+	    }

+	}

     }

-    FREE_MIRROR(h);

     return ret;

 }

-mirrors* parse_mirrorcfg(struct optstruct *opt)

-{

-    mirrors *head = NULL, *curr = NULL, *prev = NULL;

-    char *datadir = NULL, *mirrorcfg = NULL;

-    FILE *fd = NULL;

-    char buf[BUFSIZ];

-    int hosts_found = 0;

-       

-    if(optl(opt, "datadir"))

-    {

-        datadir = getargl(opt, "datadir");

-    }

-    else

-    {

-        datadir = DATADIR;

-    }

-

-    if((mirrorcfg = malloc(sizeof(char) * (strlen(datadir) + strlen(MIRROR_CFG) + 1))) == NULL)

-    {

-        fprintf(stderr, "ERROR: Can't allocate sufficient memory\n");

-        mexit(1);

-    }

-

-    strcpy(mirrorcfg, datadir);

-

-    strcat(mirrorcfg, MIRROR_CFG);

-

-    if((fd = fopen(mirrorcfg, "r")) == NULL)

-    {

-        fprintf(stderr, "ERROR: Can't open mirror configuration file %s !\n", mirrorcfg);

-        free(mirrorcfg);    

-        mexit(1);

-    }

-

-    while(fgets(buf, BUFSIZ, fd))

-    {

-        if(buf[0] == '#')

-            continue;

-

-        if(strlen(buf) > 1)

-        {

-            if((curr = malloc(sizeof(struct _mirrors))) == NULL)

-            {

-                fprintf(stderr, "ERROR: Can't allocate sufficient memory\n");

-                free(mirrorcfg);    

-                FREE_MIRROR(head);

-                return NULL;

-            }

-

-            curr->mirror = NULL;            

-            curr->next   = NULL;

-            

-            if(head == NULL)

-                head = curr;

-            

-            if(prev != NULL)

-                prev->next = curr;

-

-            if((curr->mirror = malloc(sizeof(char) * (strlen(buf) +1))) == NULL)