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_afsacl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source3/modules/vfs_afsacl.c') diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 4666be2aa3..82c1799129 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -1065,14 +1065,19 @@ static int afsacl_connect(vfs_handle_struct *handle, const char *service, const char *user) { - const char *spc; + const char *spc; + int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + + if (ret < 0) { + return ret; + } spc = lp_parm_const_string(SNUM(handle->conn), "afsacl", "space", "%"); if (spc != NULL) space_replacement = spc[0]; - - return SMB_VFS_NEXT_CONNECT(handle, service, user); + + return 0; } static struct vfs_fn_pointers vfs_afsacl_fns = { -- cgit