samba - Jun 2005 - wins.dat keeps coming back with bad information

I recently reconfigured a box running FreeBSD 5.3 with Samba v. 3.0.7
running as PDC. It was servicing 2 networks, processing logons for
192.168.200.0/24 and 192.168.115.0/24. The reason for 2 networks was
security, 115.0/24 had some stuff on it that the users on 200.0/24
shouldn't have access to. Before the reconfiguration, the system was
working 100%.

To make everything better I flattened the network and put in an OpenBSD
box pf-ing to deal with the security matter.

The problem is now that none of the machines can resolve the PDC through
WINS. The PDC itself is the WINS master browser. They can process logons
OK, but I can't join machines, and the users can't change their
passwords.

Here's the relevant (I think) code:

genie# ifconfig
fxp0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
        options=8<VLAN_MTU>
        inet 192.168.77.1 netmask 0xffffff00 broadcast 192.168.77.255
        inet6 fe80::2a0:c9ff:fe89:ca86%fxp0 prefixlen 64 scopeid 0x1
        ether 00:a0:c9:89:ca:86
        media: Ethernet autoselect (100baseTX <full-duplex>)
        status: active
xl0: flags=8802<BROADCAST,SIMPLEX,MULTICAST> mtu 1500
        options=9<RXCSUM,VLAN_MTU>
        ether 00:04:75:ad:a2:a4
        media: Ethernet autoselect (none)
        status: no carrier
xl1: flags=8802<BROADCAST,SIMPLEX,MULTICAST> mtu 1500
        options=9<RXCSUM,VLAN_MTU>
        ether 00:10:4b:69:75:6d
        media: Ethernet autoselect (none)
        status: no carrier
plip0: flags=108810<POINTOPOINT,SIMPLEX,MULTICAST> mtu 1500
lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
        inet 127.0.0.1 netmask 0xff000000
        inet6 ::1 prefixlen 128
        inet6 fe80::1%lo0 prefixlen 64 scopeid 0x5
genie# tail /var/log/samba/log.nmbd
[2005/06/11 10:01:01, 0]
nmbd/nmbd_become_dmb.c:become_domain_master_browser_wins(341)
  become_domain_master_browser_wins: querying WINS server from IP
192.168.77.1 for domain master browser name DOMAINNAME<1b> on workgroup
DOMAINNAME
[2005/06/11 10:01:02, 0]
nmbd/nmbd_become_dmb.c:become_domain_master_query_success(225)
  become_domain_master_query_success:
  There is already a domain master browser at IP 192.168.115.60 for
workgroup DOMAINNAME registered on subnet UNICAST_SUBNET.
[2005/06/11 10:01:59, 0]
nmbd/nmbd_browsesync.c:domain_master_node_status_fail(250)
  domain_master_node_status_fail:
  Doing a node status request to the domain master browser
  for workgroup DOMAINNAME at IP 192.168.115.60 failed.
  Cannot sync browser lists.
genie# cat /var/db/samba/wins.dat
VERSION 1 0
"DOMAINNAME#00" 1118772367 255.255.255.255 e4R
"DOMAINNAME#1b" 1118766468 192.168.200.250 192.168.50.1 192.168.115.60
64R
"DOMAINNAME#1c" 1118771156 192.168.244.11 192.168.200.251
192.168.200.250
192.168.115.60 192.168.50.1 192.168.77.1 e4R
"DOMAINNAME#1e" 1118771156 255.255.255.255 e4R
"GENIE#00" 1118771156 192.168.244.11 192.168.200.251 192.168.200.250
192.168.115.60 192.168.50.1 192.168.77.1 66R
"GENIE#03" 1118771156 192.168.244.11 192.168.200.251 192.168.200.250
192.168.115.60 192.168.50.1 192.168.77.1 66R
"GENIE#20" 1118771156 192.168.244.11 192.168.200.251 192.168.200.250
192.168.115.60 192.168.50.1 192.168.77.1 66R

As you can see the wins.dat is full of garbage. where does it get that
garbage from? One of the garbage addresses is the address that it had when
I was building it, the other 2 are from when it was servicing the 2
networks. If I manually edit it, it just clobbers it when I restart nmbd.

What do I need to do to clean this up? Am I going to have to build a 2nd
server just for WINS resolution?

TIA
JR
jr@jrssite.com