samba-vscan/nai vscan-mcdaemon.c,1.1.2.1,1.1.2.2 vscan-mcdaemon.h,1.1.2.1,1.1.2.2 vscan-mcdaemon_core.c,1.1.2.1,1.1.2.2 vscan-mcdaemon_core.h,1.1.2.1,1.1.2.2

[email protected]
Newsgroups gmane.comp.security.virus.openantivirus.cvs
Message-ID <[email protected]>
Update of /cvsroot/openantivirus/samba-vscan/nai
In directory sc8-pr-cvs1:/tmp/cvs-serv25276

Modified Files:
      Tag: VSCAN_0_3
	vscan-mcdaemon.c vscan-mcdaemon.h vscan-mcdaemon_core.c 
	vscan-mcdaemon_core.h 
Log Message:
get module actually compiling with Samba 2.2.x and 3.0


Index: vscan-mcdaemon.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/nai/Attic/vscan-mcdaemon.c,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-mcdaemon.c	4 Dec 2003 16:24:00 -0000	1.1.2.1
+++ vscan-mcdaemon.c	5 Dec 2003 14:29:53 -0000	1.1.2.2
@@ -27,15 +27,12 @@
  */
 
 
-#include <includes.h>
-#include <vfs.h>
-
+#include "vscan-global.h"
 #include "vscan-mcdaemon.h"
+
 #include "vscan-vfs.h"
-#include "vscan-functions.h"
-#include "vscan-quarantine.h"
-#include "vscan-fileaccesslog.h"
 
+#define VSCAN_MODULE_STR "vscan-mcdaemon"
 
 fstring config_file;            /* location of config file, either
                                    PARAMCONF or as set via vfs options
@@ -80,13 +77,13 @@
 time_t lrufiles_invalidate_time; /* specified the time in seconds after the lifetime
                                     of an entry is expired and entry will be invalidated */
 
-
+pstring exclude_file_types;     /* list of file types which should be excluded from scanning */
 
 /* module version */
-static const char module_id[]="vscan-mcdaemon 0.0.1-PoC";
+static const char module_id[]=VSCAN_MODULE_STR" "SAMBA_VSCAN_VERSION_STR;
 
 
-static BOOL do_parameter(char *param, char *value)
+static BOOL do_parameter(const char *param, const char *value)
 {
         if ( StrCaseCmp("max file size", param) == 0 ) {
                 max_size = atoi(value);
@@ -149,7 +146,7 @@
         return True;
 }
 
-static BOOL do_section(char *section)
+static BOOL do_section(const char *section)
 {
         /* simply return true, there's only one section :-) */
         return True;
@@ -160,30 +157,23 @@
 
 /* Implementation of vfs_ops.  */
 
-#if SAMBA_VERSION_MAJOR==3
- /* Samba 3.0 alphaX */
- static int vscan_connect(struct connection_struct *conn, const char *svc, const char *user)
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+static int vscan_connect(vfs_handle_struct *handle, connection_struct *conn, const char *svc, const char *user)
 #else
- /* Samba 2.2.x */
- #if SAMBA_VERSION_MINOR==4
-  /* Samba 2.2.4 */
-  int vscan_connect(struct connection_struct *conn, const char *svc, const char *user)
- #else
-  /* Samba 2.2.3-2.2.0 */
-  int vscan_connect(struct connection_struct *conn, char *svc, char *user)
- #endif
+static int vscan_connect(struct connection_struct *conn, PROTOTYPE_CONST char *svc, PROTOTYPE_CONST char *user)
 #endif
 {
-	#if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_MINOR==4) || SAMBA_VERSION_MAJOR==3
+        #if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_RELEASE>=4) || SAMBA_VERSION_MAJOR==3
+         #if !(SMB_VFS_INTERFACE_VERSION >= 6)
           pstring opts_str;
-          #if SAMBA_VERSION_MAJOR==3
-           const char *p;
-          #else
-           char *p;
-          #endif
-	#endif
+          PROTOTYPE_CONST char *p;
+         #endif
+        #endif
         int retval;
 
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+        vscan_syslog("samba-vscan (%s) connected (Samba 3.0), (c) by Rainer Link, OpenAntiVirus.org", module_id);
+#endif
 
         /* set default value for configuration files */
         fstrcpy(config_file, PARAMCONF);
@@ -234,7 +224,10 @@
 	vscan_syslog("INFO: connect to service %s by user %s", 
 	       svc, user);
 
-	#if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_MINOR==4) || SAMBA_VERSION_MAJOR==3
+        #if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_RELEASE>=4) || SAMBA_VERSION_MAJOR==3
+         #if (SMB_VFS_INTERFACE_VERSION >= 6)
+          fstrcpy(config_file, lp_parm_const_string(SNUM(conn),VSCAN_MODULE_STR,"config-file",PARAMCONF));
+         #else
           pstrcpy(opts_str, (const char*) lp_vfs_options(SNUM(conn)));
           if( !*opts_str ) {
                 DEBUG(3, ("samba-vscan: no configuration file set - using default value (%s).\n", lp_vfs_options(SNUM(conn))));
@@ -259,6 +252,7 @@
                         }
                 }
           }
+          #endif /*  #if (SMB_VFS_INTERFACE_VERSION >= 6)*/
           retval = pm_process(config_file, do_section, do_parameter);
           DEBUG(10, ("pm_process returned %d\n", retval));
 	  if (!retval) vscan_syslog("ERROR: could not parse configuration file '%s'. File not found or not read-able. Using compiled-in defaults", config_file);
@@ -268,43 +262,43 @@
         DEBUG(5, ("init lrufiles list\n"));
         lrufiles_init(max_lrufiles, lrufiles_invalidate_time);
 
+	/* initialise filetype */
+        DEBUG(5, ("init file type\n"));
+        filetype_init(0, exclude_file_types);
+
+
+        #if (SMB_VFS_INTERFACE_VERSION >= 6)
+         return SMB_VFS_NEXT_CONNECT(handle, conn, svc, user);
+        #else
+         return default_vfs_ops.connect(conn, svc, user);
+        #endif
 
-	#if SAMBA_VERSION_MAJOR!=3
-	return default_vfs_ops.connect(conn, svc, user);
-	#else
-	return 0;	/* Success */
-	#endif
 }
 
