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

metze at samba.org metze at samba.org
Thu Dec 22 20:35:01 GMT 2005


Author: metze
Date: 2005-12-22 20:35:01 +0000 (Thu, 22 Dec 2005)
New Revision: 12437

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

Log:
if the client gives us an unicast name query with recursion_desired,
it's a wins server request, even if it's a name of one of our interfaces

metze
Modified:
   branches/SAMBA_4_0/source/nbt_server/query.c


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/query.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/query.c	2005-12-22 20:34:00 UTC (rev 12436)
+++ branches/SAMBA_4_0/source/nbt_server/query.c	2005-12-22 20:35:01 UTC (rev 12437)
@@ -54,6 +54,12 @@
 	/* see if we have the requested name on this interface */
 	name = &packet->questions[0].name;
 
+	if (!(packet->operation & NBT_FLAG_BROADCAST) &&
+	   (packet->operation & NBT_FLAG_RECURSION_DESIRED)) {
+		nbtd_winsserver_request(nbtsock, packet, src);
+		return;
+	}
+
 	iname = nbtd_find_iname(iface, name, 0);
 
 	if (iname == NULL) {
@@ -62,13 +68,6 @@
 			return;
 		}
 
-		/* if the name does not exist, then redirect to WINS
-		   server if recursion has been asked for */
-		if (packet->operation & NBT_FLAG_RECURSION_DESIRED) {
-			nbtd_winsserver_request(nbtsock, packet, src);
-			return;
-		}
-
 		/* otherwise send a negative reply */
 		nbtd_negative_name_query_reply(nbtsock, packet, src);
 		return;



More information about the samba-cvs mailing list