samba-vscan/nai vscan-mcdaemon.c,1.1.2.6,1.1.2.7 vscan-mcdaemon.conf,1.1.2.3,1.1.2.4

Update of /cvsroot/openantivirus/samba-vscan/nai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8392/nai

Modified Files:
      Tag: VSCAN_0_3
	vscan-mcdaemon.c vscan-mcdaemon.conf 
Log Message:
use file regexp stuff
modified some syslog satements to contain the INFO tag
some other small changes


Index: vscan-mcdaemon.conf
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/nai/Attic/vscan-mcdaemon.conf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- vscan-mcdaemon.conf	7 Dec 2004 21:57:26 -0000	1.1.2.3
+++ vscan-mcdaemon.conf	10 Apr 2005 15:22:53 -0000	1.1.2.4
@@ -54,6 +54,14 @@
 ; (Default: 5)
 lru file entry lifetime = 5
 
+; exclude files from being scanned based on the MIME-type! Semi-colon
+; seperated list (default: empty list). Use this with care!
+exclude file types =
+
+; exclude files from being scanned via regular expression (PCRE)
+; (default: empty)
+exclude file regexp =
+
 
 ; IP of McDaemon
 mcdaemon ip = 127.0.0.1

Index: vscan-mcdaemon.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/nai/Attic/vscan-mcdaemon.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- vscan-mcdaemon.c	23 Feb 2005 02:49:39 -0000	1.1.2.6
+++ vscan-mcdaemon.c	10 Apr 2005 15:22:53 -0000	1.1.2.7
@@ -138,6 +138,8 @@
         DEBUG(5, ("init file type\n"));
         filetype_init(0, vscan_config.common.exclude_file_types);
 
+        /* initialise file regexp */
+        fileregexp_init(vscan_config.common.exclude_file_regexp);
 
         #if (SMB_VFS_INTERFACE_VERSION >= 6)
          return SMB_VFS_NEXT_CONNECT(handle, conn, svc, user);
@@ -218,9 +220,13 @@
 #else
                 return default_vfs_ops.open(conn, fname, flags, mode);
 #endif
+        else if ( fileregexp_skipscan(filepath) == VSCAN_FR_SKIP_SCAN ) {
+                if ( vscan_config.common.verbose_file_logging )
+                        vscan_syslog("INFO: file '%s' not scanned as file is machted by exclude regexp", filepath);
+        }
         else if ( filetype_skipscan(filepath) == VSCAN_FT_SKIP_SCAN ) {
                 if ( vscan_config.common.verbose_file_logging )
-                        vscan_syslog("File '%s' not scanned as file type is on exclude list", filepath);
+                        vscan_syslog("INFO: file '%s' not scanned as file type is on exclude list", filepath);
 #if (SMB_VFS_INTERFACE_VERSION >= 6)
                 return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
 #else
@@ -373,10 +379,17 @@
 		return retval;
 	}
 
+        /* dont' scan file which matches exclude regexp */
+        if ( fileregexp_skipscan(filepath) == VSCAN_FR_SKIP_SCAN ) {
+                if ( vscan_config.common.verbose_file_logging )
+                        vscan_syslog("INFO: file '%s' not scanned as file is machted by exclude regexp", filepath);
+                return retval;
+        }
+
 	/* don't scan files which are in the list of exclude file types */
 	if ( filetype_skipscan(filepath) == VSCAN_FT_SKIP_SCAN ) {
-                if ( verbose_file_logging )
-                        vscan_syslog("File '%s' not scanned as file type is on exclude list", filepath);
+                if ( vscan_config.common.verbose_file_logging )
+                        vscan_syslog("INFO: file '%s' not scanned as file type is on exclude list", filepath);
 		return retval;
 	}
 



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click