rpms/samba/F-10 samba-3.2.8-nmbd_lmb_delay.patch, NONE, 1.1 nmb.init, 1.2, 1.3 samba.spec, 1.169, 1.170

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/samba/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11722

Modified Files:
	nmb.init samba.spec 
Added Files:
	samba-3.2.8-nmbd_lmb_delay.patch 
Log Message:
* Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.2.8-0.28
- 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
  startup, causing your own machine not to show up in the network for 5 minutes
  if it was the only client in that workgroup (fix committed upstream)


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: nmb.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/nmb.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nmb.init	25 Jun 2007 13:51:51 -0000	1.2
+++ nmb.init	26 Mar 2009 20:48:11 -0000	1.3
@@ -64,7 +64,7 @@
 
 reload() {
         echo -n $"Reloading smb.conf file: "
-	killproc smbd -HUP
+	killproc nmbd -HUP
 	RETVAL=$?
 	echo
 	return $RETVAL


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- samba.spec	5 Mar 2009 11:33:21 -0000	1.169
+++ samba.spec	26 Mar 2009 20:48:11 -0000	1.170
@@ -1,4 +1,4 @@
-%define main_release 27
+%define main_release 28
 %define samba_version 3.2.8
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
@@ -46,6 +46,7 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.2.8-nmbd_lmb_delay.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -252,6 +253,7 @@
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
+%patch201 -p1 -b .nmbd_lmb_delay
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -487,6 +489,8 @@
 %post common
 /sbin/ldconfig
 
+# TODO: should we check the timestamps as well here ??
+
 # This script must be run always on installs or upgrades
 # it checks if a previous installation have created files
 # under /var/cache/samba and move them in that case as the
@@ -824,6 +828,13 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Mar 26 2009 Simo Sorce <ssorce at redhat.com> - 3.2.8-0.28
+- 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
+  startup, causing your own machine not to show up in the network for 5 minutes
+  if it was the only client in that workgroup (fix committed upstream)
+
 * Thu Mar  5 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.8-0.27
 - Add libcap-devel to requires list (resolves: #488559)