[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5172-g15718a5

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  15718a5d3edc3a65256533dd898ef582ded7f833 (commit)
      from  e452955c077a761cbadd27bede8d6844edbb2e5e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 15718a5d3edc3a65256533dd898ef582ded7f833
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 26 12:13:28 2009 -0700

    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.

-----------------------------------------------------------------------

Summary of changes:
 source/nmbd/nmbd_elections.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c
index b50d215..1ed64f4 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;
 


-- 
Samba Shared Repository