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,