rpms/samba/devel samba-3.2.8-nmbd_lmb_delay.patch, NONE, 1.1 samba.spec, 1.180, 1.181

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9446

Modified Files:
	samba.spec 
Added Files:
	samba-3.2.8-nmbd_lmb_delay.patch 
Log Message:
Ok not my day fo CVS... gimme git, already ... please!!


samba-3.2.8-nmbd_lmb_delay.patch:

--- NEW FILE samba-3.2.8-nmbd_lmb_delay.patch ---
>From 857c2e4407a0f4fcee721372ffed5366bc3051f9 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra at samba.org>
Date: Thu, 26 Mar 2009 12:13:28 -0700
Subject: [PATCH] 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.

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

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;
 
-- 
1.6.0.6



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- samba.spec	26 Mar 2009 20:31:27 -0000	1.180
+++ samba.spec	26 Mar 2009 20:40:56 -0000	1.181
@@ -1,4 +1,4 @@
-%define main_release 32
+%define main_release 33
 %define samba_version 3.3.2
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
@@ -881,7 +881,7 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.3.2-0.32
+* Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.3.2-0.33
 - Fix nmbd init script nmbd reload was causing smbd not nmbd to reload the
   configuration
 - Fix upstream bug 6224, nmbd was waiting 5+ minutes before running elections on