summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-28 14:47:28 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-05-30 04:15:11 +0200
commitd3f061b687ca2a22956e1132a395239928f9c9f8 (patch)
tree24bc61d842e2355b500a14aca04cccb6eb5f1c5d
parent91e4983d306aacbdfe2097fc8d9e60cb367989bb (diff)
downloadsamba-d3f061b687ca2a22956e1132a395239928f9c9f8.tar.gz
samba-d3f061b687ca2a22956e1132a395239928f9c9f8.tar.bz2
samba-d3f061b687ca2a22956e1132a395239928f9c9f8.zip
lib/param: Harmonise 'password server' parameter between s3 and s4
-rw-r--r--lib/param/loadparm.c6
-rw-r--r--source3/param/loadparm_ctx.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index d68d585617..c2781ec61a 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -334,9 +334,9 @@ static struct parm_struct parm_table[] = {
},
{
.label = "password server",
- .type = P_LIST,
+ .type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szPasswordServers),
+ .offset = GLOBAL_VAR(szPasswordServer),
.special = NULL,
.enum_list = NULL
},
@@ -1562,7 +1562,7 @@ FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
FN_GLOBAL_STRING(passdb_backend, passdb_backend)
FN_GLOBAL_STRING(auto_services, szAutoServices)
FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
-FN_GLOBAL_LIST(passwordserver, szPasswordServers)
+FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer)
FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
FN_GLOBAL_STRING(realm, szRealm_upper)
FN_GLOBAL_STRING(dnsdomain, szRealm_lower)
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 57ffb87344..437ce43506 100644
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -113,6 +113,8 @@ static const struct loadparm_s3_context s3_fns =
.srv_minprotocol = lp_srv_minprotocol,
.srv_maxprotocol = lp_srv_maxprotocol,
+
+ .passwordserver = lp_passwordserver
};
const struct loadparm_s3_context *loadparm_s3_context(void)