samba-vscan/icap vscan-icap.c,1.14.2.5,1.14.2.6 vscan-icap.conf,1.5.2.4,1.5.2.5

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

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


Index: vscan-icap.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/icap/vscan-icap.c,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -d -r1.14.2.5 -r1.14.2.6
--- vscan-icap.c	23 Feb 2005 02:49:38 -0000	1.14.2.5
+++ vscan-icap.c	10 Apr 2005 15:22:51 -0000	1.14.2.6
@@ -147,6 +147,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);
@@ -227,9 +229,14 @@
 #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 ( 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);
 #if (SMB_VFS_INTERFACE_VERSION >= 6)
                 return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
 #else
@@ -381,9 +388,16 @@
 		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 )
+                if ( vscan_config.common.verbose_file_logging )
                         vscan_syslog("File '%s' not scanned as file type is on exclude list", filepath);
 		return retval;
 	}

Index: vscan-icap.conf
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/icap/vscan-icap.conf,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -d -r1.5.2.4 -r1.5.2.5
--- vscan-icap.conf	7 Dec 2004 21:57:25 -0000	1.5.2.4
+++ vscan-icap.conf	10 Apr 2005 15:22:51 -0000	1.5.2.5
@@ -58,6 +58,9 @@
 ; 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 ICAP server listens on
 icap ip = 127.0.0.1



-------------------------------------------------------
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