param: Rename variable used for lp_we_are_a_wins_server bWINSsupport

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

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index c0babadbe8884742d6080146d9de1d90453200b9..446c45a3951eec45814dc8f0893d20d999f94293 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2297,7 +2297,7 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx)
        struct debug_settings settings;
        lpcfg_add_auto_services(lp_ctx, lpcfg_auto_services(lp_ctx));
 
        struct debug_settings settings;
        lpcfg_add_auto_services(lp_ctx, lpcfg_auto_services(lp_ctx));
 

-       if (!lp_ctx->globals->szWINSservers && lp_ctx->globals->bWINSsupport) {
+       if (!lp_ctx->globals->szWINSservers && lp_ctx->globals->we_are_a_wins_server) {

                lpcfg_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
        }
 
                lpcfg_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
        }
 

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index b6440cbfbd537271158f3c2794dd04fc31dc5a1a..6b31310d5f74901495c60920e80b2baf58096bbe 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -224,7 +224,7 @@ FN_GLOBAL_BOOL(usershare_allow_guests, usershare_allow_guests)
 FN_GLOBAL_BOOL(usershare_owner_only, usershare_owner_only)
 FN_GLOBAL_BOOL(use_spnego, use_spnego)
 FN_GLOBAL_BOOL(utmp, utmp)
 FN_GLOBAL_BOOL(usershare_owner_only, usershare_owner_only)
 FN_GLOBAL_BOOL(use_spnego, use_spnego)
 FN_GLOBAL_BOOL(utmp, utmp)

-FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
+FN_GLOBAL_BOOL(we_are_a_wins_server, we_are_a_wins_server)

 FN_GLOBAL_BOOL(winbind_enum_groups, bWinbindEnumGroups)
 FN_GLOBAL_BOOL(winbind_enum_users, bWinbindEnumUsers)
 FN_GLOBAL_BOOL(winbind_nested_groups, bWinbindNestedGroups)
 FN_GLOBAL_BOOL(winbind_enum_groups, bWinbindEnumGroups)
 FN_GLOBAL_BOOL(winbind_enum_users, bWinbindEnumUsers)
 FN_GLOBAL_BOOL(winbind_nested_groups, bWinbindNestedGroups)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index bc91885c40a3c4a0e4aeb807603b4e29afe92bf0..82161431f8f2025ae47118b591f2ce1511071f16 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2917,7 +2917,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wins support",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
                .label          = "wins support",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,

-               .offset         = GLOBAL_VAR(bWINSsupport),
+               .offset         = GLOBAL_VAR(we_are_a_wins_server),

                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 683c111d08afe56783810e91c67fee23003da6a4..aac922574bb0661559d0daa03abab965528df2b9 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -947,7 +947,7 @@ static void init_globals(bool reinit_globals)
        Globals.domain_master = Auto;   /* depending on _domain_logons */
        Globals._domain_logons = false;
        Globals.browse_list = true;
        Globals.domain_master = Auto;   /* depending on _domain_logons */
        Globals._domain_logons = false;
        Globals.browse_list = true;

-       Globals.bWINSsupport = false;
+       Globals.we_are_a_wins_server = false;

        Globals.bWINSproxy = false;
 
        TALLOC_FREE(Globals.szInitLogonDelayedHosts);
        Globals.bWINSproxy = false;
 
        TALLOC_FREE(Globals.szInitLogonDelayedHosts);


@@ -4919,9 +4919,9 @@ static bool lp_load_ex(const char *pszFname,
 
        bLoaded = true;
 
 
        bLoaded = true;
 

-       /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */
-       /* if bWINSsupport is true and we are in the client            */
-       if (lp_is_in_client() && Globals.bWINSsupport) {
+       /* Now we check we_are_a_wins_server and set szWINSserver to 127.0.0.1 */
+       /* if we_are_a_wins_server is true and we are in the client            */
+       if (lp_is_in_client() && Globals.we_are_a_wins_server) {

                lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
        }
 
                lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
        }