From 3ab97ebe6db1a5a4a0573c7c8482c94876bbce9a Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Fri, 30 May 1997 20:40:48 +0000 Subject: charcnv.c: Fixed silly bugs detected on IRIX. client.c: Fixed silly bugs detected on IRIX. namedbname.c: Stopped 1d names from being registered in WINS db. namedbsubnet.c: Only register 1e names on broadcast subnet. nameelect.c: Changed add_my_name entries. Forced host announces if we have less than 10 servers listed. Fixed registering 1b domain name issues. namepacket.c: Added error message when dgram discarded. nameserv.c: Added notion of 'direct' names that are not registered on the network. Needed to get around bugs in earlier nmbd handling of DOMAIN(1b) names. nameservreply.c:Tidied up debug message. nameservresp.c: Added response_name_query_domain() code. Deals with re-registering DOMAIN(1b) name. nmbd.c: Fixed silly bugs detected on IRIX. nmblib.c: Added paranoia debugs. proto.h: Updated remove_name_entry(), add_my_name_entry(). server.c: Fixed silly bugs detected on IRIX. trans2.c: Fixed silly bugs detected on IRIX. uid.c: Fixed silly bugs detected on IRIX. version.h: Updated to alpha3. Jeremy (jallison@whistle.com). (This used to be commit f08222bd8b86a061c52d22015f946a4737eb47fd) --- source3/namedbsubnet.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source3/namedbsubnet.c') diff --git a/source3/namedbsubnet.c b/source3/namedbsubnet.c index 393db363d8..ab1f133dd4 100644 --- a/source3/namedbsubnet.c +++ b/source3/namedbsubnet.c @@ -209,13 +209,16 @@ void add_workgroup_to_subnet( struct subnet_record *d, char *group) return; } - /* add WORKGROUP(1e) and WORKGROUP(00) entries into name database - or register with WINS server, if it's our workgroup + /* add WORKGROUP(00) entries into name database + or register with WINS server, if it's our workgroup. + Don't register WORKGROUP(0x1e) on the WINS subnet - this is a broadcast + only name. */ if (strequal(myworkgroup, group)) { - add_my_name_entry(d,group,0x1e,nb_type|NB_ACTIVE|NB_GROUP); - add_my_name_entry(d,group,0x0 ,nb_type|NB_ACTIVE|NB_GROUP); + add_my_name_entry(d,group,0x0 ,nb_type|NB_ACTIVE|NB_GROUP,False); + if((d != wins_subnet)) + add_my_name_entry(d,group,0x1e,nb_type|NB_ACTIVE|NB_GROUP,False); /* add samba server name to workgroup list. */ add_server_entry(d,w,myname,w->ServerType,0,lp_serverstring(),True); DEBUG(3,("add_workgroup_to_subnet: Added server name entry %s to subnet %s\n", -- cgit