samba3-vscan/include .cvsignore,1.1.1.1,1.2 vscan-global.h,1.1.1.1,1.2 vscan-parameter.h,1.1.1.1,1.2 vscan-quarantine.h,1.1.1.1,1.2 vscan-vfs.h,1.1.1.1,1.2
Rainer Link <[email protected]> Sat, 23 Jul 2005 14:48:04 +0000
| Newsgroups | gmane.comp.security.virus.openantivirus.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/openantivirus/samba3-vscan/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8372/include
Modified Files:
.cvsignore vscan-global.h vscan-parameter.h vscan-quarantine.h
vscan-vfs.h
Log Message:
remove Samba 2.2 support, Samba3 is from now on supported only
Index: vscan-parameter.h
===================================================================
RCS file: /cvsroot/openantivirus/samba3-vscan/include/vscan-parameter.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vscan-parameter.h 23 Jul 2005 14:33:56 -0000 1.1.1.1
+++ vscan-parameter.h 23 Jul 2005 14:48:01 -0000 1.2
@@ -106,11 +106,6 @@
BOOL do_common_parameter(vscan_config_struct *vscan_config, const char *param, const char *value);
void set_common_default_settings(vscan_config_struct *vscan_config);
-#if (SMB_VFS_INTERFACE_VERSION >= 6)
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, fstring paramconf);
-#endif
-
#endif /* __VSCAN_PARAMETER_H_ */
Index: vscan-global.h
===================================================================
RCS file: /cvsroot/openantivirus/samba3-vscan/include/vscan-global.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vscan-global.h 23 Jul 2005 14:33:56 -0000 1.1.1.1
+++ vscan-global.h 23 Jul 2005 14:48:01 -0000 1.2
@@ -19,33 +19,6 @@
/* Configuration Section :-) */
-/* which samba version is this VFS module compiled for:
- * Set SAMBA_VERSION_MAJOR to 3 for Samba 3.0.x or
- * to 2 for Samba 2.2.x
- * Set SAMBA_VERSION_MINOR to 0 for Samba 3.0.x or
- * to 2 for Samba 2.2.x
- * Set SAMBA_VERSION_RELEASE to 8 for Samba >= 2.2.8
- * Set it to 4 for Samba 2.2.4 - 2.2.7
- * Set it to 2 if you're using Samba 2.2.2/2.2.3
- * Set it to 1 if you're using Samba 2.2.1[a] or 0 for Samba 2.2.0[a]
- * If SAMBA_VERSION_MAJOR is set to 3, SAMBA_VERSION_RELEASE
- * is ignored!
- *
- * Per default, Samba >=2.2.8 is assumed!
-*/
-
-#ifndef SAMBA_VERSION_MAJOR
-# define SAMBA_VERSION_MAJOR 2
-#endif
-
-#ifndef SAMBA_VERSION_MINOR
-# define SAMBA_VERSION_MINOR 2
-#endif
-
-#ifndef SAMBA_VERSION_RELEASE
-# define SAMBA_VERSION_RELEASE 8
-#endif
-
#ifndef SYSLOG_FACILITY
#define SYSLOG_FACILITY LOG_USER
#endif
@@ -61,15 +34,4 @@
/* end configuration section */
-
-#if (SMB_VFS_INTERFACE_VERSION < 6)
- #if (SAMBA_VERSION_MAJOR==3) || (SAMBA_VERSION_RELEASE>=4)
- #define PROTOTYPE_CONST const
- #else
- #define PROTOTYPE_CONST
- #endif
-#endif
-
-
-
#endif /* __VSCAN_GLOBAL_H */
Index: vscan-vfs.h
===================================================================
RCS file: /cvsroot/openantivirus/samba3-vscan/include/vscan-vfs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vscan-vfs.h 23 Jul 2005 14:33:56 -0000 1.1.1.1
+++ vscan-vfs.h 23 Jul 2005 14:48:01 -0000 1.2
@@ -2,160 +2,16 @@
#define __VSCAN_VFS_H_
-#if (SMB_VFS_INTERFACE_VERSION >= 6)
- static int vscan_connect(vfs_handle_struct *handle, connection_struct *conn, const char *svc, const char *user);
- static void vscan_disconnect(vfs_handle_struct *handle, connection_struct *conn);
- static int vscan_open(vfs_handle_struct *handle, connection_struct *conn, const char *fname,
- int flags, mode_t mode);
- static int vscan_close(vfs_handle_struct *handle, files_struct *fsp, int fd);
-#else
- static int vscan_connect(struct connection_struct *conn, PROTOTYPE_CONST char *svc, PROTOTYPE_CONST char *user);
- static void vscan_disconnect(struct connection_struct *conn);
- static int vscan_open(struct connection_struct *conn, PROTOTYPE_CONST char *fname,
- int flags, mode_t mode);
- static int vscan_close(struct files_struct *fsp, int fd);
-#endif /* #if (SMB_VFS_INTERFACE_VERSION >= 6) */
+static int vscan_connect(vfs_handle_struct *handle, connection_struct *conn, const char *svc, const char *user);
+static void vscan_disconnect(vfs_handle_struct *handle, connection_struct *conn);
+static int vscan_open(vfs_handle_struct *handle, connection_struct *conn, const char *fname,
+int flags, mode_t mode);
+static int vscan_close(vfs_handle_struct *handle, files_struct *fsp, int fd);
/* VFS operations */
-#if !(SMB_VFS_INTERFACE_VERSION >= 6)
- #if SAMBA_VERSION_MAJOR!=3
- /* Samba 2.2.x */
- extern struct vfs_ops default_vfs_ops; /* For passthrough operation */
- #else
- /* Samba 3.0 alphaX */
- static struct vfs_ops default_vfs_ops; /* For passthrough operation */
- static struct smb_vfs_handle_struct *vscan_handle; /* use skel_handle->data
- for storing per-instance private data */
- #endif
-#endif
-
-#if SAMBA_VERSION_MAJOR!=3
- /* Samba 2.2.x */
- #if SAMBA_VERSION_RELEASE>=4
- /* Samba 2.2.4 */
- struct vfs_ops vscan_ops = {
-
- /* Disk operations */
-
- vscan_connect, /* connect */
- vscan_disconnect, /* disconnect */
- NULL, /* disk free */
-
- /* Directory operations */
-
- NULL, /* opendir */
- NULL, /* readdir */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* closedir */
-
- /* File operations */
-
- vscan_open, /* open */
- vscan_close, /* close */
- NULL, /* read */
- NULL, /* write */
- NULL, /* lseek */
- NULL, /* rename */
- NULL, /* fsync */
- NULL, /* stat */
- NULL, /* fstat */
- NULL, /* lstat */
- NULL, /* unlink */
- NULL, /* chmod */
- NULL, /* fchmod */
- NULL, /* chown */
- NULL, /* fchown */
- NULL, /* chdir */
- NULL, /* getwd */
- NULL, /* utime */
- NULL, /* ftruncate */
- NULL, /* lock */
- NULL, /* symlink */
- NULL, /* readlink */
- NULL, /* link */
- NULL, /* mknod */
- NULL, /* realpath */
- NULL, /* fget_nt_acl */
- NULL, /* get_nt_acl */
- NULL, /* fset_nt_acl */
- NULL, /* set_nt_acl */
-
- NULL, /* chmod_acl */
- NULL, /* fchmod_acl */
-
- NULL, /* sys_acl_get_entry */
- NULL, /* sys_acl_get_tag_type */
- NULL, /* sys_acl_get_permset */
- NULL, /* sys_acl_get_qualifier */
- NULL, /* sys_acl_get_file */
- NULL, /* sys_acl_get_fd */
- NULL, /* sys_acl_clear_perms */
- NULL, /* sys_acl_add_perm */
- NULL, /* sys_acl_to_text */
- NULL, /* sys_acl_init */
- NULL, /* sys_acl_create_entry */
- NULL, /* sys_acl_set_tag_type */
- NULL, /* sys_acl_set_qualifier */
- NULL, /* sys_acl_set_permset */
- NULL, /* sys_acl_valid */
- NULL, /* sys_acl_set_file */
- NULL, /* sys_acl_set_fd */
- NULL, /* sys_acl_delete_def_file */
- NULL, /* sys_acl_get_perm */
- NULL, /* sys_acl_free_text */
- NULL, /* sys_acl_free_acl */
- NULL /* sys_acl_free_qualifier */
- };
- #else
- /* Samba 2.2.3-2.2.0 */
- struct vfs_ops vscan_ops = {
-
- /* Disk operations */
-
- vscan_connect, /* connect */
- vscan_disconnect, /* disconnect */
- NULL, /* disk free */
-
- /* Directory operations */
-
- NULL, /* opendir */
- NULL, /* readdir */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* closedir */
-
- /* File operations */
-
- vscan_open, /* open */
- vscan_close, /* close */
- NULL, /* read */
- NULL, /* write */
- NULL, /* lseek */
- NULL, /* rname */
- NULL, /* fsync */
- NULL, /* stat */
- NULL, /* fstat */
- NULL, /* lstat */
- NULL, /* unlink */
- NULL, /* chmod */
- NULL, /* chown */
- NULL, /* chdir */
- NULL, /* getwd */
- NULL, /* utime */
- NULL, /* ftruncate */
- NULL, /* lock */
- NULL, /* fget_nt_acl */
- NULL, /* get_nt_acl */
- NULL, /* fset_nt_acl */
- NULL /* set_nt_acl */
- };
- #endif
-#else
- /* Samba 3.0 alphaX */
- static vfs_op_tuple vscan_ops[] = {
+static vfs_op_tuple vscan_ops[] = {
/* Disk operations */
{vscan_connect, SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_TRANSPARENT},
@@ -168,6 +24,5 @@
/* Finish VFS operations definition */
{NULL, SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};
-#endif
#endif /* __VSCAN-VFS_H_ */
Index: vscan-quarantine.h
===================================================================
RCS file: /cvsroot/openantivirus/samba3-vscan/include/vscan-quarantine.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vscan-quarantine.h 23 Jul 2005 14:33:56 -0000 1.1.1.1
+++ vscan-quarantine.h 23 Jul 2005 14:48:01 -0000 1.2
@@ -14,22 +14,11 @@
/* functions by vscan-quarantine.c */
-#if (SMB_VFS_INTERFACE_VERSION >= 6)
/* quarantines an infected file by renaming it */
int vscan_quarantine_virus(vfs_handle_struct *handle, connection_struct *conn, char *virus_file, char *q_dir, char *q_prefix);
/* deletes an infected file */
int vscan_delete_virus(vfs_handle_struct *handle, connection_struct *conn, char *virus_file);
-
/* decides, what do with an infected file based on user setting */
int vscan_do_infected_file_action(vfs_handle_struct *handle, struct connection_struct *conn, char *virus_file, char *q_dir, char *q_prefix, enum infected_file_action_enum infected_file_action);
-#else
-/* quarantines an infected file by renaming it */
-int vscan_quarantine_virus(struct vfs_ops *ops, struct connection_struct *conn, char *virus_file, char *q_dir, char *q_prefix);
-/* deletes an infected file */
-int vscan_delete_virus(struct vfs_ops *ops, struct connection_struct *conn, char *virus_file);
-
-/* decides, what do with an infected file based on user setting */
-int vscan_do_infected_file_action(struct vfs_ops *ops, struct connection_struct *conn, char *virus_file, char *q_dir, char *q_prefix, enum infected_file_action_enum infected_file_action);
-#endif
#endif /* __VSCAN_QUARANTINE_H_ */
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click