sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Renamed global_vfs_ops to default_vfs_ops and made static.

Browse Source 
Make a copy of the default ops structure rather than following a pointer.

This fixes the audit VFS example module!
This commit is contained in:
Tim Potter -
parent ef06de2a1c
commit 91ab6f75d9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
examples/VFS/audit.c
View File

@ -45,7 +45,7 @@
#define SYSLOG_PRIORITY LOG_NOTICE #define SYSLOG_PRIORITY LOG_NOTICE
#endif #endif
static struct vfs_ops *global_vfs_ops; static struct vfs_ops default_vfs_ops;
/* Implementation of vfs_ops. Pass everything on to the default /* Implementation of vfs_ops. Pass everything on to the default
operation but log event first. */ operation but log event first. */
@ -62,12 +62,11 @@ static int audit_connect(struct connection_struct *conn, const char *svc,
static void audit_disconnect(struct connection_struct *conn) static void audit_disconnect(struct connection_struct *conn)
{ {
syslog(SYSLOG_PRIORITY, "disconnected\n"); syslog(SYSLOG_PRIORITY, "disconnected\n");
global_vfs_ops->disconnect(conn);
} }
static DIR *audit_opendir(struct connection_struct *conn, const char *fname) static DIR *audit_opendir(struct connection_struct *conn, const char *fname)
{ {
DIR *result = global_vfs_ops->opendir(conn, fname); DIR *result = default_vfs_ops.opendir(conn, fname);
syslog(SYSLOG_PRIORITY, "opendir %s %s%s\n", syslog(SYSLOG_PRIORITY, "opendir %s %s%s\n",
fname, fname,
@ -80,7 +79,7 @@ static DIR *audit_opendir(struct connection_struct *conn, const char *fname)
static int audit_mkdir(struct connection_struct *conn, const char *path, static int audit_mkdir(struct connection_struct *conn, const char *path,
mode_t mode) mode_t mode)
{ {
int result = global_vfs_ops->mkdir(conn, path, mode); int result = default_vfs_ops.mkdir(conn, path, mode);
syslog(SYSLOG_PRIORITY, "mkdir %s %s%s\n", syslog(SYSLOG_PRIORITY, "mkdir %s %s%s\n",
path, path,
@ -92,7 +91,7 @@ static int audit_mkdir(struct connection_struct *conn, const char *path,
static int audit_rmdir(struct connection_struct *conn, const char *path) static int audit_rmdir(struct connection_struct *conn, const char *path)
{ {
int result = global_vfs_ops->rmdir(conn, path); int result = default_vfs_ops.rmdir(conn, path);
syslog(SYSLOG_PRIORITY, "rmdir %s %s%s\n", syslog(SYSLOG_PRIORITY, "rmdir %s %s%s\n",
path, path,
@ -105,7 +104,7 @@ static int audit_rmdir(struct connection_struct *conn, const char *path)
static int audit_open(struct connection_struct *conn, const char *fname, static int audit_open(struct connection_struct *conn, const char *fname,
int flags, mode_t mode) int flags, mode_t mode)
{ {
int result = global_vfs_ops->open(conn, fname, flags, mode); int result = default_vfs_ops.open(conn, fname, flags, mode);
syslog(SYSLOG_PRIORITY, "open %s (fd %d) %s%s%s\n", syslog(SYSLOG_PRIORITY, "open %s (fd %d) %s%s%s\n",
fname, result, fname, result,
@ -118,7 +117,7 @@ static int audit_open(struct connection_struct *conn, const char *fname,
static int audit_close(struct files_struct *fsp, int fd) static int audit_close(struct files_struct *fsp, int fd)
{ {
int result = global_vfs_ops->close(fsp, fd); int result = default_vfs_ops.close(fsp, fd);
syslog(SYSLOG_PRIORITY, "close fd %d %s%s\n", syslog(SYSLOG_PRIORITY, "close fd %d %s%s\n",
fd, fd,
@ -131,7 +130,7 @@ static int audit_close(struct files_struct *fsp, int fd)
static int audit_rename(struct connection_struct *conn, const char *old, static int audit_rename(struct connection_struct *conn, const char *old,
const char *new) const char *new)
{ {
int result = global_vfs_ops->rename(conn, old, new); int result = default_vfs_ops.rename(conn, old, new);
syslog(SYSLOG_PRIORITY, "rename %s -> %s %s%s\n", syslog(SYSLOG_PRIORITY, "rename %s -> %s %s%s\n",
old, new, old, new,
@ -143,7 +142,7 @@ static int audit_rename(struct connection_struct *conn, const char *old,
static int audit_unlink(struct connection_struct *conn, const char *path) static int audit_unlink(struct connection_struct *conn, const char *path)
{ {
int result = global_vfs_ops->unlink(conn, path); int result = default_vfs_ops.unlink(conn, path);
syslog(SYSLOG_PRIORITY, "unlink %s %s%s\n", syslog(SYSLOG_PRIORITY, "unlink %s %s%s\n",
path, path,
@ -156,7 +155,7 @@ static int audit_unlink(struct connection_struct *conn, const char *path)
static int audit_chmod(struct connection_struct *conn, const char *path, static int audit_chmod(struct connection_struct *conn, const char *path,
mode_t mode) mode_t mode)
{ {
int result = global_vfs_ops->chmod(conn, path, mode); int result = default_vfs_ops.chmod(conn, path, mode);
syslog(SYSLOG_PRIORITY, "chmod %s mode 0x%x %s%s\n", syslog(SYSLOG_PRIORITY, "chmod %s mode 0x%x %s%s\n",
path, mode, path, mode,
@ -176,6 +175,12 @@ struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *ops)
openlog("smbd_audit", LOG_PID, SYSLOG_FACILITY); openlog("smbd_audit", LOG_PID, SYSLOG_FACILITY);
syslog(SYSLOG_PRIORITY, "initialised\n"); syslog(SYSLOG_PRIORITY, "initialised\n");
/* Save a copy of the default ops */
default_vfs_ops = *ops;
/* Override our ones */
ops->connect = audit_connect; ops->connect = audit_connect;
ops->disconnect = audit_disconnect; ops->disconnect = audit_disconnect;
ops->opendir = audit_opendir; ops->opendir = audit_opendir;
@ -187,7 +192,5 @@ struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *ops)
ops->unlink = audit_unlink; ops->unlink = audit_unlink;
ops->chmod = audit_chmod; ops->chmod = audit_chmod;
global_vfs_ops = ops;
return(ops); return(ops);
} }