[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-751-g94ba56b

[Jeremy Allison]

The branch, master has been updated
       via  94ba56b2bdad4782deefc5581e6b6ac5c4eeb258 (commit)
      from  494e471d747c1e858481fad16cb33574d3e7f985 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 94ba56b2bdad4782deefc5581e6b6ac5c4eeb258
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 26 12:21:55 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:
 source3/nmbd/nmbd_elections.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

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