-#if SAMBA_VERSION_MAJOR==3
- /* Samba 3.0 alphaX */
- static void vscan_disconnect(struct connection_struct *conn)
-#else
- /* Samba 2.2.x */
- void vscan_disconnect(struct connection_struct *conn)
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+static void vscan_disconnect(vfs_handle_struct *handle, connection_struct *conn)
+#else/* Samba 3.0 alphaX */
+static void vscan_disconnect(struct connection_struct *conn)
 #endif
 {
 
-	vscan_syslog("INFO: disconnected");
+        vscan_syslog("INFO: disconnected");
 
         lrufiles_destroy_all();
+        filetype_close();
 
-	default_vfs_ops.disconnect(conn);
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+        SMB_VFS_NEXT_DISCONNECT(handle, conn);
+#else
+        default_vfs_ops.disconnect(conn);
+#endif
 }
 
 
-#if SAMBA_VERSION_MAJOR==3
- /* Samba 3.0 alphaX */
- static int vscan_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode)
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+static int vscan_open(vfs_handle_struct *handle, connection_struct *conn, const char *fname, int flags, mode_t mode)
 #else
- /* Samba 2.2.x */
- #if SAMBA_VERSION_MINOR==4
-  /* Samba 2.2.4 */
-  int vscan_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode)
- #else
-  /* Samba 2.2.3 - 2.2.0 */
-  int vscan_open(struct connection_struct *conn, char *fname, int flags, mode_t mode)
- #endif
+static int vscan_open(struct connection_struct *conn, PROTOTYPE_CONST char *fname, int flags, mode_t mode)
 #endif
 {
 	int retval, must_be_checked;
@@ -315,24 +309,48 @@
 
 	int rc;
 
-
         /* scan files while opening? */
         if ( !scan_on_open ) {
+                /* we should use vscan_syslog instead of DEBUG here ... */
                 DEBUG(3, ("samba-vscan - open: File '%s' not scanned as scan_on_open is not set\n", fname));
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+                return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+#else
                 return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
         }
 
-
-        if ( (default_vfs_ops.stat(conn, fname, &stat_buf)) != 0 )    /* an error occured */ 
-		return default_vfs_ops.open(conn, fname, flags, mode);
-	else if ( S_ISDIR(stat_buf.st_mode) ) 	/* is it a directory? */
-		 return default_vfs_ops.open(conn, fname, flags, mode);
-	else if ( ( stat_buf.st_size > max_size ) && ( max_size > 0 ) ) /* file is too large */
-		vscan_syslog("INFO: File %s is larger than specified maximum file size! Not scanned!", fname);
-	else if ( stat_buf.st_size == 0 ) /* do not scan empty files */
-		return default_vfs_ops.open(conn, fname, flags, mode);
-	else  
-	{
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+        if ( (SMB_VFS_NEXT_STAT(handle, conn, fname, &stat_buf)) != 0 )    /* an error occured */
+                return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+#else
+        if ( (default_vfs_ops.stat(conn, fname, &stat_buf)) != 0 )    /* an error occured */
+                return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
+        else if ( S_ISDIR(stat_buf.st_mode) )   /* is it a directory? */
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+                return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+#else
+                return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
+        else if ( ( stat_buf.st_size > max_size ) && ( max_size > 0 ) ) /* file is too large */
+                vscan_syslog("INFO: File %s is larger than specified maximum file size! Not scanned!", fname);
+        else if ( stat_buf.st_size == 0 ) /* do not scan empty files */
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+                return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+#else
+                return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
+        else if ( filetype_skipscan(filepath) == 1 ) {
+                if ( verbose_file_logging )
+                        vscan_syslog("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
+                return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
+        } else
+        {
 		/* open socket */
 		sockfd = vscan_mcdaemon_init();
 
@@ -373,7 +391,11 @@
 				vscan_mcdaemon_end(sockfd);
 				
 				/* grant access */
-				return default_vfs_ops.open(conn, fname, flags, mode);
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+                                return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+#else
+                                return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
                         }
                         /* ok, we must check the file */
 
@@ -406,18 +428,22 @@
 				/* close socket */
 				vscan_mcdaemon_end(sockfd);
 				/* do action ... */
-				
-				rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+                                rc = vscan_do_infected_file_action(handle, conn, filepath, quarantine_dir, quarantine_prefix,
+ infected_file_action);
+#else
+                                rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+#endif
 
                                 /* add/update file. mark file as infected! */
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
 
 				/* virus found, deny acces */
 				errno = EACCES; 
 				return -1;
                         } else if ( retval == 0 ) {
                                 /* file is clean, add to lrufiles */
-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
+                                lrufiles_add(filepath, stat_buf.st_mtime, False);
                         }
 		}
 
@@ -425,17 +451,19 @@
 		vscan_mcdaemon_end(sockfd);
 
 	}
