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

+Mon Oct 11 04:07:41 CEST 2004 (tk)

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

+  * clamd: improve on-access scanning

+  * docs: update

+  V 0.80rc4

+

 Sun Oct 10 12:11:31 BST 2004 (njh)

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

   * libclamav/mbox.c:	Replace (commented out) perror calls with cli_errmsg

@@ -112,7 +118,7 @@ Sat Oct  2 18:52:32 BST 2004 (njh)

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

   * clamav-milter:	Fix crash if %h is used in a template and --headers is

 				not set reported by "Sergey Y. Afonin"

-				<asy@kraft-s.ru>

+				<asy*kraft-s.ru>

 Sat Oct  2 16:41:02 BST 2004 (njh)

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

@@ -56,8 +56,6 @@ clamd_SOURCES = \

     dazukoio.h \

     dazuko_xp.h \

     dazukoio_xp.h \

-    tests.c \

-    tests.h \

     shared.h

 endif

@@ -80,7 +80,7 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	session.c session.h thrmgr.c thrmgr.h server-th.c server.h \

 	scanner.c scanner.h others.c others.h clamuko.c clamuko.h \

 	dazukoio_compat12.c dazukoio_compat12.h dazukoio.c dazukoio.h \

-	dazuko_xp.h dazukoio_xp.h tests.c tests.h shared.h

+	dazuko_xp.h dazukoio_xp.h shared.h

 @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	cfgparser.$(OBJEXT) getopt.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	memory.$(OBJEXT) misc.$(OBJEXT) \

@@ -90,7 +90,7 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	others.$(OBJEXT) clamuko.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	dazukoio_compat12.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT) tests.$(OBJEXT)

+@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

 clamd_LDADD = $(LDADD)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

@@ -104,8 +104,7 @@ am__depfiles_maybe = depfiles

 @AMDEP_TRUE@	./$(DEPDIR)/options.Po ./$(DEPDIR)/others.Po \

 @AMDEP_TRUE@	./$(DEPDIR)/output.Po ./$(DEPDIR)/scanner.Po \

 @AMDEP_TRUE@	./$(DEPDIR)/server-th.Po ./$(DEPDIR)/session.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/tcpserver.Po ./$(DEPDIR)/tests.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/thrmgr.Po

+@AMDEP_TRUE@	./$(DEPDIR)/tcpserver.Po ./$(DEPDIR)/thrmgr.Po

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \

@@ -259,8 +258,6 @@ target_vendor = @target_vendor@

 @BUILD_CLAMD_TRUE@    dazukoio.h \

 @BUILD_CLAMD_TRUE@    dazuko_xp.h \

 @BUILD_CLAMD_TRUE@    dazukoio_xp.h \

-@BUILD_CLAMD_TRUE@    tests.c \

-@BUILD_CLAMD_TRUE@    tests.h \

 @BUILD_CLAMD_TRUE@    shared.h

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -351,7 +348,6 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server-th.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpserver.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrmgr.Po@am__quote@

 .c.o:

@@ -54,7 +54,6 @@ void clamuko_exit(int sig)

     if(dazukoUnregister())

 	logg("!Can't unregister with Dazuko\n");

-    /* clamuko_running = 0; */

     logg("Clamuko stopped.\n");

     pthread_exit(NULL);

@@ -69,11 +68,10 @@ void *clamukoth(void *arg)

 	unsigned long mask = 0;

 	const struct cfgstruct *pt;

 	short int scan;

-	int sizelimit = 0, options = 0;

+	int sizelimit = 0;

 	struct stat sb;

-    /* clamuko_running = 1; */

     clamuko_scanning = 0;

     /* ignore all signals except SIGUSR1 */

@@ -86,14 +84,9 @@ void *clamukoth(void *arg)

     sigaction(SIGUSR1, &act, NULL);

     sigaction(SIGSEGV, &act, NULL);

-#ifdef C_LINUX

-    logg("*Clamuko: Started in process %d\n", getpid());

-#endif

-

     /* register */

     if(dazukoRegister("ClamAV", "r+")) {

 	logg("!Clamuko: Can't register with Dazuko\n");

-	/* clamuko_running = 0; */

 	return NULL;

     } else

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

