summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-26 16:03:09 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-26 12:23:20 +0200
commitb727e706c3992a881eef225bdd032a8cb699b8d4 (patch)
tree2a3fc880c798e8483c2120d89211901c3fa46d41
parent3f1dfdd8b4f7ccfb16d30b46f917f22523d4bec6 (diff)
downloadsamba-b727e706c3992a881eef225bdd032a8cb699b8d4.tar.gz
samba-b727e706c3992a881eef225bdd032a8cb699b8d4.tar.bz2
samba-b727e706c3992a881eef225bdd032a8cb699b8d4.zip
lib/param: Merge "Browse Options" section from source3/param
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
-rw-r--r--lib/param/loadparm.c87
1 files changed, 73 insertions, 14 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index b303cdf82c..4109fb9e06 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -77,6 +77,7 @@ static bool defaults_saved = false;
struct parmlist_entry *param_opt; \
char *szRealm; \
char *szConfigFile; \
+ int iPreferredMaster; \
char *szLdapMachineSuffix; \
char *szLdapUserSuffix; \
char *szLdapIdmapSuffix; \
@@ -91,8 +92,7 @@ static bool defaults_saved = false;
char *tls_crlfile; \
char *tls_dhpfile; \
char *loglevel; \
- char *panic_action; \
- int bPreferredMaster;
+ char *panic_action;
#include "lib/param/param_global.h"
@@ -152,14 +152,6 @@ static struct parm_struct parm_table[] = {
.enum_list = enum_bool_auto
},
{
- .label = "domain master",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(domain_master),
- .special = NULL,
- .enum_list = enum_bool_auto
- },
- {
.label = "dos charset",
.type = P_STRING,
.p_class = P_GLOBAL,
@@ -865,11 +857,40 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
+ {N_("Browse Options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "os level",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(os_level),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED,
+ },
+ {
+ .label = "lm announce",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(lm_announce),
+ .special = NULL,
+ .enum_list = enum_bool_auto,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "lm interval",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(lm_interval),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
{
.label = "preferred master",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bPreferredMaster),
+ .offset = GLOBAL_VAR(iPreferredMaster),
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_BASIC | FLAG_ADVANCED,
@@ -878,7 +899,7 @@ static struct parm_struct parm_table[] = {
.label = "prefered master",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bPreferredMaster),
+ .offset = GLOBAL_VAR(iPreferredMaster),
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_HIDE,
@@ -889,7 +910,26 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bLocalMaster),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED,
+ },
+ {
+ .label = "domain master",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(domain_master),
+ .special = NULL,
+ .enum_list = enum_bool_auto,
+ .flags = FLAG_BASIC | FLAG_ADVANCED,
+ },
+ {
+ .label = "browse list",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bBrowseList),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "browseable",
@@ -906,7 +946,26 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bBrowseable),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
+ },
+ {
+ .label = "access based share enum",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bAccessBasedShareEnum),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE
+ },
+ {
+ .label = "enhanced browsing",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(enhanced_browsing),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{N_("WINS Options"), P_SEP, P_SEPARATOR},