From 115a88e18f103e2191bba7ce30604086b619081b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Jul 2012 16:32:11 +1000 Subject: [PATCH] lib/param: Merge "Filename Handling" section from source3/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): Thu Jul 26 14:16:02 CEST 2012 on sn-devel-104 --- lib/param/loadparm.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 211 insertions(+), 7 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index bbe4d109436..c211875d811 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -824,21 +824,152 @@ static struct parm_struct parm_table[] = { .flags = FLAG_HIDE, }, + {N_("Filename Handling"), P_SEP, P_SEPARATOR}, + { - .label = "map system", + .label = "mangling method", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szManglingMethod), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "mangle prefix", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(mangle_prefix), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + + { + .label = "default case", + .type = P_ENUM, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iDefaultCase), + .special = NULL, + .enum_list = enum_case, + .flags = FLAG_ADVANCED | FLAG_SHARE, + }, + { + .label = "case sensitive", + .type = P_ENUM, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iCaseSensitive), + .special = NULL, + .enum_list = enum_bool_auto, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "casesignames", + .type = P_ENUM, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iCaseSensitive), + .special = NULL, + .enum_list = enum_bool_auto, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_HIDE, + }, + { + .label = "preserve case", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(bMap_system), + .offset = LOCAL_VAR(bCasePreserve), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, }, { - .label = "map hidden", + .label = "short preserve case", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(bMap_hidden), + .offset = LOCAL_VAR(bShortCasePreserve), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "mangling char", + .type = P_CHAR, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(magic_char), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "hide dot files", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bHideDotFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "hide special files", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bHideSpecialFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "hide unreadable", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bHideUnReadable), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "hide unwriteable files", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bHideUnWriteableFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "delete veto files", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bDeleteVetoFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "veto files", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szVetoFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "hide files", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szHideFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "veto oplock files", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szVetoOplockFiles), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, }, { .label = "map archive", @@ -846,7 +977,80 @@ static struct parm_struct parm_table[] = { .p_class = P_LOCAL, .offset = LOCAL_VAR(bMap_archive), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "map hidden", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bMap_hidden), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "map system", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bMap_system), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "map readonly", + .type = P_ENUM, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iMap_readonly), + .special = NULL, + .enum_list = enum_map_readonly, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "mangled names", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bMangledNames), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "max stat cache size", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(iMaxStatCacheSize), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "stat cache", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(bStatCache), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "store dos attributes", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bStoreDosAttributes), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "dmapi support", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bDmapiSupport), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, }, -- 2.11.4.GIT