@@ -114,13 +107,11 @@ void *clamukoth(void *arg)

     if(!mask) {

 	logg("!Access mask is not configured properly.\n");

-	/* clamuko_running = 0; */

 	return NULL;

     }

     if(dazukoSetAccessMask(mask)) {

 	logg("!Clamuko: Can't set access mask in Dazuko.\n");

-	/* clamuko_running = 0; */

 	return NULL;

     }

@@ -128,7 +119,6 @@ void *clamukoth(void *arg)

 	while(pt) {

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

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

-		/* clamuko_running = 0; */

 		return NULL;

 	    } else

 		logg("Clamuko: Included path %s\n", pt->strarg);

@@ -137,7 +127,6 @@ void *clamukoth(void *arg)

 	}

     } else {

 	logg("!Clamuko: please include at least one path.\n");

-	/* clamuko_running = 0; */

 	return NULL;

     }

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

 	while(pt) {

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

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

-		/* clamuko_running = 0; */

 		return NULL;

 	    } else

 		logg("Clamuko: Excluded path %s\n", pt->strarg);

@@ -154,20 +142,6 @@ void *clamukoth(void *arg)

 	}

     }

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

-	options |= CL_SCAN_ARCHIVE;

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

-    } else {

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

-    }

-

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

-	logg("Clamuko: OLE2 support enabled.\n");

-	options |= CL_SCAN_OLE2;

-    } else {

-	logg("Clamuko: OLE2 support disabled.\n");

-    }

-

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

 	sizelimit = pt->numarg;

     } else

@@ -192,7 +166,7 @@ void *clamukoth(void *arg)

 		}

 	    }

-	    if(scan && cl_scanfile(acc->filename, &virname, NULL, tharg->root, tharg->limits, options) == CL_VIRUS) {

+	    if(scan && cl_scanfile(acc->filename, &virname, NULL, tharg->root, tharg->limits, tharg->options) == CL_VIRUS) {

 		logg("Clamuko: %s: %s FOUND\n", acc->filename, virname);

 		virusaction(virname, tharg->copt);

 		acc->deny = 1;

@@ -203,7 +177,6 @@ void *clamukoth(void *arg)

 		logg("!Can't return access to Dazuko.\n");

 		logg("Clamuko stopped.\n");

 		dazukoUnregister();

-		/* clamuko_running = 0; */

 		clamuko_scanning = 0;

 		return NULL;

 	    }

@@ -213,7 +186,6 @@ void *clamukoth(void *arg)

     }

     /* can't be ;) */

-    /* clamuko_running = 0; */

     return NULL;

 }

@@ -3,11 +3,10 @@

 #endif

 #ifdef CLAMUKO

-

 /* DazukoXP. Allow cross platform file access control for 3rd-party applications.

    Written by John Ogness <jogness@antivir.de>

-   Copyright (c) 2002, 2003 H+BEDV Datentechnik GmbH

+   Copyright (c) 2002, 2003, 2004 H+BEDV Datentechnik GmbH

    All rights reserved.

    Redistribution and use in source and binary forms, with or without

@@ -41,7 +40,7 @@

 #ifndef DAZUKO_XP_H

 #define DAZUKO_XP_H

-#define VERSION	"2.0.0"

+#define VERSION	"2.0.4-pre3"

 #include "dazukoio_xp.h"

@@ -63,6 +62,12 @@

 #define	DAZUKO_DONE	4	/* daemon response is available */

 #define	DAZUKO_BROKEN	5	/* invalid state (interrupt from ready,waiting) */

+/* file types */

+#define DAZUKO_NONE		0

+#define DAZUKO_REGULAR		1

+#define DAZUKO_DIRECTORY	2

+#define DAZUKO_LINK		3

+

 /*********************************************************

  * structures that MUST be implemented by platform-layer *

@@ -75,6 +80,7 @@ struct xp_atomic;

 struct xp_file_struct;

 struct xp_queue;

 struct xp_rwlock;

+struct xp_daemon_id;

 */

@@ -82,14 +88,10 @@ struct xp_rwlock;

  * structures available to platform-layer *

  ******************************************/

-struct daemon_id

-{

-	int	pid;

-	int	unique;

-};

