sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

lib/param: Merge VFS and MSDFS parameters from source3 into lib/param

Browse Source 
This will make the merge of the whole table smoother.

Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Jul 24 12:53:17 CEST 2012 on sn-devel-104
This commit is contained in:
Andrew Bartlett 2012-07-24 09:42:03 +10:00
parent c7df664448
commit 221a430e22
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/param/loadparm.c
View File

@ -1090,13 +1090,57 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
{
.label = "ntp signd socket directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNTPSignDSocketDirectory),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{N_("VFS module options"), P_SEP, P_SEPARATOR},
{
.label = "vfs objects",
.type = P_LIST,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szVfsObjects),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "vfs object",
.type = P_LIST,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szVfsObjects),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_HIDE,
},
{N_("MSDFS options"), P_SEP, P_SEPARATOR},
{
.label = "msdfs root",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bMSDfsRoot),
.special = NULL,
.enum_list = NULL
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "msdfs proxy",
.type = P_STRING,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szMSDfsProxy),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "host msdfs",
@ -1107,15 +1151,6 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "ntp signd socket directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNTPSignDSocketDirectory),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{N_("Winbind options"), P_SEP, P_SEPARATOR},