From 0747e4c889a9ae236af4c83f0e972d1960c320c4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 15 Sep 2018 05:42:11 -0700 Subject: [PATCH] Revert "s3:nmbd: Fix possible integer overflow" This reverts commit 3a383038ee7f74e5a9d2326a761b27950a14eb83 because it causes a network storm at startup on domain master browers. As reported by Reuben Farrelly BUG: https://bugzilla.samba.org/show_bug.cgi?id=13620 Signed-off-by: Andrew Bartlett --- source3/nmbd/nmbd_sendannounce.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c index 44d67e7..1d557c4 100644 --- a/source3/nmbd/nmbd_sendannounce.c +++ b/source3/nmbd/nmbd_sendannounce.c @@ -288,10 +288,8 @@ void announce_my_server_names(time_t t) } /* Announce every minute at first then progress to every 12 mins */ - if (t > work->lastannounce_time && - (t - work->lastannounce_time) < work->announce_interval) { + if ((t - work->lastannounce_time) < work->announce_interval) continue; - } if (work->announce_interval < (CHECK_TIME_MAX_HOST_ANNCE * 60)) work->announce_interval += 60; -- 2.7.4