param: Add "domain logons" and "domain master" parameters

This makes parsing of config files with s3 loadparm code and s4 loadparm
code consistent.

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 2a251c140d393afcec9caee90c4dcb1f9ef35a1e..c00495a6dd263e7df517b723c8fcaaa58ebde2e4 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -184,6 +184,22 @@ static struct parm_struct parm_table[] = {
                .special        = NULL,
                .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,
@@ -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 61fe97462d33b6e10cb1637ba5c8d8a95dc6299a..5d4c06d31a795b30869c2aa0032edd5a21eb4ed0 100644 (file)
--- 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,