From 8303bc49a45d5bab0cdbd4f2d793088f600f715f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 30 Nov 2009 15:53:04 -0800 Subject: 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. --- source3/modules/vfs_acl_xattr.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/modules/vfs_acl_xattr.c') diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index 962d1b7b09..5e51a68875 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -212,6 +212,12 @@ static int connect_acl_xattr(struct vfs_handle_struct *handle, const char *service, const char *user) { + int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + + if (ret < 0) { + return ret; + } + /* Ensure we have "inherit acls = yes" if we're * using this module. */ DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' " -- cgit