diff options
| author | Luke Leighton <lkcl@samba.org> | 1997-09-07 17:26:26 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1997-09-07 17:26:26 +0000 |
| commit | a26b54cbaae2d6c844057a6b01e1147b2e48deb9 (patch) | |
| tree | 711ef80410e2624bf7a2b50ccc62f56192d3c1fa /source3/nameelect.c | |
| parent | e81c4e902d33f1e1903d2ac1f285c7aa1840e5bc (diff) | |
| download | samba-a26b54cbaae2d6c844057a6b01e1147b2e48deb9.tar.gz samba-a26b54cbaae2d6c844057a6b01e1147b2e48deb9.tar.bz2 samba-a26b54cbaae2d6c844057a6b01e1147b2e48deb9.zip | |
samba servers forcing local elections if they are not a local master.
added check for "preferred master" to ensure not forcing an election.
(This used to be commit f8afd4c4c131a75ce685016e84205082aadbdb78)
Diffstat (limited to 'source3/nameelect.c')
| -rw-r--r-- | source3/nameelect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nameelect.c b/source3/nameelect.c index 06f3e870af..4666b22588 100644 --- a/source3/nameelect.c +++ b/source3/nameelect.c @@ -76,7 +76,7 @@ void check_master_browser(time_t t) { if (strequal(work->work_group, myworkgroup) && !AM_MASTER(work)) { - if (lp_local_master()) + if (lp_local_master() && lp_preferred_master()) { /* potential master browser - not a master browser. force becoming a master browser, hence the log message. |