Commit 39292d3a authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix consistency checks in ConfdFilterCallback

Commit 49b3fdac

 added consistency checks, but these are wrongly triggered
for old responses - we need to make sure to check that we have the same
serial.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 1b429e2a
...@@ -424,7 +424,8 @@ class ConfdFilterCallback: ...@@ -424,7 +424,8 @@ class ConfdFilterCallback:
# else: different content, pass up a second answer # else: different content, pass up a second answer
else: else:
# older or same-version answer (duplicate or outdated, filter) # older or same-version answer (duplicate or outdated, filter)
if up.server_reply.answer != self._answers[salt].answer: if (up.server_reply.serial == self._answers[salt].serial and
up.server_reply.answer != self._answers[salt].answer):
self.consistent[salt] = False self.consistent[salt] = False
filter_upcall = True filter_upcall = True
self._LogFilter(salt, up.server_reply, self._answers[salt]) self._LogFilter(salt, up.server_reply, self._answers[salt])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment