samba-vscan/sophos vscan-sophos.c,1.47.2.5,1.47.2.6 vscan-sophos.conf,1.8.2.5,1.8.2.6

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

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


Index: vscan-sophos.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/sophos/vscan-sophos.c,v
retrieving revision 1.47.2.5
retrieving revision 1.47.2.6
diff -u -d -r1.47.2.5 -r1.47.2.6
--- vscan-sophos.c	23 Feb 2005 02:49:40 -0000	1.47.2.5
+++ vscan-sophos.c	10 Apr 2005 15:22:53 -0000	1.47.2.6
@@ -140,7 +140,9 @@
 	DEBUG(5, ("init file type\n"));
 	filetype_init(0, vscan_config.common.exclude_file_types);
 
-
+        /* initialise file regexp */
+        DEBUG(5, ("init file regexp\n"));
+        fileregexp_init(vscan_config.common.exclude_file_regexp);
 
 	#if (SMB_VFS_INTERFACE_VERSION >= 6)
 	 return SMB_VFS_NEXT_CONNECT(handle, conn, svc, user);
@@ -222,9 +224,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
@@ -374,14 +380,21 @@
 		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 ( 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);
 		return retval;
 	}
 
-
 	sockfd = vscan_sophos_init();
         if ( sockfd >= 0 ) {
 		safe_strcpy(client_ip, fsp->conn->client_address, CLIENT_IP_SIZE -1);

Index: vscan-sophos.conf
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/sophos/vscan-sophos.conf,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -d -r1.8.2.5 -r1.8.2.6
--- vscan-sophos.conf	7 Dec 2004 21:57:27 -0000	1.8.2.5
+++ vscan-sophos.conf	10 Apr 2005 15:22:53 -0000	1.8.2.6
@@ -56,5 +56,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 =
+
 ; socket name of Sophie (default: /var/run/sophie)
 sophie socket name = /var/run/sophie



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