[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 09dc3ecb56f5f9bdf9c9ee645faad6bda262ba4d
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Jul 15 19:25:41 2009 +0200

    clamscan: honour value of 0 in --max-* options (bb#1650)

diff --git a/ChangeLog b/ChangeLog
index 74afa63..5b74b56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 15 19:24:03 CEST 2009 (tk)
+----------------------------------
+ * clamscan: honour value of 0 in --max-* options (bb#1650)
+
 Wed Jul 15 16:25:00 EEST 2009 (edwin)
 -------------------------------------
  * unit_tests/check_clamd.c: fix unit tests when run as root (bb #1635).
diff --git a/clamscan/manager.c b/clamscan/manager.c
index 1e6ebf2..130c584 100644
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@@ -452,7 +452,7 @@ int scanmanager(const struct optstruct *opts)
 
     /* set limits */
 
-    if((opt = optget(opts, "max-scansize"))->enabled) {
+    if((opt = optget(opts, "max-scansize"))->active) {
 	if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_SCANSIZE, opt->numarg))) {
 	    logg("!cli_engine_set_num(CL_ENGINE_MAX_SCANSIZE) failed: %s\n", cl_strerror(ret));
 	    cl_engine_free(engine);
@@ -460,7 +460,7 @@ int scanmanager(const struct optstruct *opts)
 	}
     }
 
-    if((opt = optget(opts, "max-filesize"))->enabled) {
+    if((opt = optget(opts, "max-filesize"))->active) {
 	if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_FILESIZE, opt->numarg))) {
 	    logg("!cli_engine_set_num(CL_ENGINE_MAX_FILESIZE) failed: %s\n", cl_strerror(ret));
 	    cl_engine_free(engine);
@@ -479,7 +479,7 @@ int scanmanager(const struct optstruct *opts)
     }
 #endif
 
-    if((opt = optget(opts, "max-files"))->enabled) {
+    if((opt = optget(opts, "max-files"))->active) {
 	if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_FILES, opt->numarg))) {
 	    logg("!cli_engine_set_num(CL_ENGINE_MAX_FILES) failed: %s\n", cl_strerror(ret));
 	    cl_engine_free(engine);
@@ -487,7 +487,7 @@ int scanmanager(const struct optstruct *opts)
 	}
     }
 
-    if((opt = optget(opts, "max-recursion"))->enabled) {
+    if((opt = optget(opts, "max-recursion"))->active) {
 	if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_RECURSION, opt->numarg))) {
 	    logg("!cli_engine_set_num(CL_ENGINE_MAX_RECURSION) failed: %s\n", cl_strerror(ret));
 	    cl_engine_free(engine);
@@ -561,7 +561,7 @@ int scanmanager(const struct optstruct *opts)
 	    options |= CL_SCAN_STRUCTURED_SSN_NORMAL;
 	}
 
-	if((opt = optget(opts, "structured-ssn-count"))->enabled) {
+	if((opt = optget(opts, "structured-ssn-count"))->active) {
 	    if((ret = cl_engine_set_num(engine, CL_ENGINE_MIN_SSN_COUNT, opt->numarg))) {
 		logg("!cli_engine_set_num(CL_ENGINE_MIN_SSN_COUNT) failed: %s\n", cl_strerror(ret));
 		cl_engine_free(engine);
@@ -569,7 +569,7 @@ int scanmanager(const struct optstruct *opts)
 	    }
 	}
 
-	if((opt = optget(opts, "structured-cc-count"))->enabled) {
+	if((opt = optget(opts, "structured-cc-count"))->active) {
 	    if((ret = cl_engine_set_num(engine, CL_ENGINE_MIN_CC_COUNT, opt->numarg))) {
 		logg("!cli_engine_set_num(CL_ENGINE_MIN_CC_COUNT) failed: %s\n", cl_strerror(ret));
 		cl_engine_free(engine);

-- 
Debian repository for ClamAV