diff --git a/samba-3.2.8-nmbd_lmb_delay.patch b/samba-3.2.8-nmbd_lmb_delay.patch new file mode 100644 index 0000000..48d4075 --- /dev/null +++ b/samba-3.2.8-nmbd_lmb_delay.patch @@ -0,0 +1,30 @@ +From 857c2e4407a0f4fcee721372ffed5366bc3051f9 Mon Sep 17 00:00:00 2001 +From: Jeremy Allison +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 + diff --git a/samba.spec b/samba.spec index 1cc01c3..1ea4636 100644 --- a/samba.spec +++ b/samba.spec @@ -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 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog -* Thu Mar 26 2009 Simo Sorce - 3.3.2-0.32 +* Thu Mar 26 2009 Simo Sorce - 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