From: Volker Lendecke Date: Tue, 15 Oct 2019 08:56:54 +0000 (+0200) Subject: dbwrap_watch: Fix cleaning up dead watchers X-Git-Tag: talloc-2.3.1~289 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0afd655e80262ea8505a2e6d0dd9cc453fbdfd8c;p=thirdparty%2Fsamba.git dbwrap_watch: Fix cleaning up dead watchers "wrec->num_watchers" changes in dbwrap_watch_rec_del_watcher(). In 32d6cc84c I forgot to update the copy of that variable. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Oct 18 22:28:07 UTC 2019 on sn-devel-184 --- diff --git a/selftest/knownfail b/selftest/knownfail index 7842a78328d..82259dcfe90 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -16,7 +16,6 @@ ^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used ^samba3.smbtorture_s3.*.LOCK12.*\(fileserver\) ^samba3.smbtorture_s3.*.LOCK12.*\(nt4_dc\) -^samba3.smbtorture_s3.LOCAL-DBWRAP-WATCH3 ^samba3.nbt.dgram.*netlogon2\(nt4_dc\) ^samba3.*rap.sam.*.useradd # Not provided by Samba 3 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c index 36e445a4fd3..c5d55a3c93d 100644 --- a/source3/lib/dbwrap/dbwrap_watch.c +++ b/source3/lib/dbwrap/dbwrap_watch.c @@ -433,6 +433,7 @@ static void dbwrap_watched_subrec_wakeup( } if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { dbwrap_watch_rec_del_watcher(wrec, i); + num_to_wakeup -= 1; continue; }