lib/param: Harmonise 'password server' parameter between s3 and s4

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index d68d585617115b70d0615364f3550e8cd53701ea..c2781ec61a9e022639d27f20fd41029541c08ffe 100644 (file)
--- 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 57ffb87344b63e9f5281ee09a95b96f46b0cd9d7..437ce435060399fa8e9f72dac796245537fec9f9 100644 (file)
--- 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)