summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>1999-07-22 04:43:59 +0000
committerTim Potter <tpot@samba.org>1999-07-22 04:43:59 +0000
commitf809734105eaa1c111720111a10594a27bdf639f (patch)
treebd49b5ee4b7874f43c48f8b3c6277d1a165bd3a6
parent3c95cd4caecd2f5d1264e1c2a3e10368b3cfa2d5 (diff)
downloadsamba-f809734105eaa1c111720111a10594a27bdf639f.tar.gz
samba-f809734105eaa1c111720111a10594a27bdf639f.tar.bz2
samba-f809734105eaa1c111720111a10594a27bdf639f.zip
Pass VFS options defined in smb.conf to vfs_init() function.
(This used to be commit 8cde172a77a1582c0af2e685097c53ba5f302a4e)
-rw-r--r--source3/smbd/vfs.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index b0bc1a9f4d..95bb4c9414 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -89,7 +89,7 @@ int vfs_init_default(connection_struct *conn)
BOOL vfs_init_custom(connection_struct *conn)
{
void *handle;
- struct vfs_ops *ops, *(*fptr)(void);
+ struct vfs_ops *ops, *(*fptr)(struct vfs_options *options);
DEBUG(3, ("Initialising custom vfs hooks from %s\n",
lp_vfsobj(SNUM(conn))));
@@ -114,13 +114,16 @@ BOOL vfs_init_custom(connection_struct *conn)
dlclose(handle);
- /* Initialise vfs_ops and fill in unused operations with default
- (disk based) ones. There's probably a neater way to do this. */
+ /* Initialise vfs_ops structure */
- if ((ops = fptr()) == NULL) {
+ if ((ops = fptr(lp_vfsoptions(SNUM(conn)))) == NULL) {
return False;
}
+ /* Fill in unused operations with default (disk based) ones.
+ There's probably a neater way to do this then a whole bunch of
+ if statements. */
+
memcpy(&conn->vfs_ops, ops, sizeof(conn->vfs_ops));
if (conn->vfs_ops.connect == NULL) {