two bugs jeremy and i found while at sgi.

find_workgroupstruct call in nameannounce.c should have False not True
check_master_browser should _only_ force an election for its own
workgroup, not other workgroups!

lkcl

diff --git a/source/nameannounce.c b/source/nameannounce.c
index a1eae127a2a2718e8fce3dd66091332dbaa7ee1a..8f2005a73d7a0f0740b3117ae5ace74494013246 100644 (file)
--- a/source/nameannounce.c
+++ b/source/nameannounce.c
@@ -403,7 +403,7 @@ void announce_master(time_t t)
   for (d = subnetlist; d; d = d->next)
     {
       /* Try and find our workgroup on this subnet */
-      struct work_record *work = find_workgroupstruct(d, lp_workgroup(), True);
+      struct work_record *work = find_workgroupstruct(d, lp_workgroup(), False);
 
       if (work)
         {

diff --git a/source/nameelect.c b/source/nameelect.c
index a11d0fb786775978595a946f612f352457d964a3..d3804f2b718ddb0619ded40b04c5677aa5dc2194 100644 (file)
--- a/source/nameelect.c
+++ b/source/nameelect.c
@@ -77,7 +77,7 @@ void check_master_browser(time_t t)
 
                for (work = d->workgrouplist; work; work = work->next)
                {
-                       if (!AM_MASTER(work))
+                       if (strequal(work->work_group, lp_workgroup()) && !AM_MASTER(work))
                        {
                                if (lp_preferred_master())
                                {