From 23f482ba72f8d325ffaf8b00567d60ba11aff724 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 26 Mar 2009 20:26:58 +0000 Subject: [PATCH] * Thu Mar 26 2009 Simo Sorce - 3.3.1-0.32 - 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) --- nmb.init | 2 +- samba.spec | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nmb.init b/nmb.init index 08e34cc..cdbdf0b 100644 --- a/nmb.init +++ b/nmb.init @@ -64,7 +64,7 @@ restart() { reload() { echo -n $"Reloading smb.conf file: " - killproc smbd -HUP + killproc nmbd -HUP RETVAL=$? echo return $RETVAL diff --git a/samba.spec b/samba.spec index 4edddce..b25f8a7 100644 --- a/samba.spec +++ b/samba.spec @@ -1,3 +1,5 @@ +%define main_release 32 +%define samba_version 3.3.1 %define main_release 31 %define samba_version 3.3.2 %define tdb_version 1.1.2 @@ -46,6 +48,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch +Patch201: samba-3.2.8-nmbd_lmb_delay.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -250,6 +253,7 @@ cp %{SOURCE11} packaging/Fedora/ #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify +%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 @@ -879,6 +883,13 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Mar 26 2009 Simo Sorce - 3.3.1-0.32 +- 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 12 2009 Guenther Deschner - 3.3.2-0.31 - Update to 3.3.2 - resolves: #489547