svn commit: samba r12425 - in branches/SAMBA_4_0/source/nbt_server/wins: .

[metze at samba.org]

Author: metze
Date: 2005-12-22 08:27:10 +0000 (Thu, 22 Dec 2005)
New Revision: 12425

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12425

Log:
match w2k3 and store 0x1D names when they're registered as group name,
but queries still give not found

metze
Modified:
   branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c	2005-12-22 08:13:17 UTC (rev 12424)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c	2005-12-22 08:27:10 UTC (rev 12425)
@@ -183,9 +183,12 @@
 	enum wrepl_name_type new_type = wrepl_type(nb_flags, name, mhomed);
 	struct winsdb_addr *winsdb_addr = NULL;
 
-	/* as a special case, the local master browser name is always accepted
-	   for registration, but never stored */
-	if (name->type == NBT_NAME_MASTER) {
+	/*
+	 * as a special case, the local master browser name is always accepted
+	 * for registration, but never stored, but w2k3 stores it if it's registered
+	 * as a group name, (but a query for the 0x1D name still returns not found!)
+	 */
+	if (name->type == NBT_NAME_MASTER && !(nb_flags & NBT_NM_GROUP)) {
 		rcode = NBT_RCODE_OK;
 		goto done;
 	}
@@ -328,6 +331,10 @@
 	const char **addresses;
 	uint16_t nb_flags = 0; /* TODO: ... */
 
+	if (name->type == NBT_NAME_MASTER) {
+		goto notfound;
+	}
+
 	status = winsdb_lookup(winssrv->wins_db, name, packet, &rec);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto notfound;