diff options
author | Jeremy Allison <jra@samba.org> | 2009-11-30 15:53:04 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2009-11-30 15:53:04 -0800 |
commit | 8303bc49a45d5bab0cdbd4f2d793088f600f715f (patch) | |
tree | de386a449efb20c1cbb4fc3a62a6e6bb588d4810 /source3/modules/vfs_onefs.c | |
parent | b852a3494aa3af3d69175f68669609b23fefc1bb (diff) | |
download | samba-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_onefs.c')
-rw-r--r-- | source3/modules/vfs_onefs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c index 865eccdbf5..5f1b99292b 100644 --- a/source3/modules/vfs_onefs.c +++ b/source3/modules/vfs_onefs.c @@ -28,15 +28,20 @@ static int onefs_connect(struct vfs_handle_struct *handle, const char *service, const char *user) { - int ret; + int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + + if (ret < 0) { + return ret; + } ret = onefs_load_config(handle->conn); if (ret) { + SMB_VFS_NEXT_DISCONNECT(handle); DEBUG(3, ("Load config failed: %s\n", strerror(errno))); return ret; } - return SMB_VFS_NEXT_CONNECT(handle, service, user); + return 0; } static int onefs_mkdir(vfs_handle_struct *handle, const char *path, |