samba-vscan/global vscan-parameter.c,1.1.2.3,1.1.2.4

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

Modified Files:
      Tag: VSCAN_0_3
	vscan-parameter.c 
Log Message:
configuration file is a per module setting


Index: vscan-parameter.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/global/Attic/vscan-parameter.c,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-parameter.c	26 Sep 2004 20:18:06 -0000	1.1.2.3
+++ vscan-parameter.c	28 Sep 2004 12:45:22 -0000	1.1.2.4
@@ -91,9 +91,9 @@
 /* FIXME: should we use const here? Should we use **conn instead? */
 
 #if (SMB_VFS_INTERFACE_VERSION >= 6)
-const char* get_configuration_file(const connection_struct *conn, fstring module_name)
+const char* get_configuration_file(const connection_struct *conn, fstring module_name, fstring paramconf)
 #else
-const char* get_configuration_file(const struct connection_struct *conn, fstring module_name)
+const char* get_configuration_file(const struct connection_struct *conn, fstring module_name, fstring paramconf)
 #endif
 {
 	static fstring config_file;
@@ -106,7 +106,7 @@
         #endif
 
          #if (SMB_VFS_INTERFACE_VERSION >= 6)
-          fstrcpy(config_file, lp_parm_const_string(SNUM(conn),module_name,"config-file",PARAMCONF));
+          fstrcpy(config_file, lp_parm_const_string(SNUM(conn),module_name,"config-file",paramconf));
          #else
           pstrcpy(opts_str, (const char*) lp_vfs_options(SNUM(conn)));
           if( !*opts_str ) {
@@ -118,13 +118,13 @@
                         if ( !strequal("config-file", config_file) ) {
                                 DEBUG(3, ("samba-vscan - connect: options %s is not config-file\n", config_file));
                                 /* setting default value */
-                                fstrcpy(config_file, PARAMCONF);
+                                fstrcpy(config_file, paramconf);
 
                         } else {
                                 if ( !next_token(&p, config_file," \n",sizeof(config_file)) ) {
                                         DEBUG(3, ("samba-vscan - connect: no option after config-file=\n"));
                                         /* setting default value */
-                                        fstrcpy(config_file, PARAMCONF);
+                                        fstrcpy(config_file, paramconf);
                                 } else {
                                         trim_string(config_file, " ", " ");
                                         DEBUG(3, ("samba-vscan - connect: config file name is %s\n", config_file));



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