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_fileid.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_fileid.c')
| -rw-r--r-- | source3/modules/vfs_fileid.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c index 133ad09cc3..559b520d1c 100644 --- a/source3/modules/vfs_fileid.c +++ b/source3/modules/vfs_fileid.c @@ -181,9 +181,15 @@ static int fileid_connect(struct vfs_handle_struct *handle, { struct fileid_handle_data *data; const char *algorithm; + int ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + + if (ret < 0) { + return ret; + } data = talloc_zero(handle->conn, struct fileid_handle_data); if (!data) { + SMB_VFS_NEXT_DISCONNECT(handle); DEBUG(0, ("talloc_zero() failed\n")); return -1; } @@ -203,6 +209,7 @@ static int fileid_connect(struct vfs_handle_struct *handle, } else if (strcmp("fsid", algorithm) == 0) { data->device_mapping_fn = fileid_device_mapping_fsid; } else { + SMB_VFS_NEXT_DISCONNECT(handle); DEBUG(0,("fileid_connect(): unknown algorithm[%s]\n", algorithm)); return -1; } @@ -214,7 +221,7 @@ static int fileid_connect(struct vfs_handle_struct *handle, DEBUG(10, ("fileid_connect(): connect to service[%s] with algorithm[%s]\n", service, algorithm)); - return SMB_VFS_NEXT_CONNECT(handle, service, user); + return 0; } static void fileid_disconnect(struct vfs_handle_struct *handle) |