mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
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 0777ebc04b
)
This commit is contained in:
parent
2ebb098820
commit
7fed75b4cb
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user