From 7b175e875ea4cdfa27c21369a28e9c4ef14c925b Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 8 Nov 2011 11:36:00 +1100 Subject: param: Add "domain logons" and "domain master" parameters This makes parsing of config files with s3 loadparm code and s4 loadparm code consistent. --- lib/param/loadparm.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'lib') 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 @@ -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 */ -- cgit