summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-04-17 04:39:55 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-04-17 04:39:55 +0000
commitda7b171a597e3df0222826b667175c048d7c07d1 (patch)
treec8f88fa17e492244a7ab8d4b7fe8d6d36624d099 /source3
parent6e444304d3d2e26d95fd0604cb2b70f20520b8c7 (diff)
downloadsamba-da7b171a597e3df0222826b667175c048d7c07d1.tar.gz
samba-da7b171a597e3df0222826b667175c048d7c07d1.tar.bz2
samba-da7b171a597e3df0222826b667175c048d7c07d1.zip
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 (This used to be commit d0dc4c9b7c828f706c99b1dab3f0ae0844cbc6a8)
Diffstat (limited to 'source3')
-rw-r--r--source3/nameannounce.c2
-rw-r--r--source3/nameelect.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/nameannounce.c b/source3/nameannounce.c
index a1eae127a2..8f2005a73d 100644
--- a/source3/nameannounce.c
+++ b/source3/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/source3/nameelect.c b/source3/nameelect.c
index a11d0fb786..d3804f2b71 100644
--- a/source3/nameelect.c
+++ b/source3/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())
{