[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 19c788af043d8f686c529b3213dfe3def1db18fc
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Tue Jul 28 20:36:38 2009 +0200

    clamscan, clamd, libclamav: load cvd files on-the-fly (without unpacking them to /tmp) by default

diff --git a/ChangeLog b/ChangeLog
index 74f30c0..a8a36a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 28 20:34:13 CEST 2009 (tk)
+----------------------------------
+ * clamscan, clamd, libclamav: load cvd files on-the-fly (without unpacking them
+			       to /tmp) by default
+
 Tue Jul 28 20:19:08 CEST 2009 (tk)
 ----------------------------------
  * libclamav: improve loading speed of compressed databases (bb#1105)
diff --git a/clamd/clamd.c b/clamd/clamd.c
index 09d3477..5f7dd14 100644
--- a/clamd/clamd.c
+++ b/clamd/clamd.c
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
 	int ret, tcpsock = 0, localsock = 0, i, min_port, max_port;
 	unsigned int sigs = 0;
 	int lsockets[2], nlsockets = 0;
-	unsigned int dboptions = 0;
+	unsigned int dboptions = CL_DB_CVDNOTMP;
 #ifdef C_LINUX
 	struct stat sb;
 #endif
diff --git a/clamscan/manager.c b/clamscan/manager.c
index 130c584..130f768 100644
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@@ -328,7 +328,7 @@ int scanmanager(const struct optstruct *opts)
 {
 	mode_t fmode;
 	int ret = 0, fmodeint, i;
-	unsigned int options = 0, dboptions = 0;
+	unsigned int options = 0, dboptions = CL_DB_CVDNOTMP;
 	struct cl_engine *engine;
 	struct stat sb;
 	char *file, cwd[1024], *pua_cats = NULL;
diff --git a/libclamav/clamav.h b/libclamav/clamav.h
index b64dbaa..3683dfd 100644
--- a/libclamav/clamav.h
+++ b/libclamav/clamav.h
@@ -81,7 +81,7 @@ typedef enum {
 #define CL_DB_COMPILED	    0x400   /* internal */
 
 /* recommended db settings */
-#define CL_DB_STDOPT	    (CL_DB_PHISHING | CL_DB_PHISHING_URLS)
+#define CL_DB_STDOPT	    (CL_DB_PHISHING | CL_DB_PHISHING_URLS | CL_DB_CVDNOTMP)
 
 /* scan options */
 #define CL_SCAN_RAW			0x0

-- 
Debian repository for ClamAV