diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-06-27 14:37:17 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-06-27 14:37:17 +0000 |
| commit | 223ddc3f2daf25b16ce60230336747d5fab61e39 (patch) | |
| tree | 66fc3123346244d5cc7b0dd47274b214fa1d104d /source3/nmbd/nmbd.c | |
| parent | 675a108c65834f9402d967926b30e50e811843c1 (diff) | |
| download | samba-223ddc3f2daf25b16ce60230336747d5fab61e39.tar.gz samba-223ddc3f2daf25b16ce60230336747d5fab61e39.tar.bz2 samba-223ddc3f2daf25b16ce60230336747d5fab61e39.zip | |
The next phase in the WINS rewrite!
We now cope wiith multiple WINS groups and multiple failover servers
for release and refresh as well as registration. We also do the regitrations
in the same fashion as W2K does, where we don't try to register the next
IP in the list for a name until the WINS server has acked the previos IP.
This prevents us flooding the WINS server and also seems to make for much
more reliable multi-homed registration.
I also changed the dead WINS server code to mark pairs of IPs dead,
not individual IPs. The idea is that a WINS server might be dead from
the point of view of one of our interfaces, but not another, so we
need to keep talking to it on one while moving onto a failover WINS
server on the other interface. This copes much better with partial
LAN outages and weird routing tables.
(This used to be commit 313f2c9ff7a513802e4f893324865e70912d419e)
Diffstat (limited to 'source3/nmbd/nmbd.c')
| -rw-r--r-- | source3/nmbd/nmbd.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index f698b396b2..06d6bc3bb3 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -53,8 +53,8 @@ static void terminate(void) /* Write out wins.dat file if samba is a WINS server */ wins_write_database(False); - /* Remove all SELF registered names. */ - release_my_names(); + /* Remove all SELF registered names from WINS */ + release_wins_names(); /* Announce all server entries as 0 time-to-live, 0 type. */ announce_my_servers_removed(); @@ -293,15 +293,6 @@ static BOOL reload_nmbd_services(BOOL test) reload_nmbd_services( True ); } - /* Do a sanity check for a misconfigured nmbd */ - 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); } |