Instead of checking lp_wins_server() to see if a WINS server was specified,

nmbd now calls wins_srv_count().  This returns the number of WINS servers
specified in the 'wins server' parameter.  The return value will be zero if
'wins server' is not specified.

Quick change to make room for WINS failover.
(This used to be commit 0777ebc04b838b6b9036a5d0a6e0565bb0a65d9f)

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 7795958ed08ef9aaaac639e6d7d9ccd7f362096a..87c539371bea4693eb606a3658111e5adb3edd95 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -298,12 +298,15 @@ static BOOL reload_nmbd_services(BOOL test)
   }
 
   /* Do a sanity check for a misconfigured nmbd */
-  if( lp_wins_support() && *lp_wins_server() )
-  {
-    DEBUG(0,("ERROR: both 'wins support = true' and 'wins server = <server>' \
-cannot be set in the smb.conf file. nmbd aborting.\n"));
+  if( lp_wins_support() && wins_srv_count() )
+    {
+    if( DEBUGLVL(0) )
+      {
+      dbgtext( "ERROR: 'wins support = true' and 'wins server = <server>'\n" );
+      dbgtext( "are conflicting settings.  nmbd aborting.\n" );
+      }
     exit(10);
-  }
+    }
 
   return(ret);
 } /* reload_nmbd_services */