diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-15 06:41:31 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-15 06:41:31 +0000 |
| commit | 44f9f1042c9c436ccda7fefafd4a68749ffb5fe8 (patch) | |
| tree | 74122c215c7e5f6b714d34c2163b97691236708a /source3/param | |
| parent | c3221b8377e267133b7c04d78d98d806c54da599 (diff) | |
| download | samba-44f9f1042c9c436ccda7fefafd4a68749ffb5fe8.tar.gz samba-44f9f1042c9c436ccda7fefafd4a68749ffb5fe8.tar.bz2 samba-44f9f1042c9c436ccda7fefafd4a68749ffb5fe8.zip | |
Clean up the VFS module loading logic by making the parameter an P_LIST,
rather than a runtime-parsed string.
Andrew Bartlett
(This used to be commit 3465cd6cd92c39c018979b5a82acbddca0927623)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3878dabb60..d558b09d24 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -548,7 +548,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); @@ -1104,7 +1103,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}, @@ -1774,7 +1773,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) @@ -2739,22 +2738,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. ***************************************************************************/ |