From 221a430e229d130d01fa649fadfd95714847c391 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Jul 2012 09:42:03 +1000 Subject: lib/param: Merge VFS and MSDFS parameters from source3 into lib/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Jul 24 12:53:17 CEST 2012 on sn-devel-104 --- lib/param/loadparm.c | 53 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index f2ab0a719f..a5fa3c9afb 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1090,28 +1090,63 @@ 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 = "host msdfs", - .type = P_BOOL, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(bHostMSDfs), + .label = "msdfs proxy", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szMSDfsProxy), .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED, + .flags = FLAG_ADVANCED | FLAG_SHARE, }, { - .label = "ntp signd socket directory", - .type = P_STRING, + .label = "host msdfs", + .type = P_BOOL, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szNTPSignDSocketDirectory), + .offset = GLOBAL_VAR(bHostMSDfs), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, -- cgit