summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2011-11-08 11:36:00 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-11-17 00:34:08 +0100
commit7b175e875ea4cdfa27c21369a28e9c4ef14c925b (patch)
treef356b31d298241daed5e46fed416f21da3ec963d
parent948e010f20b537f66baf20bb77e9095d88adcbb9 (diff)
downloadsamba-7b175e875ea4cdfa27c21369a28e9c4ef14c925b.tar.gz
samba-7b175e875ea4cdfa27c21369a28e9c4ef14c925b.tar.bz2
samba-7b175e875ea4cdfa27c21369a28e9c4ef14c925b.zip
param: Add "domain logons" and "domain master" parameters
This makes parsing of config files with s3 loadparm code and s4 loadparm code consistent.
-rw-r--r--lib/param/loadparm.c20
-rw-r--r--source3/param/loadparm_ctx.c2
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 2a251c140d..c00495a6dd 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -185,6 +185,22 @@ static struct parm_struct parm_table[] = {
.enum_list = enum_server_role
},
{
+ .label = "domain logons",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(domain_logons),
+ .special = NULL,
+ .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,
@@ -1461,6 +1477,8 @@ static struct loadparm_context *global_loadparm_context;
#include "lib/param/param_functions.c"
FN_GLOBAL_INTEGER(server_role, server_role)
+FN_GLOBAL_BOOL(domain_logons, domain_logons)
+FN_GLOBAL_INTEGER(domain_master, domain_master)
FN_GLOBAL_LIST(smb_ports, smb_ports)
FN_GLOBAL_INTEGER(nbt_port, nbt_port)
FN_GLOBAL_INTEGER(dgram_port, dgram_port)
@@ -3281,6 +3299,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
lpcfg_do_global_parameter(lp_ctx, "server role", "standalone");
+ lpcfg_do_global_parameter(lp_ctx, "domain logons", "No");
+ lpcfg_do_global_parameter(lp_ctx, "domain master", "Auto");
/* options that can be set on the command line must be initialised via
the slower lpcfg_do_global_parameter() to ensure that FLAG_CMDLINE is obeyed */
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 61fe97462d..5d4c06d31a 100644
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -74,6 +74,8 @@ static const struct loadparm_s3_context s3_fns =
.dump = lp_dump,
.server_role = lp_server_role,
+ .domain_logons = lp_domain_logons,
+ .domain_master = lp_domain_master,
.winbind_separator = lp_winbind_separator,
.template_homedir = lp_template_homedir,