Index: nmbd/nmbd_winsserver.c
===================================================================
RCS file: /data/cvs/samba/source/nmbd/nmbd_winsserver.c,v
retrieving revision 1.51.2.12
diff -u -r1.51.2.12 nmbd_winsserver.c
--- nmbd/nmbd_winsserver.c	27 Aug 2003 15:07:46 -0000	1.51.2.12
+++ nmbd/nmbd_winsserver.c	29 Sep 2003 04:38:15 -0000
@@ -107,7 +107,7 @@
 {
 	pstring command;
 	char *cmd = lp_wins_hook();
-	char *p;
+	char *p, *namestr;
 	int i;
 
 	if (!cmd || !*cmd) return;
@@ -119,11 +119,17 @@
 		}
 	}
 	
+	/* Use the name without the nametype (and scope) appended */
+
+	namestr = nmb_namestr(&namerec->name);
+	p = strchr(namestr, '<');
+	*p = 0;
+
 	p = command;
 	p += slprintf(p, sizeof(command)-1, "%s %s %s %02x %d", 
 		      cmd,
 		      operation, 
-		      nmb_namestr(&namerec->name),
+		      namestr,
 		      namerec->name.name_type,
 		      ttl);