samba-vscan/openantivirus vscan-oav.c,1.37.2.6,1.37.2.7 vscan-oav.h,1.13.2.3,1.13.2.4

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

Modified Files:
      Tag: VSCAN_0_3
	vscan-oav.c vscan-oav.h 
Log Message:
updated to use the new global configuration parsing module	


Index: vscan-oav.h
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/openantivirus/vscan-oav.h,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -d -r1.13.2.3 -r1.13.2.4
--- vscan-oav.h	2 May 2004 19:45:32 -0000	1.13.2.3
+++ vscan-oav.h	28 Sep 2004 15:54:36 -0000	1.13.2.4
@@ -8,69 +8,6 @@
 
 #define PARAMCONF "/etc/samba/vscan-oav.conf"
 
-
-/* False = log only infected file, True = log every file access */
-
-#ifndef VSCAN_VERBOSE_FILE_LOGGING
-# define VSCAN_VERBOSE_FILE_LOGGING False   
-#endif
-
-/* if a file is bigger than VSCAN_MAX_SIZE it won't be scanned. Has to be
-   specified in bytes! If it set to 0, the file size check is disabled */
-
-#ifndef VSCAN_MAX_SIZE 
-# define VSCAN_MAX_SIZE 0 
-#endif
-
-
-/* True = scan files on open */
-
-#ifndef VSCAN_SCAN_ON_OPEN 
-# define VSCAN_SCAN_ON_OPEN True 
-#endif
-
-/* True = scan files on close */
-
-#ifndef VSCAN_SCAN_ON_CLOSE
-# define VSCAN_SCAN_ON_CLOSE False
-#endif
-
-
-/* True = deny access in case of virus scanning failure */
-
-#ifndef VSCAN_DENY_ACCESS_ON_ERROR
-# define VSCAN_DENY_ACCESS_ON_ERROR True
-#endif 
-
-/* True = deny access in case of minor virus scanning failure */
-
-#ifndef VSCAN_DENY_ACCESS_ON_MINOR_ERROR
-# define VSCAN_DENY_ACCESS_ON_MINOR_ERROR True
-#endif
-
-/* True = send a warning message via window messenger service for viruses found */
-
-#ifndef VSCAN_SEND_WARNING_MESSAGE
-# define VSCAN_SEND_WARNING_MESSAGE True
-#endif
-
-/* default infected file action */
-#define VSCAN_INFECTED_FILE_ACTION INFECTED_QUARANTINE
-
-/* default quarantine settings; hopefully the user changes this */
-#define VSCAN_QUARANTINE_DIRECTORY "/tmp"
-#define VSCAN_QUARANTINE_PREFIX    "vir-"
-
-/* set default value for maximum lrufile entries */
-#define VSCAN_MAX_LRUFILES 100
-
-/* time after an entry is considered as expired */
-#define VSCAN_LRUFILES_INVALIDATE_TIME 5
-
-/* MIME-types of files to be exluded from scanning; that's an
-   semi-colon seperated list */
-#define VSCAN_FT_EXCLUDE_LIST ""
-
 /* IP:PORT OAV ScannerDaemon listens on */
 #define VSCAN_OAV_IP	"127.0.0.1"
 #define VSCAN_OAV_PORT 	8127

Index: vscan-oav.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/openantivirus/vscan-oav.c,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -u -d -r1.37.2.6 -r1.37.2.7
--- vscan-oav.c	26 Sep 2004 16:20:19 -0000	1.37.2.6
+++ vscan-oav.c	28 Sep 2004 15:54:36 -0000	1.37.2.7
@@ -128,7 +128,7 @@
 
 	#if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_RELEASE>=4) || SAMBA_VERSION_MAJOR==3
           
-	  fstrcpy(config_file, get_configuration_file(conn, VSCAN_MODULE_STR));
+	  fstrcpy(config_file, get_configuration_file(conn, VSCAN_MODULE_STR, PARAMCONF));
 	  DEBUG(0, ("configuration file is: %s\n", config_file));
 	  retval = pm_process(config_file, do_section, do_parameter);
 



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php