param: rename lp function and variable from 'passwordserver' to 'password_server'

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 7ce456a9f5dfdb2e6d4ff44474f2320e561db9d5..8e0bdae3e4e61fb6d50c4c00919591720f3ef8a1 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -255,7 +255,7 @@ FN_GLOBAL_CONST_STRING(netbios_name, netbios_name)
 FN_GLOBAL_CONST_STRING(netbios_scope, netbios_scope)
 FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, ntp_signd_socket_directory)
 FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend)
-FN_GLOBAL_CONST_STRING(passwordserver, passwordserver)
+FN_GLOBAL_CONST_STRING(password_server, password_server)
 FN_GLOBAL_CONST_STRING(piddir, piddir)
 FN_GLOBAL_CONST_STRING(private_dir, private_dir)
 FN_GLOBAL_CONST_STRING(realm, realm)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index def012673bea782cac5dfdbf0fa4a11ffccd8a6d..356ab0fa88d28b1c08fd9e09471615650ac21ff3 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -502,7 +502,7 @@ static struct parm_struct parm_table[] = {
                .label          = "password server",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(passwordserver),
+               .offset         = GLOBAL_VAR(password_server),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 7d6d6bbdc07962fe1221df069e76d41f57290f76..654ca1d349928d64c99f7d9560c6e5cf07e937d3 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3079,7 +3079,7 @@ static NTSTATUS get_dc_list(const char *domain,
        if (strequal(domain, lp_workgroup()) || strequal(domain, lp_realm())) {
                pserver = talloc_asprintf(ctx, "%s, %s",
                        saf_servername ? saf_servername : "",
-                       lp_passwordserver());
+                       lp_password_server());
        } else {
                pserver = talloc_asprintf(ctx, "%s, *",
                        saf_servername ? saf_servername : "");

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a40fa8ee912217bac649a92d99d30b1c9d682876..15999d6d6aeef3c28b5a9930817bcb21b4cf1f6d 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -796,7 +796,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.logon_path, "\\\\%N\\%U\\profile");
 
        Globals.name_resolve_order = (const char **)str_list_make_v3(NULL, "lmhosts wins host bcast", NULL);
-       string_set(&Globals.passwordserver, "*");
+       string_set(&Globals.password_server, "*");
 
        Globals.algorithmic_rid_base = BASE_RID;
 
@@ -4721,9 +4721,9 @@ static bool lp_load_ex(const char *pszFname,
 
        set_allowed_client_auth();
 
-       if (lp_security() == SEC_ADS && strchr(lp_passwordserver(), ':')) {
+       if (lp_security() == SEC_ADS && strchr(lp_password_server(), ':')) {
                DEBUG(1, ("WARNING: The optional ':port' in password server = %s is deprecated\n",
-                         lp_passwordserver()));
+                         lp_password_server()));
        }
 
        bLoaded = true;

diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index c06bfc97d60b2d84512c3d38a039f46d51534567..52809a439f5a99c704864827540778119c6d8080 100644 (file)
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -506,7 +506,7 @@ static struct wkssvc_NetWkstaEnumUsersCtr1 *create_enum_users1(
 
        pwd_server = "";
 
-       if ((pwd_tmp = talloc_strdup(ctr1->user1, lp_passwordserver()))) {
+       if ((pwd_tmp = talloc_strdup(ctr1->user1, lp_password_server()))) {
                /* The configured password server is a full DNS name but
                 * for the logon server we need to return just the first
                 * component (machine name) of it in upper-case */

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 98806016c84436d4a3d1282d51483d3d175d1ee7..f33180d14c2e0d5fa8b801cd8a85f2215b38126c 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -165,7 +165,7 @@ static int do_global_checks(void)
         * Password server sanity checks.
         */
 
-       if((lp_security() >= SEC_DOMAIN) && !*lp_passwordserver()) {
+       if((lp_security() >= SEC_DOMAIN) && !*lp_password_server()) {
                const char *sec_setting;
                if(lp_security() == SEC_DOMAIN)
                        sec_setting = "domain";
@@ -181,7 +181,7 @@ static int do_global_checks(void)
                ret = 1;
        }
 
-       if((lp_security() >= SEC_DOMAIN) && (strcmp(lp_passwordserver(), "*") != 0)) {
+       if((lp_security() >= SEC_DOMAIN) && (strcmp(lp_password_server(), "*") != 0)) {
                const char *sec_setting;
                if(lp_security() == SEC_DOMAIN)
                        sec_setting = "domain";