summaryrefslogtreecommitdiff
path: root/source3/param/loadparm_ctx.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-23 13:32:31 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-24 11:01:17 +0200
commit3367fd01d4711c481efc8c56fb424ba3bab68dab (patch)
treeba28403d594586b2832f7016f0c59e07f9844e2c /source3/param/loadparm_ctx.c
parentb62b0318155e0c22a0a62ec6735f507b1b6c0f5d (diff)
downloadsamba-3367fd01d4711c481efc8c56fb424ba3bab68dab.tar.gz
samba-3367fd01d4711c481efc8c56fb424ba3bab68dab.tar.bz2
samba-3367fd01d4711c481efc8c56fb424ba3bab68dab.zip
lib/param: Merge handling of security/domain master/domain logons/server role
This ensures that the same input parameters always gives the same output values in both loadparm systems. Andrew Bartlett
Diffstat (limited to 'source3/param/loadparm_ctx.c')
-rw-r--r--source3/param/loadparm_ctx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 9c78f15879..75f7e38957 100644
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -73,8 +73,10 @@ static const struct loadparm_s3_helpers s3_fns =
.set_cmdline = lp_set_cmdline,
.dump = lp_dump,
- .server_role = lp_server_role,
- .security = lp_security,
+ ._server_role = lp__server_role,
+ ._security = lp__security,
+ ._domain_master = lp__domain_master,
+ ._domain_logons = lp__domain_logons,
.winbind_separator = lp_winbind_separator,
.template_homedir = lp_template_homedir,