libclamav: add CL_FLEVEL_DCONF (bb#1313)

git-svn: trunk@4550

ChangeLog

@@ -1,3 +1,7 @@
+Wed Dec 10 20:09:00 CET 2008 (tk)
+---------------------------------
+ * libclamav: add CL_FLEVEL_DCONF (bb#1313)
+
 Tue Dec  9 03:32:08 CET 2008 (acab)
 -----------------------------------
  * clamconf: skip milter's directives

libclamav/dconf.c

@@ -247,7 +247,7 @@ static int chkflevel(const char *entry, int field)
 	    return 0;
 	}
 
-	if((unsigned int) atoi(pt) > cl_retflevel()) {
+	if((unsigned int) atoi(pt) > CL_FLEVEL_DCONF) {
 	    free(pt);
 	    return 0;
 	}
@@ -260,7 +260,7 @@ static int chkflevel(const char *entry, int field)
 		return 0;
 	    }
 
-	    if((unsigned int) atoi(pt) < cl_retflevel()) {
+	    if((unsigned int) atoi(pt) < CL_FLEVEL_DCONF) {
 		free(pt);
 		return 0;
 	    }

libclamav/others.c

@@ -92,8 +92,6 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;
 #define       P_tmpdir        "C:\\WINDOWS\\TEMP"
 #endif
 
-#define CL_FLEVEL 38 /* don't touch it */
-
 uint8_t cli_debug_flag = 0;
 
 #ifndef CLI_MEMFUNSONLY

libclamav/others.h

@@ -35,6 +35,18 @@
 #include "dconf.h"
 #include "libclamunrar_iface/unrar_iface.h"
 
+/*
+ * CL_FLEVEL is the signature f-level specific to the current code and
+ *	     should never be modified
+ * CL_FLEVEL_DCONF is used in the dconf module and can be bumped by
+ * distribution packagers provided they fix *all* security issues found
+ * in the old versions of ClamAV. Updating CL_FLEVEL_DCONF will result
+ * in re-enabling affected modules.
+ */
+
+#define CL_FLEVEL 38
+#define CL_FLEVEL_DCONF	CL_FLEVEL
+
 extern uint8_t cli_debug_flag;
 
 /*