Same as nmbd.c. These now test wins_srv_count() instead of lp_wins_server

to determine whether the 'wins server' parameter is set.
(This used to be commit 5b975d3a9cea39e9992a9b556b8a6d9d3ec14807)

diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c
index 15328af33eba4a3728d049c3116edb297a440de0..efac14c8c6aac9a2716dfce6baaabed4c352174c 100644 (file)
--- a/source3/nmbd/nmbd_namelistdb.c
+++ b/source3/nmbd/nmbd_namelistdb.c
@@ -37,7 +37,7 @@ uint16 samba_nb_type = 0; /* samba's NetBIOS name type */
  */
 void set_samba_nb_type(void)
   {
-  if( lp_wins_support() || (*lp_wins_server()) )
+  if( lp_wins_support() || wins_srv_count() )
     samba_nb_type = NB_MFLAG;               /* samba is a 'hybrid' node type. */
   else
     samba_nb_type = NB_BFLAG;           /* samba is broadcast-only node type. */

diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
index 3bad3f9568a797c39be1b987dbbf923636575284..e77a47801d020a8afd332fc000cf0f4bbd0db519 100644 (file)
--- a/source3/nmbd/nmbd_subnetdb.c
+++ b/source3/nmbd/nmbd_subnetdb.c
@@ -277,7 +277,7 @@ BOOL create_subnets(void)
    *       server address can change.  crh
    */
 
-  if(*lp_wins_server())
+  if( wins_srv_count() )
   {
     struct in_addr real_wins_ip;
     real_wins_ip = wins_srv_ip();

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 9b19a6c0fdc8eb364fbbed7c24f865f45c55b39e..28870fb2722e1634deb409f1a5925e5ffc3bc800 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -54,7 +54,7 @@ static int do_global_checks(void)
                ret = 1;
        }
 
-       if (lp_wins_support() && *lp_wins_server()) {
+       if (lp_wins_support() && wins_srv_count()) {
                printf("ERROR: both 'wins support = true' and 'wins server = <server>' \
 cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
                ret = 1;