[SCM] Samba Shared Repository - branch v4-9-test updated

Karolin Seeger kseeger at samba.org
Fri Sep 21 10:16:02 UTC 2018

The branch, v4-9-test has been updated
       via  95b08d1 s3: nmbd: Stop nmbd network announce storm.
      from  10d1b4d ctdb-recoverd: Set recovery lock handle at start of attempt


- Log -----------------------------------------------------------------
commit 95b08d103d1c76b49b4872948cca98939f81a954
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 17 12:45:14 2018 -0700

    s3: nmbd: Stop nmbd network announce storm.
    Correct fix for. On announce, work->lastannounce_time is set
    to current time t, so we must check that 't >= work->lastannounce_time',
    not 't > work->lastannounce_time' otherwise we end up not
    doing the comparison, and always doing the announce.
    Reported by Reuben Farrelly
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13620
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Revviewe-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 1d1cd28adaba691ba434a47031fb52ff8887c728)
    Autobuild-User(v4-9-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-9-test): Fri Sep 21 12:15:13 CEST 2018 on sn-devel-144


Summary of changes:
 source3/nmbd/nmbd_sendannounce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Changeset truncated at 500 lines:

diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 44d67e7..a9cdf1c 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -288,7 +288,7 @@ void announce_my_server_names(time_t t)
 			/* Announce every minute at first then progress to every 12 mins */
-			if (t > work->lastannounce_time &&
+			if (t >= work->lastannounce_time &&
 			    (t - work->lastannounce_time) < work->announce_interval) {

Samba Shared Repository

More information about the samba-cvs mailing list