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.

1 files changed, 6 insertions, 4 deletions

diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c
index c4a20f0bdd..80dece7edd 100644
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -80,7 +80,11 @@ 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;
+	int result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
+
+	if (result < 0) {
+		return result;
+	}
 
 	openlog("smbd_audit", LOG_PID, audit_syslog_facility(handle));
 
@@ -92,9 +96,7 @@ static int audit_connect(vfs_handle_struct *handle, const char *svc, const char
 	DEBUG(10, ("Connected to service %s as 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)