summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-03-26 12:13:28 -0700
committerKarolin Seeger <kseeger@samba.org>2009-03-27 13:06:57 +0100
commit037f8936204b49abf3b05a6e1ed755f4708f166f (patch)
tree360f0cb575b11ea393566b9f92578c93b0a093ef
parent9e6eeba7935b04ddcba4e1772e9dd2594c134c4f (diff)
downloadsamba-037f8936204b49abf3b05a6e1ed755f4708f166f.tar.gz
samba-037f8936204b49abf3b05a6e1ed755f4708f166f.tar.xz
samba-037f8936204b49abf3b05a6e1ed755f4708f166f.zip
Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs to run elections
Fix logic bug that causes nmbd to wait 5 minutes before looking for a master browser. This one is *old* :-). Thanks for Simo for bugging me on this. Jeremy. (cherry picked from commit 857c2e4407a0f4fcee721372ffed5366bc3051f9)
-rw-r--r--source/nmbd/nmbd_elections.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c
index b50d215b91d..1ed64f4059f 100644
--- a/source/nmbd/nmbd_elections.c
+++ b/source/nmbd/nmbd_elections.c
@@ -130,9 +130,6 @@ void check_master_browser_exists(time_t t)
struct subnet_record *subrec;
const char *workgroup_name = lp_workgroup();
- if (!lastrun)
- lastrun = t;
-
if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
return;