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

[metze at samba.org]

Author: metze
Date: 2005-12-21 23:03:51 +0000 (Wed, 21 Dec 2005)
New Revision: 12412

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

Log:
- the 0x1E name must be registered as group name
- reject wins registration with a static record in the database

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-21 22:02:52 UTC (rev 12411)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c	2005-12-21 23:03:51 UTC (rev 12412)
@@ -196,6 +196,12 @@
 		goto done;
 	}
 
+	/* w2k3 refuses 0x1E names with out marked as group */
+	if (name->type == NBT_NAME_BROWSER && !(nb_flags & NBT_NM_GROUP)) {
+		rcode = NBT_RCODE_RFS;
+		goto done;
+	}
+
 	status = winsdb_lookup(winssrv->wins_db, name, packet, &rec);
 	if (NT_STATUS_EQUAL(NT_STATUS_OBJECT_NAME_NOT_FOUND, status)) {
 		rcode = wins_register_new(nbtsock, packet, src, new_type);
@@ -203,6 +209,13 @@
 	} else if (!NT_STATUS_IS_OK(status)) {
 		rcode = NBT_RCODE_SVR;
 		goto done;
+	} else if (rec->is_static) {
+		if (rec->type == WREPL_TYPE_GROUP || rec->type == WREPL_TYPE_SGROUP) {
+			rcode = NBT_RCODE_OK;
+			goto done;
+		}
+		rcode = NBT_RCODE_ACT;
+		goto done;
 	}
 
 	if (rec->type == WREPL_TYPE_GROUP) {