param: Finish conversion from lp_wins_support() -> lp_we_are_a_wins_server()

Jermey started this in 1997 with 0aa493cc0303aa4177f289b9e4c797c8fa180672

(avoiding the duplicate function makes it easier to generate the
struct loadparm_globals).

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 73bd9baf5eab2d3de8aafa14966c5943e5fdbe4c..36ba416e7862d91e33742e81e10b198898554538 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1294,7 +1294,6 @@ bool lp_reset_on_zero_vc(void);
 bool lp_log_writeable_files_on_exit(void);
 bool lp_ms_add_printer_wizard(void);
 bool lp_dns_proxy(void);
-bool lp_wins_support(void);
 bool lp_we_are_a_wins_server(void);
 bool lp_wins_proxy(void);
 bool lp_local_master(void);

diff --git a/source3/lib/wins_srv.c b/source3/lib/wins_srv.c
index f9e8f3b0e1a52df9cdbd47d065f1b4bb34991290..fb5587f9ba8c4835435455fe21d12fd33ba621cd 100644 (file)
--- a/source3/lib/wins_srv.c
+++ b/source3/lib/wins_srv.c
@@ -153,7 +153,7 @@ unsigned wins_srv_count(void)
        const char **list;
        int count = 0;
 
-       if (lp_wins_support()) {
+       if (lp_we_are_a_wins_server()) {
                /* simple - just talk to ourselves */
                return 1;
        }
@@ -210,7 +210,7 @@ char **wins_srv_tags(void)
        int count=0, i, j;
        const char **list;
 
-       if (lp_wins_support()) {
+       if (lp_we_are_a_wins_server()) {
                /* give the caller something to chew on. This makes
                   the rest of the logic simpler (ie. less special cases) */
                ret = SMB_MALLOC_ARRAY(char *, 2);
@@ -283,7 +283,7 @@ struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip)
        struct tagged_ip t_ip;
 
        /* if we are a wins server then we always just talk to ourselves */
-       if (lp_wins_support()) {
+       if (lp_we_are_a_wins_server()) {
                struct in_addr loopback_ip;
                loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
                return loopback_ip;
@@ -381,7 +381,7 @@ unsigned wins_srv_count_tag(const char *tag)
        int i, count=0;
 
        /* if we are a wins server then we always just talk to ourselves */
-       if (lp_wins_support()) {
+       if (lp_we_are_a_wins_server()) {
                return 1;
        }
 

diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c
index c6315f665d7f144d32f58292a522a5814396b696..61c1d784f78aa87c236f57a1e4b1099ee9e18da9 100644 (file)
--- a/source3/nmbd/nmbd_namelistdb.c
+++ b/source3/nmbd/nmbd_namelistdb.c
@@ -33,7 +33,7 @@ uint16 samba_nb_type = 0; /* samba's NetBIOS name type */
 
 void set_samba_nb_type(void)
 {
-       if( lp_wins_support() || wins_srv_count() ) {
+       if( lp_we_are_a_wins_server() || wins_srv_count() ) {
                samba_nb_type = NB_HFLAG;               /* samba is a 'hybrid' node type. */
        } else {
                samba_nb_type = NB_BFLAG;           /* samba is broadcast-only node type. */

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7b13a9f2c3701a46c45cacfb33a5349358d51a8d..c7ed46fd8b2afea53333893665883806ce38dd80 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5652,7 +5652,6 @@ FN_GLOBAL_BOOL(lp_log_writeable_files_on_exit,
               bLogWriteableFilesOnExit)
 FN_GLOBAL_BOOL(lp_ms_add_printer_wizard, bMsAddPrinterWizard)
 FN_GLOBAL_BOOL(lp_dns_proxy, bDNSproxy)
-FN_GLOBAL_BOOL(lp_wins_support, bWINSsupport)
 FN_GLOBAL_BOOL(lp_we_are_a_wins_server, bWINSsupport)
 FN_GLOBAL_BOOL(lp_wins_proxy, bWINSproxy)
 FN_GLOBAL_BOOL(lp_local_master, bLocalMaster)

diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c
index f515906339f8ce407c3ec9d646e12b4cd497392d..004aff4486daa8cf919a77f337bf1e58b1af9c7b 100644 (file)
--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
@@ -716,7 +716,7 @@ static WERROR fill_svc_config(TALLOC_CTX *mem_ctx,
 
        if ( strequal( name, "NETLOGON" ) && ( lp_servicenumber(name) == -1 ) )
                config->start_type = SVCCTL_DISABLED;
-       else if ( strequal( name, "WINS" ) && ( !lp_wins_support() ))
+       else if ( strequal( name, "WINS" ) && ( !lp_we_are_a_wins_server() ))
                config->start_type = SVCCTL_DISABLED;
        else
                config->start_type = SVCCTL_DEMAND_START;

diff --git a/source3/services/svc_wins.c b/source3/services/svc_wins.c
index f1e94c5b7ed679e73ad5bf8b43999f4479d98f35..c8d72bc7c054ab317c1d4d1fae7f132ef56b9810 100644 (file)
--- a/source3/services/svc_wins.c
+++ b/source3/services/svc_wins.c
@@ -32,7 +32,7 @@ static WERROR wins_status( const char *service, struct SERVICE_STATUS *service_s
        service_status->type                    = SERVICE_TYPE_WIN32_OWN_PROCESS;
        service_status->controls_accepted       = SVCCTL_ACCEPT_NONE;
 
-       if ( lp_wins_support() )
+       if ( lp_we_are_a_wins_server() )
                service_status->state     = SVCCTL_RUNNING;
        else {
                service_status->state           = SVCCTL_STOPPED;

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 0634b25839209cb0c92bf9f99b04a0f7898ea42e..966b61e58e033adfebb1d310e2f70bcc973b8c72 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -72,7 +72,7 @@ static int do_global_checks(void)
                ret = 1;
        }
 
-       if (lp_wins_support() && lp_wins_server_list()) {
+       if (lp_we_are_a_wins_server() && lp_wins_server_list()) {
                fprintf(stderr, "ERROR: both 'wins support = true' and 'wins server = <server list>' \
 cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
                ret = 1;

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3c209b5b3c94c4a9ad4b8a9321164226fdfab19a..97c9613e25e010ed01ecf8a943b554babee79217 100644 (file)
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -775,7 +775,7 @@ static void wizard_page(void)
        else
        {
                /* Now determine smb.conf WINS settings */
-               if (lp_wins_support())
+               if (lp_we_are_a_wins_server())
                        winstype = 1;
                if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
                        winstype = 2;
@@ -783,7 +783,7 @@ static void wizard_page(void)
                /* Do we have a homes share? */
                have_home = lp_servicenumber(HOMES_NAME);
        }
-       if ((winstype == 2) && lp_wins_support())
+       if ((winstype == 2) && lp_we_are_a_wins_server())
                winstype = 3;
 
        role = lp_server_role();

diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index c888dcaca1535dd567aea8702e06770e8358bef4..8cf387c2dcd040b13193aacbcecbc4f5d504d663 100644 (file)
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -82,7 +82,7 @@ void nbtd_request_query(struct nbt_name_socket *nbtsock,
        if (!(packet->operation & NBT_FLAG_BROADCAST) &&
           (packet->operation & NBT_FLAG_RECURSION_DESIRED) &&
           (iname->nb_flags & NBT_NM_GROUP) &&
-          lpcfg_wins_support(iface->nbtsrv->task->lp_ctx)) {
+          lpcfg_we_are_a_wins_server(iface->nbtsrv->task->lp_ctx)) {
                nbtd_winsserver_request(nbtsock, packet, src);
                return;
        }

diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 5f1f41747f4ac99c94c8dfcd9d0531f2fe4de05c..e9598bab8c4ed91fd0439f6837b3b234c8f3413e 100644 (file)
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -1038,7 +1038,7 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv)
        uint32_t tmp;
        const char *owner;
 
-       if (!lpcfg_wins_support(nbtsrv->task->lp_ctx)) {
+       if (!lpcfg_we_are_a_wins_server(nbtsrv->task->lp_ctx)) {
                nbtsrv->winssrv = NULL;
                return NT_STATUS_OK;
        }

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index a7a0ee2cf47b7d2828df7263a4a7cc2735e1d51a..4deed3292676d02489fd1f2efc31ddc877a4f180 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -1515,7 +1515,7 @@ FN_GLOBAL_LIST(interfaces, szInterfaces)
 FN_GLOBAL_STRING(socket_address, szSocketAddress)
 FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
 FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
-FN_GLOBAL_BOOL(wins_support, bWINSsupport)
+FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
 FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy)
 FN_GLOBAL_STRING(wins_hook, szWINSHook)
 FN_GLOBAL_BOOL(local_master, bLocalMaster)

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 79e0cfc24d78e231a125c44473732d5038533af9..064e11472cbef01f097e00fa6505daa571f1875d 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -451,7 +451,7 @@ static void wreplsrv_task_init(struct task_server *task)
        NTSTATUS status;
        struct wreplsrv_service *service;
 
-       if (!lpcfg_wins_support(task->lp_ctx)) {
+       if (!lpcfg_we_are_a_wins_server(task->lp_ctx)) {
                return;
        }