-	return default_vfs_ops.open(conn, fname, flags, mode);
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+        return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
+#else
+        return default_vfs_ops.open(conn, fname, flags, mode);
+#endif
 
 }
 
 
-#if SAMBA_VERSION_MAJOR==3
- /* Samba 3.0 alphaX */
- static int vscan_close(struct files_struct *fsp, int fd)
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+static int vscan_close(vfs_handle_struct *handle, files_struct *fsp, int fd)
 #else
- /* Samba 2.2.x */
- int vscan_close(struct files_struct *fsp, int fd)
+static int vscan_close(struct files_struct *fsp, int fd)
 #endif
 {
 	pstring filepath;
@@ -444,7 +472,12 @@
 	char client_ip[18];
 
         /* First close the file */
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+        retval = SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
+#else
         retval = default_vfs_ops.close(fsp, fd);
+#endif
+
 
         if ( !scan_on_close ) {
                 DEBUG(3, ("samba-vscan - close: File '%s' not scanned as scan_on_close is not set\n", fsp->fsp_name));
@@ -469,6 +502,14 @@
 		return retval;
 	}
 
+        /* don't scan files which are in the list of exclude file types */
+        if ( filetype_skipscan(filepath) == 1 ) {
+                if ( verbose_file_logging )
+                        vscan_syslog("File '%s' not scanned as file type is on exclude list", filepath);
+                return retval;
+        }
+
+
 	/* scan only file, do nothing */	
         sockfd = vscan_mcdaemon_init();
 
@@ -477,8 +518,13 @@
 		rv = vscan_mcdaemon_scanfile(sockfd, filepath, client_ip);
 		vscan_mcdaemon_end(sockfd);
 		if ( rv == 1 ) {
-			/* virus was found */
-			rc = vscan_do_infected_file_action(&default_vfs_ops, fsp->conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+                        /* virus was found */
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+                        rc = vscan_do_infected_file_action(handle, fsp->conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+#else
+                        rc = vscan_do_infected_file_action(&default_vfs_ops, fsp->conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+#endif
+
 		}
 
 	}
@@ -487,23 +533,34 @@
 
 
 
+#if (SMB_VFS_INTERFACE_VERSION >= 6)
+/* Samba 3.0 */
+NTSTATUS init_module(void)
+{
+        NTSTATUS ret;
+
+        ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, VSCAN_MODULE_STR, vscan_ops);
+        DEBUG(5,("samba-vscan (%s) registered (Samba 3.0), (c) by Rainer Link, OpenAntiVirus.org\n", module_id));
+        openlog("smbd_"VSCAN_MODULE_STR, LOG_PID, SYSLOG_FACILITY);
 
+        return ret;
+}
+#else
 /* VFS initialisation function.  Return initialised vfs_ops structure
    back to SAMBA. */
-
 #if SAMBA_VERSION_MAJOR==3
  /* Samba 3.0 alphaX */
  vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
-			struct smb_vfs_handle_struct *vfs_handle)
+                        struct smb_vfs_handle_struct *vfs_handle)
 #else
  /* Samba 2.2.x */
