diff -uwrB samba-2.2.7/source/include/smb.h samba-2.2.7-1/source/include/smb.h
--- samba-2.2.7/source/include/smb.h	2002-11-09 15:33:04.000000000 +0100
+++ samba-2.2.7-1/source/include/smb.h	2002-11-21 14:54:32.000000000 +0100
@@ -1559,10 +1559,11 @@
 
 
 #include "smb_macros.h"
+#define MAX_NMB_NAME_LEN	64
 
 /* A netbios name structure. */
 struct nmb_name {
-  char         name[17];
+  char         name[MAX_NMB_NAME_LEN];
   char         scope[64];
   unsigned int name_type;
 };
diff -uwrB samba-2.2.7/source/libsmb/nmblib.c samba-2.2.7-1/source/libsmb/nmblib.c
--- samba-2.2.7/source/libsmb/nmblib.c	2002-05-18 15:40:28.000000000 +0200
+++ samba-2.2.7-1/source/libsmb/nmblib.c	2002-11-21 14:54:55.000000000 +0100
@@ -823,7 +823,7 @@
 {
 	extern pstring global_scope;
 	memset( (char *)n, '\0', sizeof(struct nmb_name) );
-	StrnCpy( n->name, name, 15 );
+	StrnCpy( n->name, name, MAX_NMB_NAME_LEN-1 );
 	unix_to_dos(n->name);
 	strupper( n->name );
 	n->name_type = (unsigned int)type & 0xFF;