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_cacheprime.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_cacheprime.c')
-rw-r--r-- | source3/modules/vfs_cacheprime.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c index d107c5fc96..02cffbb703 100644 --- a/source3/modules/vfs_cacheprime.c +++ b/source3/modules/vfs_cacheprime.c @@ -89,6 +89,8 @@ static int cprime_connect( const char * service, const char * user) { + int ret; + module_debug = lp_parm_int(SNUM(handle->conn), MODULE, "debug", 100); if (g_readbuf) { /* Only allocate g_readbuf once. If the config changes and @@ -98,6 +100,11 @@ static int cprime_connect( return SMB_VFS_NEXT_CONNECT(handle, service, user); } + ret = SMB_VFS_NEXT_CONNECT(handle, service, user); + if (ret < 0) { + return ret; + } + g_readsz = conv_str_size(lp_parm_const_string(SNUM(handle->conn), MODULE, "rsize", NULL)); @@ -118,7 +125,7 @@ static int cprime_connect( g_readsz = 0; } - return SMB_VFS_NEXT_CONNECT(handle, service, user); + return 0; } static ssize_t cprime_sendfile( |