Fixed off-by-one bugs in workgroup name comparisons. Complain when a

workgroup name is >15 characters.
Jeremy.
(This used to be commit 35a0b3c035d50474eda97b015676885722737a95)

1 files changed, 11 insertions, 4 deletions

diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index c957b517cf7..b9fab4b278c 100644
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -56,7 +56,14 @@ static struct work_record *create_workgroup(const char *name, int ttl)
 	}
 	memset((char *)work, '\0', sizeof(*work));
  
-	nstrcpy(work->work_group,name);
+	if (strlen(name)+1 > sizeof(nstring)) {
+		memcpy(work->work_group,name,sizeof(nstring)-1);
+		work->work_group[sizeof(nstring)-1] = '\0';
+		DEBUG(0,("create_workgroup: workgroup name %s is too long. Truncating to %s\n",
+				name, work->work_group ));
+	} else {
+		nstrcpy(work->work_group,name);
+	}
 	work->serverlist = NULL;
   
 	work->RunningElection = False;
@@ -76,7 +83,7 @@ static struct work_record *create_workgroup(const char *name, int ttl)
 	for (subrec = FIRST_SUBNET; subrec && (t == -1); subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) {
 		struct work_record *w;
 		for (w = subrec->workgrouplist; w && t == -1; w = w->next) {
-			if (strnequal(w->work_group, work->work_group, sizeof(nstring)))
+			if (strnequal(w->work_group, work->work_group, sizeof(nstring)-1))
 				t = w->token;
 		}
 	}
@@ -150,7 +157,7 @@ struct work_record *find_workgroup_on_subnet(struct subnet_record *subrec,
 		name, subrec->subnet_name));
   
 	for (ret = subrec->workgrouplist; ret; ret = ret->next) {
-		if (strnequal(ret->work_group,name,sizeof(nstring))) {
+		if (strnequal(ret->work_group,name,sizeof(nstring)-1)) {
 			DEBUGADD(4, ("found.\n"));
 			return(ret);
 		}
@@ -211,7 +218,7 @@ void initiate_myworkgroup_startup(struct subnet_record *subrec, struct work_reco
 {
 	int i;
 
-	if(!strnequal(lp_workgroup(), work->work_group,sizeof(nstring)))
+	if(!strnequal(lp_workgroup(), work->work_group,sizeof(nstring)-1))
 		return;
 
 	/* If this is a broadcast subnet then start elections on it if we are so configured. */