@@ -1,3 +1,16 @@

+Wed Jun  1 02:39:14 CEST 2005 (tk)

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

+  * misc/cfgparser.c: reimplementation of config parser:

+			- all options require arguments (old ones without

+			  args must be now followed by boolean values: yes, no,

+			  1, 0, or true, false)

+			- optional arguments (as in NotifyClamd) are no longer

+			  supported

+			- default values are directly associated with options

+  * clamd/defaults.h: remove

+  * clamd, clamdscan, freshclam: use new parser scheme

+  * etc/clamd.conf: remove DisableDefaultScanOptions

+

 Tue May 31 19:15:01 BST 2005 (njh)

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

   * libclamav/mbox.c:	Fix mishandling of fast track uuencoded files

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

@@ -33,7 +33,6 @@ clamd_SOURCES = \

     options.c \

     options.h \

     clamd.c \

-    defaults.h \

     tcpserver.c \

     tcpserver.h \

     localserver.c \

@@ -49,7 +49,6 @@

 #include "tcpserver.h"

 #include "localserver.h"

 #include "others.h"

-#include "defaults.h"

 #include "memory.h"

 #include "output.h"

 #include "shared.h"

@@ -101,9 +100,9 @@ void clamd(struct optstruct *opt)

     if(optc(opt, 'c'))

 	cfgfile = getargc(opt, 'c');

     else

-	cfgfile = CL_DEFAULT_CFG;

+	cfgfile = CONFDIR"/clamd.conf";

