Update to 3.3.3

Guenther
This commit is contained in:
Guenther Deschner 2009-04-01 13:10:01 +00:00
parent fd0ec4b497
commit afb68809ea
4 changed files with 7 additions and 36 deletions

View File

@ -1 +1 @@
samba-3.3.2.tar.gz
samba-3.3.3.tar.gz

View File

@ -1,30 +0,0 @@
From 857c2e4407a0f4fcee721372ffed5366bc3051f9 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@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

View File

@ -1,5 +1,5 @@
%define main_release 33
%define samba_version 3.3.2
%define main_release 34
%define samba_version 3.3.3
%define tdb_version 1.1.2
%define talloc_version 1.2.0
%define pre_release %nil
@ -46,7 +46,6 @@ 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
@ -251,7 +250,6 @@ 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
@ -881,6 +879,9 @@ exit 0
%{_datadir}/pixmaps/samba/logo-small.png
%changelog
* Wed Apr 1 2009 Guenther Deschner <gdeschner@redhat.com> - 3.3.3-0.34
- Update to 3.3.3
* Thu Mar 26 2009 Simo Sorce <ssorce@redhat.com> - 3.3.2-0.33
- Fix nmbd init script nmbd reload was causing smbd not nmbd to reload the
configuration

View File

@ -1 +1 @@
5c5178ea2c5d9bd5f6569285f2e0e6d7 samba-3.3.2.tar.gz
4d5835817416d1ffa30783af45c5a9ed samba-3.3.3.tar.gz