samba-vscan/f-secure vscan-fsav.c,1.1.2.5,1.1.2.6 vscan-fsav.h,1.1.2.1,1.1.2.2

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

Modified Files:
      Tag: VSCAN_0_3
	vscan-fsav.c vscan-fsav.h 
Log Message:
compile-time settings moved to corresponding header file to be in
sync with other modules


Index: vscan-fsav.h
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/f-secure/Attic/vscan-fsav.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- vscan-fsav.h	4 Dec 2003 16:31:13 -0000	1.1.2.1
+++ vscan-fsav.h	7 Apr 2004 10:01:34 -0000	1.1.2.2
@@ -29,8 +29,12 @@
 #ifndef __VSCAN_FSAV_H_
 #define __VSCAN_FSAV_H_
 
+#include "vscan-global.h"
+
 #include "vscan-fsav_core.h"
 
+/* configuration section */
+
 /* default location of samba-style configuration file (needs Samba >= 2.2.4 or Samba 3.0 */
 
 #define PARAMCONF "/etc/samba/vscan-fsav.conf"
@@ -100,4 +104,41 @@
 #define VSCAN_FT_EXCLUDE_LIST ""
 
 
+/* FSAV-related settings */
+
+/* should fsavd started for each user */
+#define VSAN_FSAV_USERINSTANCE False
+
+/* the uid fsavd is running. Normally 0 as fsavd runs as root. Should be -1
+   if fsavd is started for each user */
+#define VSCAN_FSAV_CONNECT_ID 0
+
+/* fsav configuration file */
+#define VSCAN_FSAV_CONFIG_FILE "/etc/fsav.conf"
+
+/* location of fsavd binary */
+#define VSCAN_FSAV_BINARY "/opt/f-secure/fsav/bin/fsavd"
+
+/* path to FSAV databases */
+#define VSCAN_FSAV_DB_DIR "/var/opt/f-secure/fsav/databases"
+
+/* fsav socket name */
+#define VSCAN_FSAV_SOCKET "/tmp/.fsav-0"
+
+/* scan inside archives */
+#define VSCAN_FSAV_ARCHIVE_SCAN True
+
+/* scan mime */
+#define VSCAN_FSAV_MINE_SCAN True
+
+/* scan depth in archives */
+#define VSCAN_FSAV_MAX_NESTED_LEVEL 5
+
+/* scan timeout, 0 = no timeout */
+#define VSCAN_FSAV_TIMEOUT 0
+
+
+/* end configuration section */
+
+
 #endif /* __VSCAN_FSAV_H */

Index: vscan-fsav.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/f-secure/Attic/vscan-fsav.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- vscan-fsav.c	10 Mar 2004 16:29:03 -0000	1.1.2.5
+++ vscan-fsav.c	7 Apr 2004 10:01:34 -0000	1.1.2.6
@@ -275,16 +275,16 @@
 
 	/* fsav specific defaults */
 
-	set_boolean(&fsav_userinstance, "yes");
-	fsav_connect_uid = -1;
-	fsav_timeout = 0;	/* fsav default is 0 */
-	fsav_maxnested = 5;	/* fsav default is 5 */
-	set_boolean(&fsav_archive, "yes");
-	set_boolean(&fsav_mime, "yes");
-	pstrcpy(fsav_config_file, "/etc/fsav.conf");
-	pstrcpy(fsav_socket, "/tmp/.fsav");
-	pstrcpy(fsav_db_dir, "/var/opt/f-secure/fsav/databases/");
-	pstrcpy(fsav_binary, "/opt/f-secure/fsav/bin/fsavd");
+	fsav_userinstance = VSAN_FSAV_USERINSTANCE;
+	fsav_connect_uid = VSCAN_FSAV_CONNECT_ID;
+	fsav_timeout = VSCAN_FSAV_TIMEOUT;
+	fsav_maxnested = VSCAN_FSAV_MAX_NESTED_LEVEL;
+	fsav_archive = VSCAN_FSAV_ARCHIVE_SCAN; 
+	fsav_mime = VSCAN_FSAV_MINE_SCAN;
+	pstrcpy(fsav_config_file, VSCAN_FSAV_CONFIG_FILE);
+	pstrcpy(fsav_socket, VSCAN_FSAV_SOCKET);
+	pstrcpy(fsav_db_dir, VSCAN_FSAV_DB_DIR);
+	pstrcpy(fsav_binary, VSCAN_FSAV_DB_DIR);
 	pstrcpy(fsav_user, user);
 
 	vscan_syslog("INFO: connect to service %s by user %s", svc, user);



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click