summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-02-09 15:00:56 -0800
committerJeremy Allison <jra@samba.org>2011-02-09 15:13:37 -0800
commit61c1f312d2665197d34245537a8f5b641bda1243 (patch)
tree46f239865b186a0b2f0da2027be01c5febb2000c
parentd0406ab7f035c7a777b9494712e7b9b52df95a19 (diff)
downloadsamba-61c1f312d2665197d34245537a8f5b641bda1243.tar.gz
samba-61c1f312d2665197d34245537a8f5b641bda1243.tar.xz
samba-61c1f312d2665197d34245537a8f5b641bda1243.zip
Correctly plumb in VFS_FDOPENDIR.
-rw-r--r--source3/include/vfs_macros.h4
-rw-r--r--source3/modules/vfs_default.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index c0fbe3860d0..7c26529385a 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -74,8 +74,8 @@
#define SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr) \
smb_vfs_call_opendir((handle)->next, (fname), (mask), (attr))
-#define SMB_VFS_FDOPENDIR(conn, fsp, mask, attr) \
- smb_vfs_call_fdopendir((conn)->vfs_handles, (fsp), (mask), (attr))
+#define SMB_VFS_FDOPENDIR(fsp, mask, attr) \
+ smb_vfs_call_fdopendir((fsp)->conn->vfs_handles, (fsp), (mask), (attr))
#define SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr) \
smb_vfs_call_fdopendir((handle)->next, (fsp), (mask), (attr))
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index eb5a2a4b0d7..5448db8ee01 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1647,6 +1647,7 @@ static struct vfs_fn_pointers vfs_default_fns = {
/* Directory operations */
.opendir = vfswrap_opendir,
+ .fdopendir = vfswrap_fdopendir,
.readdir = vfswrap_readdir,
.seekdir = vfswrap_seekdir,
.telldir = vfswrap_telldir,