]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-daemon: Correct the condition for logging unchanged flags
authorMartin Schwenke <martin@meltin.net>
Fri, 9 Jul 2021 05:13:49 +0000 (15:13 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 9 Sep 2021 01:46:49 +0000 (01:46 +0000)
Don't trust the old flags from the recovery master.

Surrounding code will change in future comments, including the use of
old-style debug macros, so just make this change clear.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14784
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_monitor.c

index 5c694bde9695e3388fbefd835747d59bc9ad8210..a49162dd9d9ffd40cbb36b92e14773330301ffc4 100644 (file)
@@ -484,7 +484,7 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata)
                }
        }
 
-       if (node->flags == c->old_flags) {
+       if (node->flags == old_flags) {
                DEBUG(DEBUG_INFO, ("Control modflags on node %u - Unchanged - flags 0x%x\n", c->pnn, node->flags));
                return 0;
        }