summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-03-19 02:32:39 +0000
committerJeremy Allison <jra@samba.org>2002-03-19 02:32:39 +0000
commitffadd471b9664018b3010ab5d74e6d05b8886e66 (patch)
treeeaf1c0c83d1f11f2eb6f68d1201f745722f33dfe /source3/param
parentcdc9931bb2f53272159b04ef7b1b057ce837ed4b (diff)
downloadsamba-ffadd471b9664018b3010ab5d74e6d05b8886e66.tar.gz
samba-ffadd471b9664018b3010ab5d74e6d05b8886e66.tar.bz2
samba-ffadd471b9664018b3010ab5d74e6d05b8886e66.zip
Sync up vfs changes from 2.2.x.
Jeremy. (This used to be commit ad1e858d8e72adf924ff435eab8da3e60842e2e6)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 12dedc7a01..7e9224dcd4 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1047,7 +1047,7 @@ static struct parm_struct parm_table[] = {
{"hide local users", P_BOOL, P_GLOBAL, &Globals.bHideLocalUsers, NULL,
NULL, 0},
- {"VFS options", P_SEP, P_SEPARATOR},
+ {"VFS module options", P_SEP, P_SEPARATOR},
{"vfs object", P_STRING, P_LOCAL, &sDefault.szVfsObjectFile, handle_vfs_object, NULL, FLAG_SHARE},
{"vfs options", P_STRING, P_LOCAL, &sDefault.szVfsOptions, NULL, NULL, FLAG_SHARE},
@@ -1700,6 +1700,7 @@ FN_LOCAL_LIST(lp_writelist, writelist)
FN_LOCAL_LIST(lp_printer_admin, printer_admin)
FN_LOCAL_STRING(lp_fstype, fstype)
FN_LOCAL_STRING(lp_vfsobj, szVfsObjectFile)
+FN_LOCAL_STRING(lp_vfs_options, szVfsOptions)
static FN_LOCAL_STRING(lp_volume, volume)
FN_LOCAL_STRING(lp_mangled_map, szMangledMap)
FN_LOCAL_STRING(lp_veto_files, szVetoFiles)