Modified fix for bugid #784. Based on a patch from moriyama@miraclelinux.com (MORIYAMA Masayuki).

Don't use nstrings to hold workgroup and netbios names. The problem with them is that MB netbios
and workgroup names in unix charset (particularly utf8) may be up to 3x bigger than the name
when represented in dos charset (ie. cp932). So go back to using fstrings for these but
translate into nstrings (ie. 16 byte length values) for transport on the wire.
Jeremy.
(This used to be commit b4ea493599ab414f7828b83f40a5a8b43479ff64)

1 files changed, 12 insertions, 11 deletions

diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 0397f56512..4fbdd143e1 100644
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -85,8 +85,8 @@ static void register_name_response(struct subnet_record *subrec,
 		 */
 		
 #if 1 /* OLD_SAMBA_SERVER_HACK */
-		nstring ans_name;
-		pull_ascii_nstring(ans_name, answer_name->name);
+		fstring ans_name;
+		pull_ascii_nstring(ans_name, sizeof(ans_name), answer_name->name);
 		if((nmb->header.rcode == ACT_ERR) && strequal(lp_workgroup(), ans_name) &&
 		   (answer_name->name_type == 0x1b)) {
 			/* Pretend we did not get this. */
@@ -418,7 +418,7 @@ static void multihomed_register_name(struct nmb_name *nmbname, uint16 nb_flags,
 	struct subnet_record *subrec;
 	char **wins_tags;
 	struct in_addr *ip_list;
-	nstring name;
+	fstring name;
 
 	for(subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec) )
 		num_ips++;
@@ -434,7 +434,7 @@ static void multihomed_register_name(struct nmb_name *nmbname, uint16 nb_flags,
 		ip_list[i] = subrec->myip;
 	}
 
-	pull_ascii_nstring(name, nmbname->name);
+	pull_ascii_nstring(name, sizeof(name), nmbname->name);
 	add_name_to_subnet(unicast_subnet, name, nmbname->name_type,
 			   nb_flags, lp_max_ttl(), SELF_NAME,
 			   num_ips, ip_list);
@@ -473,17 +473,18 @@ void register_name(struct subnet_record *subrec,
 	struct nmb_name nmbname;
 	nstring nname;
 
-        if (strlen(name)+1 > sizeof(nstring)) {
-		memcpy(nname, name,sizeof(nstring)-1);
-		nname[sizeof(nstring)-1] = '\0';
+	errno = 0;
+	push_ascii_nstring(nname, name);
+        if (errno == E2BIG) {
+		fstring tname;
+		pull_ascii_nstring(tname, sizeof(tname), nname);
 		DEBUG(0,("register_name: NetBIOS name %s is too long. Truncating to %s\n",
-			name, nname));
+			name, tname));
+		make_nmb_name(&nmbname, tname, type);
 	} else {
-		nstrcpy(nname,name);
+		make_nmb_name(&nmbname, name, type);
 	}
 
-	make_nmb_name(&nmbname, nname, type);
-
 	/* Always set the NB_ACTIVE flag on the name we are
 	   registering. Doesn't make sense without it.
 	*/