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_acl_tdb.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_acl_tdb.c')
| -rw-r--r-- | source3/modules/vfs_acl_tdb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index db3881e1e7..e9d0f9027a 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -367,12 +367,11 @@ static int connect_acl_tdb(struct vfs_handle_struct *handle, const char *user) { struct db_context *db; - int res; + int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); - res = SMB_VFS_NEXT_CONNECT(handle, service, user); - if (res < 0) { - return res; - } + if (ret < 0) { + return ret; + } if (!acl_tdb_init(&db)) { SMB_VFS_NEXT_DISCONNECT(handle); |