Move the "enum _vfs_op_type" to full_audit

It's only used there now. Someone should now go in and simplify full_audit...
:-)

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 545bd9b6d989fd432ce7faa86e33becc5d3d9a01..b89fea9efa533b77829809b5bd4210563767bd49 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -161,148 +161,6 @@ struct smb_filename;
     should be added to vfs_op_type so that order of them kept same as in vfs_ops.
 */
 
-typedef enum _vfs_op_type {
-       SMB_VFS_OP_NOOP = -1,
-
-       /* Disk operations */
-
-       SMB_VFS_OP_CONNECT = 0,
-       SMB_VFS_OP_DISCONNECT,
-       SMB_VFS_OP_DISK_FREE,
-       SMB_VFS_OP_GET_QUOTA,
-       SMB_VFS_OP_SET_QUOTA,
-       SMB_VFS_OP_GET_SHADOW_COPY_DATA,
-       SMB_VFS_OP_STATVFS,
-       SMB_VFS_OP_FS_CAPABILITIES,
-
-       /* Directory operations */
-
-       SMB_VFS_OP_OPENDIR,
-       SMB_VFS_OP_READDIR,
-       SMB_VFS_OP_SEEKDIR,
-       SMB_VFS_OP_TELLDIR,
-       SMB_VFS_OP_REWINDDIR,
-       SMB_VFS_OP_MKDIR,
-       SMB_VFS_OP_RMDIR,
-       SMB_VFS_OP_CLOSEDIR,
-       SMB_VFS_OP_INIT_SEARCH_OP,
-
-       /* File operations */
-
-       SMB_VFS_OP_OPEN,
-       SMB_VFS_OP_CREATE_FILE,
-       SMB_VFS_OP_CLOSE,
-       SMB_VFS_OP_READ,
-       SMB_VFS_OP_PREAD,
-       SMB_VFS_OP_WRITE,
-       SMB_VFS_OP_PWRITE,
-       SMB_VFS_OP_LSEEK,
-       SMB_VFS_OP_SENDFILE,
-       SMB_VFS_OP_RECVFILE,
-       SMB_VFS_OP_RENAME,
-       SMB_VFS_OP_FSYNC,
-       SMB_VFS_OP_STAT,
-       SMB_VFS_OP_FSTAT,
-       SMB_VFS_OP_LSTAT,
-       SMB_VFS_OP_GET_ALLOC_SIZE,
-       SMB_VFS_OP_UNLINK,
-       SMB_VFS_OP_CHMOD,
-       SMB_VFS_OP_FCHMOD,
-       SMB_VFS_OP_CHOWN,
-       SMB_VFS_OP_FCHOWN,
-       SMB_VFS_OP_LCHOWN,
-       SMB_VFS_OP_CHDIR,
-       SMB_VFS_OP_GETWD,
-       SMB_VFS_OP_NTIMES,
-       SMB_VFS_OP_FTRUNCATE,
-       SMB_VFS_OP_LOCK,
-       SMB_VFS_OP_KERNEL_FLOCK,
-       SMB_VFS_OP_LINUX_SETLEASE,
-       SMB_VFS_OP_GETLOCK,
-       SMB_VFS_OP_SYMLINK,
-       SMB_VFS_OP_READLINK,
-       SMB_VFS_OP_LINK,
-       SMB_VFS_OP_MKNOD,
-       SMB_VFS_OP_REALPATH,
-       SMB_VFS_OP_NOTIFY_WATCH,
-       SMB_VFS_OP_CHFLAGS,
-       SMB_VFS_OP_FILE_ID_CREATE,
-       SMB_VFS_OP_STREAMINFO,
-       SMB_VFS_OP_GET_REAL_FILENAME,
-       SMB_VFS_OP_CONNECTPATH,
-       SMB_VFS_OP_BRL_LOCK_WINDOWS,
-       SMB_VFS_OP_BRL_UNLOCK_WINDOWS,
-       SMB_VFS_OP_BRL_CANCEL_WINDOWS,
-       SMB_VFS_OP_STRICT_LOCK,
-       SMB_VFS_OP_STRICT_UNLOCK,
-
-       /* NT ACL operations. */
-
-       SMB_VFS_OP_FGET_NT_ACL,
-       SMB_VFS_OP_GET_NT_ACL,
-       SMB_VFS_OP_FSET_NT_ACL,
-
-       /* POSIX ACL operations. */
-
-       SMB_VFS_OP_CHMOD_ACL,
-       SMB_VFS_OP_FCHMOD_ACL,
-
-       SMB_VFS_OP_SYS_ACL_GET_ENTRY,
-       SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,
-       SMB_VFS_OP_SYS_ACL_GET_PERMSET,
-       SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,
-       SMB_VFS_OP_SYS_ACL_GET_FILE,
-       SMB_VFS_OP_SYS_ACL_GET_FD,
-       SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,
-       SMB_VFS_OP_SYS_ACL_ADD_PERM,
-       SMB_VFS_OP_SYS_ACL_TO_TEXT,
-       SMB_VFS_OP_SYS_ACL_INIT,
-       SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,
-       SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,
-       SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,
-       SMB_VFS_OP_SYS_ACL_SET_PERMSET,
-       SMB_VFS_OP_SYS_ACL_VALID,
-       SMB_VFS_OP_SYS_ACL_SET_FILE,
-       SMB_VFS_OP_SYS_ACL_SET_FD,
-       SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
-       SMB_VFS_OP_SYS_ACL_GET_PERM,
-       SMB_VFS_OP_SYS_ACL_FREE_TEXT,
-       SMB_VFS_OP_SYS_ACL_FREE_ACL,
-       SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,
-
-       /* EA operations. */
-       SMB_VFS_OP_GETXATTR,
-       SMB_VFS_OP_LGETXATTR,
-       SMB_VFS_OP_FGETXATTR,
-       SMB_VFS_OP_LISTXATTR,
-       SMB_VFS_OP_LLISTXATTR,
-       SMB_VFS_OP_FLISTXATTR,
-       SMB_VFS_OP_REMOVEXATTR,
-       SMB_VFS_OP_LREMOVEXATTR,
-       SMB_VFS_OP_FREMOVEXATTR,
-       SMB_VFS_OP_SETXATTR,
-       SMB_VFS_OP_LSETXATTR,
-       SMB_VFS_OP_FSETXATTR,
-
-       /* aio operations */
-       SMB_VFS_OP_AIO_READ,
-       SMB_VFS_OP_AIO_WRITE,
-       SMB_VFS_OP_AIO_RETURN,
-       SMB_VFS_OP_AIO_CANCEL,
-       SMB_VFS_OP_AIO_ERROR,
-       SMB_VFS_OP_AIO_FSYNC,
-       SMB_VFS_OP_AIO_SUSPEND,
-        SMB_VFS_OP_AIO_FORCE,
-
-       /* offline operations */
-       SMB_VFS_OP_IS_OFFLINE,
-       SMB_VFS_OP_SET_OFFLINE,
-
-       /* This should always be last enum value */
-
-       SMB_VFS_OP_LAST
-} vfs_op_type;
-
 struct vfs_fn_pointers {
        /* Disk operations */
 

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index f57f9f011a0ac45a7a5bf89cd9c32e857907ebf7..4089f22968d93fd5372fdcc8dbecc088e4f6571f 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -69,6 +69,148 @@ struct vfs_full_audit_private_data {
 #undef DBGC_CLASS
 #define DBGC_CLASS vfs_full_audit_debug_level
 
+typedef enum _vfs_op_type {
+       SMB_VFS_OP_NOOP = -1,
+
+       /* Disk operations */
+
+       SMB_VFS_OP_CONNECT = 0,
+       SMB_VFS_OP_DISCONNECT,
+       SMB_VFS_OP_DISK_FREE,
+       SMB_VFS_OP_GET_QUOTA,
+       SMB_VFS_OP_SET_QUOTA,
+       SMB_VFS_OP_GET_SHADOW_COPY_DATA,
+       SMB_VFS_OP_STATVFS,
+       SMB_VFS_OP_FS_CAPABILITIES,
+
+       /* Directory operations */
+
+       SMB_VFS_OP_OPENDIR,
+       SMB_VFS_OP_READDIR,
+       SMB_VFS_OP_SEEKDIR,
+       SMB_VFS_OP_TELLDIR,
+       SMB_VFS_OP_REWINDDIR,
+       SMB_VFS_OP_MKDIR,
+       SMB_VFS_OP_RMDIR,
+       SMB_VFS_OP_CLOSEDIR,
+       SMB_VFS_OP_INIT_SEARCH_OP,
+
+       /* File operations */
+
+       SMB_VFS_OP_OPEN,
+       SMB_VFS_OP_CREATE_FILE,
+       SMB_VFS_OP_CLOSE,
+       SMB_VFS_OP_READ,
+       SMB_VFS_OP_PREAD,
+       SMB_VFS_OP_WRITE,
+       SMB_VFS_OP_PWRITE,
+       SMB_VFS_OP_LSEEK,
+       SMB_VFS_OP_SENDFILE,
+       SMB_VFS_OP_RECVFILE,
+       SMB_VFS_OP_RENAME,
+       SMB_VFS_OP_FSYNC,
+       SMB_VFS_OP_STAT,
+       SMB_VFS_OP_FSTAT,
+       SMB_VFS_OP_LSTAT,
+       SMB_VFS_OP_GET_ALLOC_SIZE,
+       SMB_VFS_OP_UNLINK,
+       SMB_VFS_OP_CHMOD,
+       SMB_VFS_OP_FCHMOD,
+       SMB_VFS_OP_CHOWN,
+       SMB_VFS_OP_FCHOWN,
+       SMB_VFS_OP_LCHOWN,
+       SMB_VFS_OP_CHDIR,
+       SMB_VFS_OP_GETWD,
+       SMB_VFS_OP_NTIMES,
+       SMB_VFS_OP_FTRUNCATE,
+       SMB_VFS_OP_LOCK,
+       SMB_VFS_OP_KERNEL_FLOCK,
+       SMB_VFS_OP_LINUX_SETLEASE,
+       SMB_VFS_OP_GETLOCK,
+       SMB_VFS_OP_SYMLINK,
+       SMB_VFS_OP_READLINK,
+       SMB_VFS_OP_LINK,
+       SMB_VFS_OP_MKNOD,
+       SMB_VFS_OP_REALPATH,
+       SMB_VFS_OP_NOTIFY_WATCH,
+       SMB_VFS_OP_CHFLAGS,
+       SMB_VFS_OP_FILE_ID_CREATE,
+       SMB_VFS_OP_STREAMINFO,
+       SMB_VFS_OP_GET_REAL_FILENAME,
+       SMB_VFS_OP_CONNECTPATH,
+       SMB_VFS_OP_BRL_LOCK_WINDOWS,
+       SMB_VFS_OP_BRL_UNLOCK_WINDOWS,
+       SMB_VFS_OP_BRL_CANCEL_WINDOWS,
+       SMB_VFS_OP_STRICT_LOCK,
+       SMB_VFS_OP_STRICT_UNLOCK,
+
+       /* NT ACL operations. */
+
+       SMB_VFS_OP_FGET_NT_ACL,
+       SMB_VFS_OP_GET_NT_ACL,
+       SMB_VFS_OP_FSET_NT_ACL,
+
+       /* POSIX ACL operations. */
+
+       SMB_VFS_OP_CHMOD_ACL,
+       SMB_VFS_OP_FCHMOD_ACL,
+
+       SMB_VFS_OP_SYS_ACL_GET_ENTRY,
+       SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,
+       SMB_VFS_OP_SYS_ACL_GET_PERMSET,
+       SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,
+       SMB_VFS_OP_SYS_ACL_GET_FILE,
+       SMB_VFS_OP_SYS_ACL_GET_FD,
+       SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,
+       SMB_VFS_OP_SYS_ACL_ADD_PERM,
+       SMB_VFS_OP_SYS_ACL_TO_TEXT,
+       SMB_VFS_OP_SYS_ACL_INIT,
+       SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,
+       SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,
+       SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,
+       SMB_VFS_OP_SYS_ACL_SET_PERMSET,
+       SMB_VFS_OP_SYS_ACL_VALID,
+       SMB_VFS_OP_SYS_ACL_SET_FILE,
+       SMB_VFS_OP_SYS_ACL_SET_FD,
+       SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
+       SMB_VFS_OP_SYS_ACL_GET_PERM,
+       SMB_VFS_OP_SYS_ACL_FREE_TEXT,
+       SMB_VFS_OP_SYS_ACL_FREE_ACL,
+       SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,
+
+       /* EA operations. */
+       SMB_VFS_OP_GETXATTR,
+       SMB_VFS_OP_LGETXATTR,
+       SMB_VFS_OP_FGETXATTR,
+       SMB_VFS_OP_LISTXATTR,
+       SMB_VFS_OP_LLISTXATTR,
+       SMB_VFS_OP_FLISTXATTR,
+       SMB_VFS_OP_REMOVEXATTR,
+       SMB_VFS_OP_LREMOVEXATTR,
+       SMB_VFS_OP_FREMOVEXATTR,
+       SMB_VFS_OP_SETXATTR,
+       SMB_VFS_OP_LSETXATTR,
+       SMB_VFS_OP_FSETXATTR,
+
+       /* aio operations */
+       SMB_VFS_OP_AIO_READ,
+       SMB_VFS_OP_AIO_WRITE,
+       SMB_VFS_OP_AIO_RETURN,
+       SMB_VFS_OP_AIO_CANCEL,
+       SMB_VFS_OP_AIO_ERROR,
+       SMB_VFS_OP_AIO_FSYNC,
+       SMB_VFS_OP_AIO_SUSPEND,
+        SMB_VFS_OP_AIO_FORCE,
+
+       /* offline operations */
+       SMB_VFS_OP_IS_OFFLINE,
+       SMB_VFS_OP_SET_OFFLINE,
+
+       /* This should always be last enum value */
+
+       SMB_VFS_OP_LAST
+} vfs_op_type;
+
 /* The following array *must* be in the same order as defined in vfs.h */
 
 static struct {