diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-04-18 20:23:11 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-04-18 20:23:11 +0000 |
| commit | 48dea39b1d54ba4deee75bfda74e5730d7a35fa3 (patch) | |
| tree | 2299b1c782c91748069fe44256178b0dd0ecfdb0 /source3/param | |
| parent | 6bbedbdb5a148e5e221d2601037392d5076e25f4 (diff) | |
| download | samba-48dea39b1d54ba4deee75bfda74e5730d7a35fa3.tar.gz samba-48dea39b1d54ba4deee75bfda74e5730d7a35fa3.tar.bz2 samba-48dea39b1d54ba4deee75bfda74e5730d7a35fa3.zip | |
'vfs object' is a list not a string (we have cascaded VFS modules in 3_0 as
well now)
(This used to be commit 6220068d48f1fc5c85ff68a791e4e34e92cb4a0a)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 2640647ce2..3d5713d678 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -326,7 +326,7 @@ typedef struct char **printer_admin; char *volume; char *fstype; - char *szVfsObjectFile; + char **szVfsObjectFile; char *szVfsOptions; char *szVfsPath; char *szMSDfsProxy; @@ -537,7 +537,6 @@ static int default_server_announce; /* prototypes for the special type handlers */ static BOOL handle_include(const char *pszParmValue, char **ptr); static BOOL handle_copy(const char *pszParmValue, char **ptr); -static BOOL handle_vfs_object(const char *pszParmValue, char **ptr); static BOOL handle_source_env(const char *pszParmValue, char **ptr); static BOOL handle_netbios_name(const char *pszParmValue, char **ptr); static BOOL handle_winbind_uid(const char *pszParmValue, char **ptr); @@ -1094,7 +1093,7 @@ static struct parm_struct parm_table[] = { {"VFS module options", P_SEP, P_SEPARATOR}, - {"vfs object", P_STRING, P_LOCAL, &sDefault.szVfsObjectFile, handle_vfs_object, NULL, FLAG_SHARE}, + {"vfs object", P_LIST, P_LOCAL, &sDefault.szVfsObjectFile, NULL, NULL, FLAG_SHARE}, {"vfs options", P_STRING, P_LOCAL, &sDefault.szVfsOptions, NULL, NULL, FLAG_SHARE}, {"vfs path", P_STRING, P_LOCAL, &sDefault.szVfsPath, NULL, NULL, FLAG_SHARE}, @@ -1766,7 +1765,7 @@ FN_LOCAL_LIST(lp_readlist, readlist) 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_LIST(lp_vfsobj, szVfsObjectFile) FN_LOCAL_STRING(lp_vfs_options, szVfsOptions) FN_LOCAL_STRING(lp_vfs_path, szVfsPath) FN_LOCAL_STRING(lp_msdfs_proxy, szMSDfsProxy) @@ -2532,22 +2531,6 @@ static BOOL handle_source_env(const char *pszParmValue, char **ptr) } /*************************************************************************** - Handle the interpretation of the vfs object parameter. -*************************************************************************/ - -static BOOL handle_vfs_object(const char *pszParmValue, char **ptr) -{ - /* Set string value */ - - string_set(ptr, pszParmValue); - - /* Do any other initialisation required for vfs. Note that - anything done here may have linking repercussions in nmbd. */ - - return True; -} - -/*************************************************************************** Handle the include operation. ***************************************************************************/ |