summaryrefslogtreecommitdiff
path: root/source3/modules/vfs_audit.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-11-30 15:53:04 -0800
committerJeremy Allison <jra@samba.org>2009-11-30 15:53:04 -0800
commit8303bc49a45d5bab0cdbd4f2d793088f600f715f (patch)
treede386a449efb20c1cbb4fc3a62a6e6bb588d4810 /source3/modules/vfs_audit.c
parentb852a3494aa3af3d69175f68669609b23fefc1bb (diff)
downloadsamba-8303bc49a45d5bab0cdbd4f2d793088f600f715f.tar.gz
samba-8303bc49a45d5bab0cdbd4f2d793088f600f715f.tar.bz2
samba-8303bc49a45d5bab0cdbd4f2d793088f600f715f.zip
Restructure the connect function code to always call
down to NEXT-> before initializing. This allows us to do cleanup (by calling DISCONNECT) if initialization fails. Also fix vfs_acl_xattr which was failing to call the NEXT connect function. Jeremy.
Diffstat (limited to 'source3/modules/vfs_audit.c')
-rw-r--r--source3/modules/vfs_audit.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index 258246e42d..d256c2f7da 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -78,15 +78,18 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
static int audit_connect(vfs_handle_struct *handle, const char *svc, const char *user)
{
int result;
-
+
+ result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
+ if (result < 0) {
+ return result;
+ }
+
openlog("smbd_audit", LOG_PID, audit_syslog_facility(handle));
syslog(audit_syslog_priority(handle), "connect to service %s by user %s\n",
svc, user);
- result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
-
- return result;
+ return 0;
}
static void audit_disconnect(vfs_handle_struct *handle)