- #if SAMBA_VERSION_MINOR==4   
+ #if SAMBA_VERSION_RELEASE>=4
   /* Samba 2.2.4 */
   struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
- #elif SAMBA_VERSION_MINOR==2
+ #elif SAMBA_VERSION_RELEASE==2
   /* Samba 2.2.2 / Samba 2.2.3 !!! */
   struct vfs_ops *vfs_init(int* Version, struct vfs_ops *ops)
- #elif SAMBA_VERSION_MINOR==1
+ #elif SAMBA_VERSION_RELEASE==1
   /* Samba 2.2.1 */
   struct vfs_ops *vfs_module_init(int *vfs_version)
  #else
@@ -512,15 +569,14 @@
  #endif
 #endif
 {
-	#if SAMBA_VERSION_MAJOR!=3
- 	 #if SAMBA_VERSION_MINOR==4
-	  /* Samba 2.2.4 */
-	  struct vfs_ops tmp_ops;
-	 #endif
-	#endif
-
+        #if SAMBA_VERSION_MAJOR!=3
+         #if SAMBA_VERSION_RELEASE>=4
+          /* Samba 2.2.4 */
+          struct vfs_ops tmp_ops;
+         #endif
+        #endif
 
-        openlog("smbd_vscan_mcdaemon", LOG_PID, SYSLOG_FACILITY);
+        openlog("smbd_"VSCAN_MODULE_STR, LOG_PID, SYSLOG_FACILITY);
 
         #if SAMBA_VERSION_MAJOR==3
          /* Samba 3.0 alphaX */
@@ -528,11 +584,11 @@
          vscan_syslog("samba-vscan (%s) loaded (Samba 3.x), (c) by Rainer Link, OpenAntiVirus.org", module_id);
         #else
          /* Samba 2.2.x */
-         #if SAMBA_VERSION_MINOR==4
+         #if SAMBA_VERSION_RELEASE>=4
           /* Samba 2.2.4 */
           *vfs_version = SMB_VFS_INTERFACE_VERSION;
           vscan_syslog("samba-vscan (%s) loaded (Samba >=2.2.4), (c) by Rainer Link, OpenAntiVirus.org", module_id);
-         #elif SAMBA_VERSION_MINOR==2
+         #elif SAMBA_VERSION_RELEASE==2
           /* Samba 2.2.2 / Samba 2.2.3 !!! */
           *Version = SMB_VFS_INTERFACE_VERSION;
           vscan_syslog("samba-vscan (%s) loaded (Samba 2.2.2/2.2.3), (c) by Rainer Link, OpenAntiVirus.org", module_id);
@@ -545,35 +601,35 @@
         #endif
 
 
-	#if SAMBA_VERSION_MAJOR==3
+        #if SAMBA_VERSION_MAJOR==3
          /* Samba 3.0 alphaX */
-	 DEBUG(3, ("Initialising default vfs hooks\n"));
+         DEBUG(3, ("Initialising default vfs hooks\n"));
          memcpy(&default_vfs_ops, def_vfs_ops, sizeof(struct vfs_ops));
 
-         /* Remember vfs_handle for further allocation and referencing of 
-	    private information in vfs_handle->data
+         /* Remember vfs_handle for further allocation and referencing of
+            private information in vfs_handle->data
          */
-	 vscan_handle = vfs_handle;
-	 return vscan_ops;
+         vscan_handle = vfs_handle;
+         return vscan_ops;
         #else
          /* Samba 2.2.x */
-	 #if SAMBA_VERSION_MINOR==4
-	  /* Samba 2.2.4 */
+         #if SAMBA_VERSION_RELEASE>=4
+          /* Samba 2.2.4 */
 
-	  *vfs_version = SMB_VFS_INTERFACE_VERSION;
-	  memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
-	  tmp_ops.connect = vscan_connect;
-	  tmp_ops.disconnect = vscan_disconnect;
-	  tmp_ops.open = vscan_open;
-	  tmp_ops.close = vscan_close;
-	  memcpy(&vscan_ops, &tmp_ops, sizeof(struct vfs_ops));
-	  return(&vscan_ops);
+          *vfs_version = SMB_VFS_INTERFACE_VERSION;
+          memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
+          tmp_ops.connect = vscan_connect;
+          tmp_ops.disconnect = vscan_disconnect;
+          tmp_ops.open = vscan_open;
+          tmp_ops.close = vscan_close;
+          memcpy(&vscan_ops, &tmp_ops, sizeof(struct vfs_ops));
+          return(&vscan_ops);
 
-	 #else
+         #else
           /* Samba 2.2.3-2.2.0 */
           return(&vscan_ops);
-	 #endif
-	#endif
+         #endif
+        #endif
 }
 
 
