Sync up the VFS changes from 2.2.x.

Jeremy.
(This used to be commit e758bdc8a8f37e1d1e1fb0d1d27990dba2067920)

1 files changed, 165 insertions, 39 deletions

diff --git a/examples/VFS/audit.c b/examples/VFS/audit.c
index 7fbcb97837..aad483c295 100644
--- a/examples/VFS/audit.c
+++ b/examples/VFS/audit.c
@@ -2,7 +2,7 @@
  * Auditing VFS module for samba.  Log selected file operations to syslog
  * facility.
  *
- * Copyright (C) Tim Potter, 1999-2001
+ * Copyright (C) Tim Potter, 1999-2000
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,26 +45,150 @@
 #define SYSLOG_PRIORITY   LOG_NOTICE
 #endif
 
-static struct vfs_ops default_vfs_ops;
+/* Function prototypes */
+
+int audit_connect(struct connection_struct *conn, const char *svc, const char *user);
+void audit_disconnect(struct connection_struct *conn);
+DIR *audit_opendir(struct connection_struct *conn, const char *fname);
+int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode);
+int audit_rmdir(struct connection_struct *conn, const char *path);
+int audit_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode);
+int audit_close(struct files_struct *fsp, int fd);
+int audit_rename(struct connection_struct *conn, const char *old, const char *new);
+int audit_unlink(struct connection_struct *conn, const char *path);
+int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode);
+int audit_chmod_acl(struct connection_struct *conn, const char *name, mode_t mode);
+int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode);
+int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode);
+
+/* VFS operations */
+
+extern struct vfs_ops default_vfs_ops;   /* For passthrough operation */
+
+struct vfs_ops audit_ops = {
+    
+	/* Disk operations */
+
+	audit_connect,
+	audit_disconnect,
+	NULL,                     /* disk free */
+
+	/* Directory operations */
+
+	audit_opendir,
+	NULL,                     /* readdir */
+	audit_mkdir,
+	audit_rmdir,
+	NULL,                     /* closedir */
+
+	/* File operations */
+
+	audit_open,
+	audit_close,
+	NULL,                     /* read  */
+	NULL,                     /* write */
+	NULL,                     /* lseek */
+	audit_rename,
+	NULL,                     /* fsync */
+	NULL,                     /* stat  */
+	NULL,                     /* fstat */
+	NULL,                     /* lstat */
+	audit_unlink,
+	audit_chmod,
+	audit_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 */
+
+	audit_chmod_acl,		/* chmod_acl */
+	audit_fchmod_acl,		/* 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 */
+};
+
+/* VFS initialisation function.  Return initialised vfs_ops structure
+   back to SAMBA. */
+
+struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
+{
+	struct vfs_ops tmp_ops;
+
+	*vfs_version = SMB_VFS_INTERFACE_VERSION;
+	memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
+
+	tmp_ops.connect = audit_connect;
+	tmp_ops.disconnect = audit_disconnect;
+	tmp_ops.opendir = audit_opendir;
+	tmp_ops.mkdir = audit_mkdir;
+	tmp_ops.rmdir = audit_rmdir;
+	tmp_ops.open = audit_open;
+	tmp_ops.close = audit_close;
+	tmp_ops.rename = audit_rename;
+	tmp_ops.unlink = audit_unlink;
+	tmp_ops.chmod = audit_chmod;
+	tmp_ops.chmod_acl = audit_chmod_acl;
+	tmp_ops.fchmod = audit_fchmod;
+	tmp_ops.fchmod_acl = audit_fchmod_acl;
+
+	memcpy(&audit_ops, &tmp_ops, sizeof(struct vfs_ops));
+
+	openlog("smbd_audit", LOG_PID, SYSLOG_FACILITY);
+	syslog(SYSLOG_PRIORITY, "VFS_INIT: vfs_ops loaded\n");
+	return &audit_ops;
+}
 
 /* Implementation of vfs_ops.  Pass everything on to the default
    operation but log event first. */
 
-static int audit_connect(struct connection_struct *conn, const char *svc,
-                         const char *user)
+int audit_connect(struct connection_struct *conn, const char *svc, const char *user)
 {
 	syslog(SYSLOG_PRIORITY, "connect to service %s by user %s\n", 
 	       svc, user);
 
-	return 0;               /* Success */
+	return default_vfs_ops.connect(conn, svc, user);
 }
 
-static void audit_disconnect(struct connection_struct *conn)
+void audit_disconnect(struct connection_struct *conn)
 {
 	syslog(SYSLOG_PRIORITY, "disconnected\n");
+	default_vfs_ops.disconnect(conn);
 }
 
