From: Christopher R. Hertel <crh@samba.org> 
Date: Sun, 26 Aug 2001 06:43:39 +0000 (+0000)
Subject: Same as nmbd.c.  These now test wins_srv_count() instead of lp_wins_server
X-Git-Tag: samba-2.2.5pre1~1555^2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b975d3a9cea39e9992a9b556b8a6d9d3ec14807;p=thirdparty%2Fsamba.git

Same as nmbd.c.  These now test wins_srv_count() instead of lp_wins_server
to determine whether the 'wins server' parameter is set.
---

diff --git a/source/nmbd/nmbd_namelistdb.c b/source/nmbd/nmbd_namelistdb.c
index 15328af33eb..efac14c8c6a 100644
--- a/source/nmbd/nmbd_namelistdb.c
+++ b/source/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/source/nmbd/nmbd_subnetdb.c b/source/nmbd/nmbd_subnetdb.c
index 3bad3f9568a..e77a47801d0 100644
--- a/source/nmbd/nmbd_subnetdb.c
+++ b/source/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/source/utils/testparm.c b/source/utils/testparm.c
index 9b19a6c0fdc..28870fb2722 100644
--- a/source/utils/testparm.c
+++ b/source/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;