-

 struct event_properties

 {

+	int	thrown;

+

 	int	flags;

 	char	set_flags;

 	int	mode;

@@ -112,26 +114,15 @@ struct file_properties

 	char		set_mode;

 	int		device_type;

 	char		set_device_type;

+	int		type;

+	char		set_type;

 };

-struct slot

+struct dazuko_file_listnode

 {

-	/* A representation of a daemon. It holds

-	 * all information about the daemon, the

-	 * file that is scanned, and the state of

-	 * the scanning process. */

-

-	int			id;		

-	struct daemon_id	did;		/* identifier for our daemon */

-	int			write_mode;

-	int			state;

-	int			response;

-	int			event;

-	int			filenamelength;	/* not including terminator */

-	char			*filename;

-	struct event_properties	event_p;

-	struct file_properties	file_p;

-	struct xp_mutex		mutex;

+	char				*filename;

+	int				filename_length;

+	struct dazuko_file_listnode	*next;

 };

 struct dazuko_file_struct

@@ -140,11 +131,12 @@ struct dazuko_file_struct

 	 * intelligent memory management when

 	 * doing filename lookups in the kernel. */

-	int			should_scan;		/* already know we need to scan? */

-	char			*filename;		/* filename */

-	int			filename_length;	/* length of filename */

-	struct file_properties	file_p;			/* properties of file */

-	struct xp_file_struct	*extra_data;		/* extra platform-dependant data */

+	int				should_scan;		/* already know we need to scan? */

+	char				*filename;		/* filename to report (pointer in alias list) */

+	int				filename_length;	/* length of filename reported */

+	struct dazuko_file_listnode	*aliases;		/* list of file names (alias names) */

+	struct file_properties		file_p;			/* properties of file */

+	struct xp_file_struct		*extra_data;		/* extra platform-dependant data */

 };

@@ -201,6 +193,11 @@ int xp_sys_unhook(void);

 int xp_file_struct_check(struct dazuko_file_struct *dfs);

 int xp_file_struct_check_cleanup(struct dazuko_file_struct *dfs);

+/* daemon id */

+int xp_id_compare(struct xp_daemon_id *id1, struct xp_daemon_id *id2);

+int xp_id_free(struct xp_daemon_id *id);

+struct xp_daemon_id* xp_id_copy(struct xp_daemon_id *id);

+

 /* output */

 int xp_print(const char *fmt, ...);

@@ -216,22 +213,20 @@ int xp_print(const char *fmt, ...);

  * functions available to platform-layer *

  *****************************************/

-int dazuko_is_our_daemon(int pid);

+int dazuko_vsnprintf(char *str, size_t size, const char *format, va_list ap);

+int dazuko_snprintf(char *str, size_t size, const char *format, ...);

+int dazuko_is_our_daemon(struct xp_daemon_id *xp_id);

 int dazuko_get_value(const char *key, const char *string, char **value);

-int dazuko_register_daemon(struct daemon_id *did, const char *reg_name, int string_length, int write_mode);

-int dazuko_unregister_daemon(struct daemon_id *did);

-int dazuko_handle_user_request(struct dazuko_request *user_request, int pid);

-int dazuko_handle_user_request_compat12(void *ptr, int cmd, int pid);

-int get_ready_slot_condition(void *param);

+int dazuko_unregister_daemon(struct xp_daemon_id *xp_id);

+int dazuko_handle_user_request(struct dazuko_request *user_request, struct xp_daemon_id *xp_id);

+int dazuko_handle_user_request_compat12(void *ptr, int cmd, struct xp_daemon_id *xp_id);

 int dazuko_get_filename_length(char *filename);

-int dazuko_state_error(struct slot *s, int current_state);

 void dazuko_bzero(void *p, int len);

-int dazuko_sys_check(unsigned long event, int daemon_is_allowed, int pid);

-int dazuko_sys_pre(unsigned long event, struct dazuko_file_struct *kfs, struct event_properties *event_p);

+int dazuko_sys_check(unsigned long event, int daemon_is_allowed, struct xp_daemon_id *xp_id);

+int dazuko_sys_pre(unsigned long event, struct dazuko_file_struct *kfs, struct xp_file *file, struct event_properties *event_p);

 int dazuko_sys_post(unsigned long event, struct dazuko_file_struct *kfs, struct xp_file *file, struct event_properties *event_p);

 int dazuko_init(void);

 int dazuko_exit(void);

 #endif