-static DIR *audit_opendir(struct connection_struct *conn, const char *fname)
+DIR *audit_opendir(struct connection_struct *conn, const char *fname)
 {
 	DIR *result = default_vfs_ops.opendir(conn, fname);
 
@@ -76,8 +200,7 @@ static DIR *audit_opendir(struct connection_struct *conn, const char *fname)
 	return result;
 }
 
-static int audit_mkdir(struct connection_struct *conn, const char *path, 
-                       mode_t mode)
+int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode)
 {
 	int result = default_vfs_ops.mkdir(conn, path, mode);
 
@@ -89,7 +212,7 @@ static int audit_mkdir(struct connection_struct *conn, const char *path,
 	return result;
 }
 
-static int audit_rmdir(struct connection_struct *conn, const char *path)
+int audit_rmdir(struct connection_struct *conn, const char *path)
 {
 	int result = default_vfs_ops.rmdir(conn, path);
 
@@ -101,8 +224,7 @@ static int audit_rmdir(struct connection_struct *conn, const char *path)
 	return result;
 }
 
-static int audit_open(struct connection_struct *conn, const char *fname, 
-                      int flags, mode_t mode) 
+int audit_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode)
 {
 	int result = default_vfs_ops.open(conn, fname, flags, mode);
 
@@ -115,7 +237,7 @@ static int audit_open(struct connection_struct *conn, const char *fname,
 	return result;
 }
 
-static int audit_close(struct files_struct *fsp, int fd)
+int audit_close(struct files_struct *fsp, int fd)
 {
 	int result = default_vfs_ops.close(fsp, fd);
 
@@ -127,8 +249,7 @@ static int audit_close(struct files_struct *fsp, int fd)
 	return result;
 }
 
-static int audit_rename(struct connection_struct *conn, const char *old, 
-                        const char *new)
+int audit_rename(struct connection_struct *conn, const char *old, const char *new)
 {
 	int result = default_vfs_ops.rename(conn, old, new);
 
@@ -140,7 +261,7 @@ static int audit_rename(struct connection_struct *conn, const char *old,
 	return result;    
 }
 
-static int audit_unlink(struct connection_struct *conn, const char *path)
+int audit_unlink(struct connection_struct *conn, const char *path)
 {
 	int result = default_vfs_ops.unlink(conn, path);
 
@@ -152,8 +273,7 @@ static int audit_unlink(struct connection_struct *conn, const char *path)
 	return result;
 }
 
-static int audit_chmod(struct connection_struct *conn, const char *path, 
-                       mode_t mode)
+int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode)
 {
 	int result = default_vfs_ops.chmod(conn, path, mode);
 
@@ -165,32 +285,38 @@ static int audit_chmod(struct connection_struct *conn, const char *path,
 	return result;
 }
 
-/* VFS initialisation function.  Return initialised vfs_ops structure
-   back to SAMBA. */
-
-struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *ops)
+int audit_chmod_acl(struct connection_struct *conn, const char *path, mode_t mode)
 {
-        *vfs_version = SMB_VFS_INTERFACE_VERSION;
+	int result = default_vfs_ops.chmod_acl(conn, path, mode);
 
-	openlog("smbd_audit", LOG_PID, SYSLOG_FACILITY);
-	syslog(SYSLOG_PRIORITY, "initialised\n");
+	syslog(SYSLOG_PRIORITY, "chmod_acl %s mode 0x%x %s%s\n",
+	       path, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
+
+	return result;
+}
 
-        /* Save a copy of the default ops */
+int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode)
+{
+	int result = default_vfs_ops.fchmod(fsp, fd, mode);
+
+	syslog(SYSLOG_PRIORITY, "fchmod %s mode 0x%x %s%s\n",
+	       fsp->fsp_name, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
 
-        default_vfs_ops = *ops;
+	return result;
+}
 
-        /* Override our ones */
+int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode)
+{
+	int result = default_vfs_ops.fchmod_acl(fsp, fd, mode);
 
-        ops->connect = audit_connect;
-        ops->disconnect = audit_disconnect;
-        ops->opendir = audit_opendir;
-        ops->mkdir = audit_mkdir;
-        ops->rmdir = audit_rmdir;
-        ops->open = audit_open;
-        ops->close = audit_close;
-        ops->rename = audit_rename;
-        ops->unlink = audit_unlink;
-        ops->chmod = audit_chmod;
+	syslog(SYSLOG_PRIORITY, "fchmod_acl %s mode 0x%x %s%s\n",
+	       fsp->fsp_name, mode,
+	       (result < 0) ? "failed: " : "",
+	       (result < 0) ? strerror(errno) : "");
 
-	return(ops);
+	return result;
 }