diff options
| author | Christopher R. Hertel <crh@samba.org> | 2001-08-26 06:24:03 +0000 |
|---|---|---|
| committer | Christopher R. Hertel <crh@samba.org> | 2001-08-26 06:24:03 +0000 |
| commit | 7fed75b4cbeb4110c27525d6e4824c9bf73ceb56 (patch) | |
| tree | 7bceb9c32cfa46006fe448431163475a59293dce /source3/nmbd | |
| parent | 2ebb098820d83ebab91d90243891e96389867bf3 (diff) | |
| download | samba-7fed75b4cbeb4110c27525d6e4824c9bf73ceb56.tar.gz samba-7fed75b4cbeb4110c27525d6e4824c9bf73ceb56.tar.bz2 samba-7fed75b4cbeb4110c27525d6e4824c9bf73ceb56.zip | |
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)
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 7795958ed0..87c539371b 100644 --- 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 */ |