-    if((copt = parsecfg(cfgfile, 1)) == NULL) {

+    if((copt = getcfg(cfgfile, 1)) == NULL) {

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

 	exit(1);

     }

@@ -112,29 +111,16 @@ void clamd(struct optstruct *opt)

     /* initialize logger */

-    if(cfgopt(copt, "LogFileUnlock"))

-	logg_lock = 0;

+    logg_lock = cfgopt(copt, "LogFileUnlock")->enabled;

+    logg_time = cfgopt(copt, "LogTime")->enabled;

+    logok = cfgopt(copt, "LogClean")->enabled;

+    logg_size = cfgopt(copt, "LogFileMaxSize")->numarg;

+    logg_verbose = cfgopt(copt, "LogVerbose")->enabled;

-    if(cfgopt(copt, "LogTime"))

-	logg_time = 1;

-

-    if(cfgopt(copt, "LogClean"))

-	logok = 1;

-

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

-	logg_size = cpt->numarg;

-    else

-	logg_size = CL_DEFAULT_LOGSIZE;

-

-    if(cfgopt(copt, "Debug")) /* enable debug messages in libclamav */

+    if(cfgopt(copt, "Debug")->enabled) /* enable debug messages in libclamav */

 	cl_debug();

-    if(cfgopt(copt, "LogVerbose"))

-	logg_verbose = 1;

-    else

-	logg_verbose = 0;

-

-    if((cpt = cfgopt(copt, "LogFile"))) {

+    if((cpt = cfgopt(copt, "LogFile"))->enabled) {

 	logg_file = cpt->strarg;

 	if(strlen(logg_file) < 2 || (logg_file[0] != '/' && logg_file[0] != '\\' && logg_file[1] != ':')) {

 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");

@@ -148,16 +134,14 @@ void clamd(struct optstruct *opt)

     } else

 	logg_file = NULL;

-

 #if defined(USE_SYSLOG) && !defined(C_AIX)

-    if(cfgopt(copt, "LogSyslog")) {

+    if(cfgopt(copt, "LogSyslog")->enabled) {

 	    int fac = LOG_LOCAL6;

-	if((cpt = cfgopt(copt, "LogFacility"))) {

-	    if((fac = logg_facility(cpt->strarg)) == -1) {

-		fprintf(stderr, "ERROR: LogFacility: %s: No such facility.\n", cpt->strarg);

-		exit(1);

-	    }

+	cpt = cfgopt(copt, "LogFacility");

+	if((fac = logg_facility(cpt->strarg)) == -1) {

+	    fprintf(stderr, "ERROR: LogFacility: %s: No such facility.\n", cpt->strarg);

+	    exit(1);

 	}

 	openlog("clamd", LOG_PID, fac);

@@ -183,13 +167,13 @@ void clamd(struct optstruct *opt)

     /* check socket type */

-    if(cfgopt(copt, "TCPSocket") && cfgopt(copt, "LocalSocket")) {

-	fprintf(stderr, "ERROR: You can select one mode only (local/TCP).\n");

-	logg("!Two modes (local & TCP) selected.\n");

+    if(cfgopt(copt, "TCPSocket")->enabled && cfgopt(copt, "LocalSocket")->enabled) {

+	fprintf(stderr, "ERROR: You can only select one mode (local or TCP).\n");

+	logg("!Two modes (local and TCP) selected.\n");

 	exit(1);

-    } else if(cfgopt(copt, "TCPSocket")) {

+    } else if(cfgopt(copt, "TCPSocket")->enabled) {

 	tcpsock = 1;

-    } else if(cfgopt(copt, "LocalSocket")) {

+    } else if(cfgopt(copt, "LocalSocket")->enabled) {

 	tcpsock = 0;

     } else {

 	fprintf(stderr, "ERROR: You must select server type (local/tcp).\n");

@@ -199,14 +183,14 @@ void clamd(struct optstruct *opt)

     /* drop privileges */

 #ifndef C_OS2

-    if(geteuid() == 0 && (cpt = cfgopt(copt, "User"))) {

+    if(geteuid() == 0 && (cpt = cfgopt(copt, "User"))->enabled) {

 	if((user = getpwnam(cpt->strarg)) == NULL) {

 	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", cpt->strarg);

 	    logg("!Can't get information about user %s.\n", cpt->strarg);

 	    exit(1);

 	}

-	if(cfgopt(copt, "AllowSupplementaryGroups")) {

+	if(cfgopt(copt, "AllowSupplementaryGroups")->enabled) {

 #ifdef HAVE_INITGROUPS

 	    if(initgroups(cpt->strarg, user->pw_gid)) {

 		fprintf(stderr, "ERROR: initgroups() failed.\n");

@@ -243,18 +227,14 @@ void clamd(struct optstruct *opt)

 #endif

     /* set the temporary dir */

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

+    if((cpt = cfgopt(copt, "TemporaryDirectory"))->enabled)

 	cl_settempdir(cpt->strarg, 0);

-    if(cfgopt(copt, "LeaveTemporaryFiles"))

+    if(cfgopt(copt, "LeaveTemporaryFiles")->enabled)

 	cl_settempdir(NULL, 1);

     /* load the database(s) */

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

-	dbdir = cpt->strarg;

-    else

-	dbdir = cl_retdbdir();

-

+    dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

     logg("Reading databases from %s\n", dbdir);

     if((ret = cl_loaddbdir(dbdir, &root, &virnum))) {

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

     }

     /* fork into background */

-    if(!cfgopt(copt, "Foreground"))

+    if(!cfgopt(copt, "Foreground")->enabled)

 	daemonize();

     if(tcpsock)

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

@@ -35,7 +35,6 @@

 #include "cfgparser.h"

 #include "dazukoio.h"

 #include "clamuko.h"

-#include "defaults.h"

 #include "output.h"

 struct dazuko_access *acc;

@@ -92,15 +91,15 @@ void *clamukoth(void *arg)

 	logg("Clamuko: Correctly registered with Dazuko.\n");

     /* access mask */

-    if(cfgopt(tharg->copt, "ClamukoScanOnOpen")) {

+    if(cfgopt(tharg->copt, "ClamukoScanOnOpen")->enabled) {

 	logg("Clamuko: Scan-on-open mode activated.\n");

 	mask |= DAZUKO_ON_OPEN;

     }

-    if(cfgopt(tharg->copt, "ClamukoScanOnClose")) {

+    if(cfgopt(tharg->copt, "ClamukoScanOnClose")->enabled) {

 	logg("Clamuko: Scan-on-close mode activated.\n");

 	mask |= DAZUKO_ON_CLOSE;

     }

-    if(cfgopt(tharg->copt, "ClamukoScanOnExec")) {

+    if(cfgopt(tharg->copt, "ClamukoScanOnExec")->enabled) {

 	logg("Clamuko: Scan-on-exec mode activated.\n");

 	mask |= DAZUKO_ON_EXEC;

     }

@@ -117,7 +116,7 @@ void *clamukoth(void *arg)

 	return NULL;

     }

-    if((pt = cfgopt(tharg->copt, "ClamukoIncludePath"))) {

+    if((pt = cfgopt(tharg->copt, "ClamukoIncludePath"))->enabled) {

 	while(pt) {

 	    if((dazukoAddIncludePath(pt->strarg))) {

 		logg("!Clamuko: Dazuko -> Can't include path %s\n", pt->strarg);

@@ -134,7 +133,7 @@ void *clamukoth(void *arg)

 	return NULL;

     }

-    if((pt = cfgopt(tharg->copt, "ClamukoExcludePath"))) {

+    if((pt = cfgopt(tharg->copt, "ClamukoExcludePath"))->enabled) {

 	while(pt) {

 	    if((dazukoAddExcludePath(pt->strarg))) {

 		logg("!Clamuko: Dazuko -> Can't exclude path %s\n", pt->strarg);

@@ -147,11 +146,7 @@ void *clamukoth(void *arg)

 	}

     }

-    if((pt = cfgopt(tharg->copt, "ClamukoMaxFileSize"))) {

-	sizelimit = pt->numarg;

-    } else

-	sizelimit = CL_DEFAULT_CLAMUKOMAXFILESIZE;

-

+    sizelimit = cfgopt(tharg->copt, "ClamukoMaxFileSize")->numarg;

     if(sizelimit)

 	logg("Clamuko: Max file size limited to %d bytes.\n", sizelimit);

     else

deleted file mode 100644

@@ -1,35 +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.

- */

-

-#ifndef __DEFAULTS_H

-#define __DEFAULTS_H

-

-#define CL_DEFAULT_CFG CONFDIR"/clamd.conf"

-#define CL_DEFAULT_BACKLOG 15

-#define CL_DEFAULT_MAXTHREADS 10

-#define CL_DEFAULT_SCANTIMEOUT 120

-#define CL_DEFAULT_LOGSIZE 1048576

-#define CL_DEFAULT_CLAMUKOMAXFILESIZE 5 * 1048576

-#define CL_DEFAULT_SELFCHECK 1800

-#define CL_DEFAULT_MAXWHILEWAIT 120

-#define CL_DEFAULT_MAXPORTSCAN 1000

-#define CL_DEFAULT_MAXDIRREC 15

-#define CL_DEFAULT_STREAMMAXLEN 10 * 1048576

-#define CL_DEFAULT_IDLETIMEOUT 30

-

-#endif

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

@@ -31,7 +31,6 @@

 #include "options.h"

 #include "cfgparser.h"

-#include "defaults.h"

 #include "others.h"

 #include "server.h"

 #include "output.h"

@@ -64,7 +63,7 @@ int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struc

 		logg("!Socket file %s is in use by another process.\n", server.sun_path);

 		exit(1);

 	    }

-	    if(cfgopt(copt, "FixStaleSocket")) {

+	    if(cfgopt(copt, "FixStaleSocket")->enabled) {

 		logg("^Socket file %s exists. Unclean shutdown? Removing...\n", server.sun_path);

 		if(unlink(server.sun_path) == -1) {

 		    estr = strerror(errno);

@@ -89,11 +88,7 @@ int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struc

     logg("Unix socket file %s\n", server.sun_path);

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

-	backlog = cpt->numarg;

-    else

-	backlog = CL_DEFAULT_BACKLOG;

-

+    backlog = cfgopt(copt, "MaxConnectionQueueLength")->numarg;

     logg("Setting connection queue length to %d\n", backlog);

     if(listen(sockfd, backlog) == -1) {

@@ -77,7 +77,7 @@ void virusaction(const char *filename, const char *virname, const struct cfgstru

 	pid_t pid;

 	struct cfgstruct *cpt;

-    if(!(cpt = cfgopt(copt, "VirusEvent")))

+    if(!(cpt = cfgopt(copt, "VirusEvent"))->enabled)

 	return;

     /* NB: we need to fork here since this function modifies the environment. 

@@ -45,7 +45,6 @@

 #include "cfgparser.h"

 #include "others.h"

 #include "scanner.h"

-#include "defaults.h"

 #include "memory.h"

 #include "shared.h"

 #include "output.h"

@@ -102,11 +101,7 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 	int ret = 0, scanret = 0, maxdirrec = 0;

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

-	maxdirrec = cpt->numarg;

-    else

-	maxdirrec = CL_DEFAULT_MAXDIRREC;

-

+    maxdirrec = cfgopt(copt, "MaxDirectoryRecursion")->numarg;

     if(maxdirrec) {

 	if(*reclev > maxdirrec) {

 	    logg("*Directory recursion limit exceeded at %s\n", dirname);

@@ -139,14 +134,14 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 		    /* stat the file */

 		    if(lstat(fname, &statbuf) != -1) {

-			if((S_ISDIR(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode)) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 1) && cfgopt(copt, "FollowDirectorySymlinks"))) {

+			if((S_ISDIR(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode)) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 1) && cfgopt(copt, "FollowDirectorySymlinks")->enabled)) {

 			    if(dirscan(fname, virname, scanned, root, limits, options, copt, odesc, reclev, contscan) == 1) {

 				free(fname);

 				closedir(dd);

 				return 1;

 			    }

 			} else {

-			    if(S_ISREG(statbuf.st_mode) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 2) && cfgopt(copt, "FollowFileSymlinks"))) {

+			    if(S_ISREG(statbuf.st_mode) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 2) && cfgopt(copt, "FollowFileSymlinks")->enabled)) {

 #ifdef C_LINUX

 				if(procdev && (statbuf.st_dev == procdev))

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

     switch(sb.st_mode & S_IFMT) {

 	case S_IFLNK:

-	    if(!cfgopt(copt, "FollowFileSymlinks"))

+	    if(!cfgopt(copt, "FollowFileSymlinks")->enabled)

 		break;

 	    /* else go to the next case */

 	case S_IFREG: 

@@ -297,7 +292,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 = 0, acceptd;

+	int ret, portscan = 1000, 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;

@@ -310,22 +305,14 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

     /* get min port */

-    if((cpt = cfgopt(copt, "StreamMinPort"))) {

-	if(cpt->numarg < 1024 || cpt->numarg > 65535)

-	    min_port = 1024;

-	else 

-	    min_port = cpt->numarg;

-    } else 

+    min_port = cfgopt(copt, "StreamMinPort")->numarg;

+    if(min_port < 1024 || min_port > 65535)

 	min_port = 1024;

     /* get max port */

-    if((cpt = cfgopt(copt, "StreamMaxPort"))) {

-	if(cpt->numarg < min_port || cpt->numarg > 65535)

-	    max_port = 65535;

-	else

-	    max_port = cpt->numarg;

-    } else

-	max_port = 2048;

+    max_port = cfgopt(copt, "StreamMaxPort")->numarg;

+    if(max_port < min_port || max_port > 65535)

+	max_port = 65535;

     /* bind to a free port */

     while(!bound && --portscan) {

@@ -343,7 +330,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	server.sin_family = AF_INET;

 	server.sin_port = htons(port);

-	if((cpt = cfgopt(copt, "TCPAddr"))) {

+	if((cpt = cfgopt(copt, "TCPAddr"))->enabled) {

 	    pthread_mutex_lock(&gh_mutex);

 	    if((he = gethostbyname(cpt->strarg)) == 0) {

 		logg("!gethostbyname(%s) error: %s\n", cpt->strarg);

@@ -365,11 +352,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	    bound = 1;

     }

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

-	timeout = cpt->numarg;

-    else

-	timeout = CL_DEFAULT_SCANTIMEOUT;

-

+    timeout = cfgopt(copt, "ReadTimeout")->numarg;

     if(timeout == 0)

     	timeout = -1;

@@ -418,11 +401,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	return -1;

     }

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

-	maxsize = cpt->numarg;

-    else

-	maxsize = CL_DEFAULT_STREAMMAXLEN;

-

+    maxsize = cfgopt(copt, "StreamMaxLength")->numarg;

     btread = sizeof(buff);

@@ -439,7 +418,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	    mdprintf(odesc, "Temporary file -> write ERROR\n");

 	    logg("!ScanStream %d: Can't write to temporary file.\n", port);

 	    close(tmpd);

-	    if(!cfgopt(copt, "LeaveTemporaryFiles"))

+	    if(!cfgopt(copt, "LeaveTemporaryFiles")->enabled)

 		unlink(tmpname);

 	    free(tmpname);

 	    return -1;

@@ -469,7 +448,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

     lseek(tmpd, 0, SEEK_SET);

     ret = cl_scandesc(tmpd, &virname, scanned, root, limits, options);

     close(tmpd);

-    if(!cfgopt(copt, "LeaveTemporaryFiles"))

+    if(!cfgopt(copt, "LeaveTemporaryFiles")->enabled)

 	unlink(tmpname);

     free(tmpname);

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

 /*

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

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

  *			      Trog <trog@clamav.net>

  *

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

@@ -35,7 +35,6 @@

 #include "server.h"

 #include "thrmgr.h"

 #include "session.h"

-#include "defaults.h"

 #include "clamuko.h"

 #include "others.h"

 #include "memory.h"

@@ -75,12 +74,7 @@ void scanner_thread(void *arg)

     sigfillset(&sigset);

     pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-    if((cpt = cfgopt(conn->copt, "ReadTimeout"))) {

-	timeout = cpt->numarg;

-    } else {

-	timeout = CL_DEFAULT_SCANTIMEOUT;

-    }

-

+    timeout = cfgopt(conn->copt, "ReadTimeout")->numarg;

     if(!timeout)

     	timeout = -1;

@@ -188,11 +182,7 @@ static struct cl_node *reload_db(struct cl_node *root, const struct cfgstruct *c

 	root = NULL;

     }

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

-	dbdir = cpt->strarg;

-    } else {

-	dbdir = cl_retdbdir();

-    }

+    dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

     logg("Reading databases from %s\n", dbdir);

     if(dbstat == NULL) {

@@ -225,7 +215,7 @@ static struct cl_node *reload_db(struct cl_node *root, const struct cfgstruct *c

 int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *copt)

 {

-	int new_sd, max_threads, stdopt;

+	int new_sd, max_threads;

 	unsigned int options = 0;

 	threadpool_t *thr_pool;

 	struct sigaction sigact;

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

     /* save the PID */

     mainpid = getpid();

-    if((cpt = cfgopt(copt, "PidFile"))) {

+    if((cpt = cfgopt(copt, "PidFile"))->enabled) {

 	    FILE *fd;

 	old_umask = umask(0006);

 	if((fd = fopen(cpt->strarg, "w")) == NULL) {

@@ -269,95 +259,55 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     }

     logg("*Listening daemon: PID: %d\n", getpid());

-    if((cpt = cfgopt(copt, "MaxThreads"))) {

-	max_threads = cpt->numarg;

-    } else {

-	max_threads = CL_DEFAULT_MAXTHREADS;

-    }

+    max_threads = cfgopt(copt, "MaxThreads")->numarg;

-    if(cfgopt(copt, "DisableDefaultScanOptions")) {

-	logg("RECOMMENDED OPTIONS DISABLED.\n");

-	stdopt = 0;

-    } else {

-	options |= CL_SCAN_STDOPT;

-	stdopt = 1;

-    }

-

-    if(stdopt || cfgopt(copt, "ScanArchive") || cfgopt(copt, "ClamukoScanArchive")) {

+    if(cfgopt(copt, "ScanArchive")->enabled || cfgopt(copt, "ClamukoScanArchive")->enabled) {

 	/* set up limits */

 	memset(&limits, 0, sizeof(struct cl_limits));

-	if((cpt = cfgopt(copt, "ArchiveMaxFileSize"))) {

-	    if((limits.maxfilesize = cpt->numarg)) {

-		logg("Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

-	    } else {

-		logg("^Archive: File size limit protection disabled.\n");

-	    }

-	} else {

-	    limits.maxfilesize = 10485760;

+	if((limits.maxfilesize = cfgopt(copt, "ArchiveMaxFileSize")->numarg)) {

 	    logg("Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

+	} else {

+	    logg("^Archive: File size limit protection disabled.\n");

 	}

-	if((cpt = cfgopt(copt, "ArchiveMaxRecursion"))) {

-	    if((limits.maxreclevel = cpt->numarg)) {

-		logg("Archive: Recursion level limit set to %d.\n", limits.maxreclevel);

-	    } else {

-		logg("^Archive: Recursion level limit protection disabled.\n");

-	    }

-	} else {

-	    limits.maxreclevel = 8;

+	if((limits.maxreclevel = cfgopt(copt, "ArchiveMaxRecursion")->numarg)) {

 	    logg("Archive: Recursion level limit set to %d.\n", limits.maxreclevel);

+	} else {

+	    logg("^Archive: Recursion level limit protection disabled.\n");

 	}

-	if((cpt = cfgopt(copt, "ArchiveMaxFiles"))) {

-	    if((limits.maxfiles = cpt->numarg)) {

-		logg("Archive: Files limit set to %d.\n", limits.maxfiles);

-	    } else {

-		logg("^Archive: Files limit protection disabled.\n");

-	    }

-	} else {

-	    limits.maxfiles = 1000;

+	if((limits.maxfiles = cfgopt(copt, "ArchiveMaxFiles")->numarg)) {

 	    logg("Archive: Files limit set to %d.\n", limits.maxfiles);

+	} else {

+	    logg("^Archive: Files limit protection disabled.\n");

 	}

-	if((cpt = cfgopt(copt, "ArchiveMaxCompressionRatio"))) {

-	    if((limits.maxratio = cpt->numarg)) {

-		logg("Archive: Compression ratio limit set to %d.\n", limits.maxratio);

-	    } else {

-		logg("^Archive: Compression ratio limit disabled.\n");

-	    }

-	} else {

-	    limits.maxratio = 250;

+	if((limits.maxratio = cfgopt(copt, "ArchiveMaxCompressionRatio")->numarg)) {

 	    logg("Archive: Compression ratio limit set to %d.\n", limits.maxratio);

+	} else {

+	    logg("^Archive: Compression ratio limit disabled.\n");

 	}

-	if(cfgopt(copt, "ArchiveLimitMemoryUsage")) {

+	if(cfgopt(copt, "ArchiveLimitMemoryUsage")->enabled) {

 	    limits.archivememlim = 1;

 	    logg("Archive: Limited memory usage.\n");

 	} else {

 	    limits.archivememlim = 0;

 	}

-

     }

-    if(stdopt || cfgopt(copt, "ScanArchive")) {

+    if(cfgopt(copt, "ScanArchive")->enabled) {

 	logg("Archive support enabled.\n");

 	options |= CL_SCAN_ARCHIVE;

-	if(cfgopt(copt, "ScanRAR")) {

-	    logg("Archive: RAR support enabled.\n");

-	} else {

-	    logg("Archive: RAR support disabled.\n");

-	    options |= CL_SCAN_DISABLERAR;

-	}

-

-	if(cfgopt(copt, "ArchiveBlockEncrypted")) {

+	if(cfgopt(copt, "ArchiveBlockEncrypted")->enabled) {

 	    logg("Archive: Blocking encrypted archives.\n");

 	    options |= CL_SCAN_BLOCKENCRYPTED;

 	}

-	if(cfgopt(copt, "ArchiveBlockMax")) {

+	if(cfgopt(copt, "ArchiveBlockMax")->enabled) {

 	    logg("Archive: Blocking archives that exceed limits.\n");

 	    options |= CL_SCAN_BLOCKMAX;

 	}

@@ -366,11 +316,11 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	logg("Archive support disabled.\n");

     }

-    if(stdopt || cfgopt(copt, "ScanPE")) {

+    if(cfgopt(copt, "ScanPE")->enabled) {

 	logg("Portable Executable support enabled.\n");

 	options |= CL_SCAN_PE;

-	if(cfgopt(copt, "DetectBrokenExecutables")) {

+	if(cfgopt(copt, "DetectBrokenExecutables")->enabled) {

 	    logg("Detection of broken executables enabled.\n");

 	    options |= CL_SCAN_BLOCKBROKEN;

 	}

@@ -379,11 +329,11 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	logg("Portable Executable support disabled.\n");

     }

-    if(stdopt || cfgopt(copt, "ScanMail")) {

+    if(cfgopt(copt, "ScanMail")->enabled) {

 	logg("Mail files support enabled.\n");

 	options |= CL_SCAN_MAIL;

-	if(cfgopt(copt, "MailFollowURLs")) {

+	if(cfgopt(copt, "MailFollowURLs")->enabled) {

 	    logg("Mail: URL scanning enabled.\n");

 	    options |= CL_SCAN_MAILURL;

 	}

@@ -392,26 +342,21 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	logg("Mail files support disabled.\n");

     }

-    if(stdopt || cfgopt(copt, "ScanOLE2")) {

+    if(cfgopt(copt, "ScanOLE2")->enabled) {

 	logg("OLE2 support enabled.\n");

 	options |= CL_SCAN_OLE2;

     } else {

 	logg("OLE2 support disabled.\n");

     }

-    if(stdopt || cfgopt(copt, "ScanHTML")) {

+    if(cfgopt(copt, "ScanHTML")->enabled) {

 	logg("HTML support enabled.\n");

 	options |= CL_SCAN_HTML;

     } else {

 	logg("HTML support disabled.\n");

     }

-    if((cpt = cfgopt(copt, "SelfCheck"))) {

-	selfchk = cpt->numarg;

-    } else {

-	selfchk = CL_DEFAULT_SELFCHECK;

-    }

-

+    selfchk = cfgopt(copt, "SelfCheck")->numarg;

     if(!selfchk) {

 	logg("Self checking disabled.\n");

     } else {

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

     pthread_attr_init(&thattr);

     pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);

-    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess"))

+    if(cfgopt(copt, "ClamukoScanOnAccess")->enabled)

 #ifdef CLAMUKO

     {

 	pthread_attr_init(&clamuko_attr);

@@ -483,11 +428,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     pthread_mutex_init(&exit_mutex, NULL);

     pthread_mutex_init(&reload_mutex, NULL);

-

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

-	idletimeout = cpt->numarg;

-    else

-	idletimeout = CL_DEFAULT_IDLETIMEOUT;

+    idletimeout = cfgopt(copt, "IdleTimeout")->numarg;

     if((thr_pool=thrmgr_new(max_threads, idletimeout, scanner_thread)) == NULL) {

 	logg("!thrmgr_new failed\n");

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

 		logg("SIGHUP caught: re-opening log file.\n");

 		logg_close();

 		sighup = 0;

-		if(!logg_file && (cpt = cfgopt(copt, "LogFile")))

+		if(!logg_file && (cpt = cfgopt(copt, "LogFile"))->enabled)

 		    logg_file = cpt->strarg;

 	}

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

 	    time(&reloaded_time);

 	    pthread_mutex_unlock(&reload_mutex);

 #ifdef CLAMUKO

-	    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess")) {

+	    if(cfgopt(copt, "ClamukoScanOnAccess")->enabled) {

 		logg("Stopping and restarting Clamuko.\n");

 		pthread_kill(clamuko_pid, SIGUSR1);

 		pthread_join(clamuko_pid, NULL);

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

      */

     thrmgr_destroy(thr_pool);

 #ifdef CLAMUKO

-    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess")) {

+    if(cfgopt(copt, "ClamukoScanOnAccess")->enabled) {

 	logg("Stopping Clamuko.\n");

 	pthread_kill(clamuko_pid, SIGUSR1);

 	pthread_join(clamuko_pid, NULL);

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

     close(socketd);

 #ifndef C_OS2

-    if((cpt = cfgopt(copt, "LocalSocket"))) {

+    if((cpt = cfgopt(copt, "LocalSocket"))->enabled) {

 	if(unlink(cpt->strarg) == -1)

 	    logg("!Can't unlink the socket file %s\n", cpt->strarg);

 	else

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

     }

 #endif

-    if((cpt = cfgopt(copt, "PidFile"))) {

+    if((cpt = cfgopt(copt, "PidFile"))->enabled) {

 	if(unlink(cpt->strarg) == -1)

 	    logg("!Can't unlink the pid file %s\n", cpt->strarg);

 	else

@@ -34,7 +34,6 @@

 #include "cfgparser.h"

 #include "others.h"

-#include "defaults.h"

 #include "scanner.h"

 #include "server.h"

 #include "clamuko.h"

@@ -82,13 +81,13 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

     if(!strncmp(buff, CMD1, strlen(CMD1))) { /* SCAN */

 	if(scan(buff + strlen(CMD1) + 1, NULL, root, limits, options, copt, desc, 0) == -2)

-	    if(cfgopt(copt, "ExitOnOOM"))

+	    if(cfgopt(copt, "ExitOnOOM")->enabled)

 		return COMMAND_SHUTDOWN;

     } else if(!strncmp(buff, CMD2, strlen(CMD2))) { /* RAWSCAN */

 	opt = options & ~CL_SCAN_ARCHIVE;

 	if(scan(buff + strlen(CMD2) + 1, NULL, root, NULL, opt, copt, desc, 0) == -2)

-	    if(cfgopt(copt, "ExitOnOOM"))

+	    if(cfgopt(copt, "ExitOnOOM")->enabled)

 		return COMMAND_SHUTDOWN;

     } else if(!strncmp(buff, CMD3, strlen(CMD3))) { /* QUIT */

@@ -103,19 +102,14 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

     } else if(!strncmp(buff, CMD6, strlen(CMD6))) { /* CONTSCAN */

 	if(scan(buff + strlen(CMD6) + 1, NULL, root, limits, options, copt, desc, 1) == -2)

-	    if(cfgopt(copt, "ExitOnOOM"))

+	    if(cfgopt(copt, "ExitOnOOM")->enabled)

 		return COMMAND_SHUTDOWN;

     } else if(!strncmp(buff, CMD7, strlen(CMD7))) { /* VERSION */

-	    const char *dbdir;

+	    const char *dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

 	    char *path;

 	    struct cl_cvd *daily;

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

-	    dbdir = cpt->strarg;

-	else

-	    dbdir = cl_retdbdir();

-

 	if(!(path = mmalloc(strlen(dbdir) + 11))) {

 	    mdprintf(desc, "Memory allocation error - SHUTDOWN forced\n");

 	    return COMMAND_SHUTDOWN;

@@ -138,7 +132,7 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

     } else if(!strncmp(buff, CMD8, strlen(CMD8))) { /* STREAM */

 	if(scanstream(desc, NULL, root, limits, options, copt) == CL_EMEM)

-	    if(cfgopt(copt, "ExitOnOOM"))

+	    if(cfgopt(copt, "ExitOnOOM")->enabled)

 		return COMMAND_SHUTDOWN;

     } else if(!strncmp(buff, CMD9, strlen(CMD9))) { /* SESSION */

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

 /*

- *  Copyright (C) 2002 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

@@ -30,10 +30,8 @@

 #include <errno.h>

 #include <netdb.h>

-

 #include "options.h"

 #include "cfgparser.h"

-#include "defaults.h"

 #include "others.h"

 #include "server.h"

 #include "output.h"

@@ -52,8 +50,7 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     server.sin_family = AF_INET;

     server.sin_port = htons(cfgopt(copt, "TCPSocket")->numarg);

-

-    if((taddr = cfgopt(copt, "TCPAddr"))) {

+    if((taddr = cfgopt(copt, "TCPAddr"))->enabled) {

 	if ((he = gethostbyname(taddr->strarg)) == 0) {

 	    logg("!gethostbyname(%s) error: %s\n", taddr->strarg, strerror(errno));

 	    exit(1);

@@ -65,9 +62,6 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

-	/*

-	fprintf(stderr, "ERROR: socket() error: %s\n", estr);

-	*/

 	logg("!socket() error: %s\n", estr);

 	exit(1);

     }

@@ -78,38 +72,25 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

 	estr = strerror(errno);

-	/* 

-	fprintf(stderr, "ERROR: can't bind(): %s\n", estr);

-	*/

 	logg("!bind() error: %s\n", estr);

 	exit(1);

     } else {

-	if ( taddr != NULL && *taddr->strarg )

+	if(taddr->enabled)

 	    logg("Bound to address %s on port %d\n", taddr->strarg, cfgopt(copt, "TCPSocket")->numarg);

 	else

 	    logg("Bound to port %d\n", cfgopt(copt, "TCPSocket")->numarg);

     }

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

-	backlog = cpt->numarg;

-    else

-	backlog = CL_DEFAULT_BACKLOG;

-

+    backlog = cfgopt(copt, "MaxConnectionQueueLength")->numarg;

     logg("Setting connection queue length to %d\n", backlog);

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

-	/*

-	fprintf(stderr, "ERROR: listen() error: %s\n", estr);

-	*/