@@ -584,3 +640,6 @@
         DEBUG(3, ("Finalizing default vfs hooks\n"));
 }
 #endif
+
+#endif /* #if (SMB_VFS_INTERFACE_VERSION >= 6) */
+

Index: vscan-mcdaemon.h
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/nai/Attic/vscan-mcdaemon.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-mcdaemon.h	4 Dec 2003 16:24:00 -0000	1.1.2.1
+++ vscan-mcdaemon.h	5 Dec 2003 14:29:53 -0000	1.1.2.2
@@ -1,5 +1,5 @@
-#ifndef __VSCAN_OAV_H_
-#define __VSCAN_OAV_H_
+#ifndef __VSCAN_MCDAEMON_H_
+#define __VSCAN_MCDAEMON_H_
 
 #include "vscan-global.h"
 
@@ -15,7 +15,7 @@
 # define VSCAN_VERBOSE_FILE_LOGGING False   
 #endif
 
-/* if a file is bigger than VSCAN_SOPHOS_MAX_SIZE it won't be scanned. Has to be
+/* 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 
@@ -80,11 +80,11 @@
 
 /* functions by vscan-oav_core */
 /* opens a socket */
-int vscan_oav_init(void); 
+int vscan_mcdaemon_init(void); 
 /* scans a file */
-int vscan_oav_scanfile(int sockfd, char *scan_file, char* client_ip);
+int vscan_mcdaemon_scanfile(int sockfd, char *scan_file, char* client_ip);
 /* closes socket */
-void vscan_oav_end(int sockfd);
+void vscan_mcdaemon_end(int sockfd);
 
 
-#endif /* __VSCAN_OAV_H_ */
+#endif /* __VSCAN_MCDAEMON_H_ */

Index: vscan-mcdaemon_core.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/nai/Attic/vscan-mcdaemon_core.c,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-mcdaemon_core.c	4 Dec 2003 16:24:00 -0000	1.1.2.1
+++ vscan-mcdaemon_core.c	5 Dec 2003 14:29:53 -0000	1.1.2.2
@@ -11,11 +11,8 @@
  *
 */
 
-#include <includes.h>
-
 #include "vscan-mcdaemon_core.h"
-#include "vscan-message.h"
-#include "vscan-functions.h"
+#include "vscan-global.h"
 
 /* hum, global vars ... */
 extern BOOL verbose_file_logging;

Index: vscan-mcdaemon_core.h
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/nai/Attic/vscan-mcdaemon_core.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-mcdaemon_core.h	4 Dec 2003 16:24:00 -0000	1.1.2.1
+++ vscan-mcdaemon_core.h	5 Dec 2003 14:29:53 -0000	1.1.2.2
@@ -1,5 +1,5 @@
-#ifndef __VSCAN_OAV_CORE_H_
-#define __VSCAN_OAV_CORE_H_
+#ifndef __VSCAN_MCDAEMON_CORE_H_
+#define __VSCAN_MCDAEMON_CORE_H_
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -7,4 +7,4 @@
 
 #include "vscan-mcdaemon.h"
 
-#endif /* __VSCAN_OAV_CORE_H */
+#endif /* __VSCAN_MCDAEMON_CORE_H */




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.