-

 #endif

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

 /* Dazuko Interface. Interace with Dazuko for file access control.

    Written by John Ogness <jogness@antivir.de>

-   Copyright (c) 2002, 2003 H+BEDV Datentechnik GmbH

+   Copyright (c) 2002, 2003, 2004 H+BEDV Datentechnik GmbH

    All rights reserved.

    Redistribution and use in source and binary forms, with or without

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

 #include <unistd.h>

 #include "dazukoio_xp.h"

 #include "dazukoio.h"

-#include "others.h"

 #if !defined(NO_COMPAT12)

 #include "dazukoio_compat12.h"

@@ -244,7 +243,7 @@ int dazukoRegister_TS(dazuko_id_t **dazuko_id, const char *groupName, const char

 	request->type[0] = REGISTER;

 	size = 1 + 2 + 1 + strlen(regMode); /* \nRM=mode */

-	size = 1 + 2 + 1 + strlen(groupName); /* \nGN=groupName */

+	size += 1 + 2 + 1 + strlen(groupName); /* \nGN=groupName */

 	size += 1; /* \0 */

 	request->buffer = (char *)malloc(size);

@@ -277,7 +276,7 @@ int dazukoRegister_TS(dazuko_id_t **dazuko_id, const char *groupName, const char

 	buffer[sizeof(buffer)-1] = 0;

 	size = strlen(buffer) + 1;

-	if (writen(temp_id->device, buffer, size) != size)

+	if (write(temp_id->device, buffer, size) != size)

 	{

 		close(temp_id->device);

 		free(temp_id);

@@ -327,10 +326,11 @@ int dazukoRegister_TS(dazuko_id_t **dazuko_id, const char *groupName, const char

 	if (temp_id->id < 0)

 	{

+		close(temp_id->device);

+		free(temp_id);

 		free(request->buffer);

 		free(request->reply_buffer);

 		free(request);

-		free(temp_id);

 		return -1;

 	}

@@ -395,7 +395,7 @@ int dazukoSetAccessMask_TS(dazuko_id_t *dazuko_id, unsigned long accessMask)

 	buffer[sizeof(buffer)-1] = 0;

 	size = strlen(buffer) + 1;

-	if (writen(dazuko_id->device, buffer, size) != size)

+	if (write(dazuko_id->device, buffer, size) != size)

 	{

 		free(request->buffer);

 		free(request);

@@ -450,7 +450,7 @@ static int dazuko_set_path(dazuko_id_t *dazuko_id, const char *path, int type)

 	buffer[sizeof(buffer)-1] = 0;

 	size = strlen(buffer) + 1;

-	if (writen(dazuko_id->device, buffer, size) != size)

+	if (write(dazuko_id->device, buffer, size) != size)

 	{

 		free(request->buffer);

 		free(request);

@@ -541,7 +541,7 @@ int dazukoRemoveAllPaths_TS(dazuko_id_t *dazuko_id)

 	buffer[sizeof(buffer)-1] = 0;

 	size = strlen(buffer) + 1;

-	if (writen(dazuko_id->device, buffer, size) != size)

+	if (write(dazuko_id->device, buffer, size) != size)

 	{

 		free(request->buffer);

 		free(request);

@@ -658,7 +658,7 @@ int dazukoGetAccess_TS(dazuko_id_t *dazuko_id, struct dazuko_access **acc)

 	buffer[sizeof(buffer)-1] = 0;

 	size = strlen(buffer) + 1;

-	if (writen(dazuko_id->device, buffer, size) != size)

+	if (write(dazuko_id->device, buffer, size) != size)

 	{

 		free(temp_acc->filename);

 		free(temp_acc);

@@ -797,7 +797,7 @@ int dazukoReturnAccess_TS(dazuko_id_t *dazuko_id, struct dazuko_access **acc)

 		buffer[sizeof(buffer)-1] = 0;

 		size = strlen(buffer) + 1;

-		if (writen(dazuko_id->device, buffer, size) != size)

+		if (write(dazuko_id->device, buffer, size) != size)

 		{

 			/* there could be big problems if this happens */

@@ -875,7 +875,7 @@ int dazukoUnregister_TS(dazuko_id_t **dazuko_id)

 		buffer[sizeof(buffer)-1] = 0;

 		size = strlen(buffer) + 1;

-		if (writen((*dazuko_id)->device, buffer, size) != size)

+		if (write((*dazuko_id)->device, buffer, size) != size)

 		{

 			/* there could be big problems if this happens */

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

 /* Dazuko Interface. Interace with Dazuko for file access control.

    Written by John Ogness <jogness@antivir.de>

-   Copyright (c) 2002, 2003 H+BEDV Datentechnik GmbH

+   Copyright (c) 2002, 2003, 2004 H+BEDV Datentechnik GmbH

    All rights reserved.

    Redistribution and use in source and binary forms, with or without

@@ -3,11 +3,10 @@

 #endif

 #ifdef CLAMUKO

-

-/* Dazuko Interface. Interace with Dazuko 1.2.x for file access control.

+/* Dazuko Interface. Interace with Dazuko 1.x for file access control.

    Written by John Ogness <jogness@antivir.de>

-   Copyright (c) 2003 H+BEDV Datentechnik GmbH

+   Copyright (c) 2003, 2004 H+BEDV Datentechnik GmbH

    All rights reserved.

    Redistribution and use in source and binary forms, with or without

@@ -391,5 +390,4 @@ int dazukoUnregister_TS_compat12(struct dazuko_id *dazuko)

 	return error;

 }

-

 #endif

@@ -3,11 +3,10 @@

 #endif

 #ifdef CLAMUKO

-

-/* Dazuko Interface. Interace with Dazuko 1.2.x for file access control.

+/* Dazuko Interface. Interace with Dazuko 1.x for file access control.

    Written by John Ogness <jogness@antivir.de>

-   Copyright (c) 2003 H+BEDV Datentechnik GmbH

+   Copyright (c) 2003, 2004 H+BEDV Datentechnik GmbH

    All rights reserved.

    Redistribution and use in source and binary forms, with or without

@@ -59,5 +58,4 @@ int dazukoUnregister_TS_compat12_wrapper(struct dazuko_id **dazuko_id);

 int dazukoUnregister_TS_compat12(struct dazuko_id *dazuko);

 #endif

-

 #endif

@@ -1,7 +1,12 @@

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#ifdef CLAMUKO

 /* DazukoXP Interface. Interace with Dazuko for file access control.

    Written by John Ogness <jogness@antivir.de>

-   Copyright (c) 2002, 2003 H+BEDV Datentechnik GmbH

+   Copyright (c) 2002, 2003, 2004 H+BEDV Datentechnik GmbH

    All rights reserved.

    Redistribution and use in source and binary forms, with or without

@@ -98,3 +103,4 @@ struct option_compat12

 };

 #endif

+#endif

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

 #include "scanner.h"

 #include "server.h"

 #include "clamuko.h"

-#include "tests.h"

 #include "session.h"

 #include "str.h" /* libclamav */

 #include "clamav.h"

deleted file mode 100644

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

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include <stdio.h>

-#include <string.h>

-#include <clamav.h>

-

-int testsignature(const struct cl_node *root)

-{

-	char test[50] = "$CEliacmaTrESTuScikgsn#FREE-TEST-SIGNATURE$EEEEE$";

-

-    test[22] = '$'; /* additional protection */

-    test[49] = 10;

-    return (cl_scanbuff(test, 50, NULL, root) == CL_VIRUS) ? 1 : 0;

-}

deleted file mode 100644

@@ -1,24 +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 __TESTS_H

-#define __TESTS_H

-

-int testsignature(const struct cl_node *root);

-

-#endif

@@ -11020,8 +11020,8 @@ fi;

 if test "$lcurl" != "no"

 then

     my_cv_curl_vers=NONE

-        check="7.11.0"

-        check_hex="070B00"

+        check="7.10.0"

+        check_hex="070A00"

     echo "$as_me:$LINENO: checking for curl >= $check" >&5

 echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6

@@ -130,9 +130,9 @@ if test "$lcurl" != "no"

 then

     my_cv_curl_vers=NONE

     dnl check is the plain-text version of the required version

-    check="7.11.0"

+    check="7.10.0"

     dnl check_hex must be UPPERCASE if any hex letters are present

-    check_hex="070B00"

+    check_hex="070A00"

     AC_MSG_CHECKING([for curl >= $check])

Binary files a/docs/clamdoc.pdf and b/docs/clamdoc.pdf differ

@@ -19,7 +19,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <LINK REL="STYLESHEET" HREF="clamdoc.css">

-<LINK REL="previous" HREF="node109.html">

+<LINK REL="previous" HREF="node111.html">

 <LINK REL="up" HREF="clamdoc.html">

 </HEAD>

@@ -24,7 +24,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <BODY >

 <!--Navigation Panel-->

-<A NAME="tex2html217"

+<A NAME="tex2html225"

   HREF="node1.html">

 <IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"

  SRC="/usr/share/latex2html/icons/next.png"></A> 

@@ -32,14 +32,14 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

  SRC="/usr/share/latex2html/icons/up_g.png"> 

 <IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"

  SRC="/usr/share/latex2html/icons/prev_g.png"> 

-<A NAME="tex2html215"

+<A NAME="tex2html223"

   HREF="node1.html">

 <IMG WIDTH="65" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="contents"

  SRC="/usr/share/latex2html/icons/contents.png"></A>  

 <BR>

-<B> Next:</B> <A NAME="tex2html218"

+<B> Next:</B> <A NAME="tex2html226"

   HREF="node1.html">Contents</A>

- &nbsp <B>  <A NAME="tex2html216"

+ &nbsp <B>  <A NAME="tex2html224"

   HREF="node1.html">Contents</A></B> 

 <BR>

 <BR>

@@ -60,7 +60,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <BR>

 <BR>

     <DIV ALIGN="RIGHT">

-<BR>	<FONT SIZE="+3">Clam AntiVirus 0.80rc3

+<BR>	<FONT SIZE="+3">Clam AntiVirus 0.80rc4

 <BR>	<FONT SIZE="+3"><I>User Manual</I>

 <BR>    

 </FONT></FONT></DIV>

@@ -72,266 +72,270 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <A NAME="CHILD_LINKS"></A>

 <UL>

-<LI><A NAME="tex2html219"

+<LI><A NAME="tex2html227"

   HREF="node1.html">Contents</A>

-<LI><A NAME="tex2html220"

+<LI><A NAME="tex2html228"

   HREF="node2.html">Introduction</A>

 <UL>

-<LI><A NAME="tex2html221"

+<LI><A NAME="tex2html229"

   HREF="node3.html">Features</A>

-<LI><A NAME="tex2html222"

+<LI><A NAME="tex2html230"

   HREF="node4.html">Mailing lists</A>

-<LI><A NAME="tex2html223"

+<LI><A NAME="tex2html231"

   HREF="node5.html">Virus submitting</A>

 </UL>

 <BR>

-<LI><A NAME="tex2html224"

+<LI><A NAME="tex2html232"

   HREF="node6.html">Base package</A>

 <UL>

-<LI><A NAME="tex2html225"

+<LI><A NAME="tex2html233"

   HREF="node7.html">Supported platforms</A>

-<LI><A NAME="tex2html226"

+<LI><A NAME="tex2html234"

   HREF="node8.html">Binary packages</A>

-<LI><A NAME="tex2html227"

+<LI><A NAME="tex2html235"

   HREF="node9.html">Daily build snapshots</A>

 </UL>

 <BR>

-<LI><A NAME="tex2html228"

+<LI><A NAME="tex2html236"

   HREF="node10.html">Installation</A>

 <UL>

-<LI><A NAME="tex2html229"

+<LI><A NAME="tex2html237"

   HREF="node11.html">Requirements</A>

-<LI><A NAME="tex2html230"

+<LI><A NAME="tex2html238"

   HREF="node12.html">Installing on shell account</A>

-<LI><A NAME="tex2html231"

+<LI><A NAME="tex2html239"

   HREF="node13.html">Adding new system user and group</A>

-<LI><A NAME="tex2html232"

+<LI><A NAME="tex2html240"

   HREF="node14.html">Compilation of base package</A>

-<LI><A NAME="tex2html233"

+<LI><A NAME="tex2html241"

   HREF="node15.html">Compilation with clamav-milter enabled</A>

 </UL>

 <BR>

-<LI><A NAME="tex2html234"

+<LI><A NAME="tex2html242"

   HREF="node16.html">Configuration</A>

 <UL>

-<LI><A NAME="tex2html235"

+<LI><A NAME="tex2html243"

   HREF="node17.html">clamd</A>

 <UL>

-<LI><A NAME="tex2html236"

+<LI><A NAME="tex2html244"

   HREF="node18.html">On-access scanning</A>

 </UL>

-<LI><A NAME="tex2html237"

+<LI><A NAME="tex2html245"

   HREF="node19.html">clamav-milter</A>

-<LI><A NAME="tex2html238"

+<LI><A NAME="tex2html246"

   HREF="node20.html">Testing</A>

-<LI><A NAME="tex2html239"

+<LI><A NAME="tex2html247"

   HREF="node21.html">Setting up auto-updating</A>

-<LI><A NAME="tex2html240"

+<LI><A NAME="tex2html248"

   HREF="node22.html">Closest mirrors</A>

 </UL>

 <BR>

-<LI><A NAME="tex2html241"

+<LI><A NAME="tex2html249"

   HREF="node23.html">Usage</A>

 <UL>

-<LI><A NAME="tex2html242"

+<LI><A NAME="tex2html250"

   HREF="node24.html">Clam daemon</A>

-<LI><A NAME="tex2html243"

+<LI><A NAME="tex2html251"

   HREF="node25.html">Clam<B>d</B>scan</A>

-<LI><A NAME="tex2html244"

+<LI><A NAME="tex2html252"

   HREF="node26.html">Clamuko</A>

-<LI><A NAME="tex2html245"

+<LI><A NAME="tex2html253"

   HREF="node27.html">Output format</A>

 <UL>

-<LI><A NAME="tex2html246"

+<LI><A NAME="tex2html254"

   HREF="node28.html">clamscan</A>

-<LI><A NAME="tex2html247"

+<LI><A NAME="tex2html255"

   HREF="node29.html">clamd</A>

 </UL>

 </UL>

 <BR>

-<LI><A NAME="tex2html248"

+<LI><A NAME="tex2html256"

   HREF="node30.html">LibClamAV</A>

 <UL>

-<LI><A NAME="tex2html249"

+<LI><A NAME="tex2html257"

   HREF="node31.html">License</A>

-<LI><A NAME="tex2html250"

+<LI><A NAME="tex2html258"

   HREF="node32.html">Features</A>

 <UL>

-<LI><A NAME="tex2html251"

+<LI><A NAME="tex2html259"

   HREF="node33.html">Archives and compressed files</A>

-<LI><A NAME="tex2html252"

+<LI><A NAME="tex2html260"

   HREF="node34.html">Mail files</A>

 </UL>

-<LI><A NAME="tex2html253"

+<LI><A NAME="tex2html261"

   HREF="node35.html">API</A>

 <UL>

-<LI><A NAME="tex2html254"

+<LI><A NAME="tex2html262"

   HREF="node36.html">Header file</A>

-<LI><A NAME="tex2html255"

+<LI><A NAME="tex2html263"

   HREF="node37.html">Database loading</A>

-<LI><A NAME="tex2html256"

+<LI><A NAME="tex2html264"

   HREF="node38.html">Error handling</A>

-<LI><A NAME="tex2html257"

+<LI><A NAME="tex2html265"

   HREF="node39.html">Database structure</A>

 </UL>

-<LI><A NAME="tex2html258"

+<LI><A NAME="tex2html266"

   HREF="node40.html">Database reloading</A>

 <UL>

-<LI><A NAME="tex2html259"

+<LI><A NAME="tex2html267"

   HREF="node41.html">Data scan functions</A>

-<LI><A NAME="tex2html260"

+<LI><A NAME="tex2html268"

   HREF="node42.html">Memory</A>

-<LI><A NAME="tex2html261"

+<LI><A NAME="tex2html269"

   HREF="node43.html">clamav-config</A>

-<LI><A NAME="tex2html262"

+<LI><A NAME="tex2html270"

   HREF="node44.html">Example</A>

 </UL>

-<LI><A NAME="tex2html263"

+<LI><A NAME="tex2html271"

   HREF="node45.html">CVD format</A>

 </UL>

 <BR>

-<LI><A NAME="tex2html264"