Remove a redundant check in ..transition_affects_guards()

scan-build found that we we checking UseEntryGuards twice.

Fixes bug 21492.

diff --git a/changes/bug21492 b/changes/bug21492
new file mode 100644 (file)
index 0000000..2ed7947
--- /dev/null
+++ b/changes/bug21492
@@ -0,0 +1,5 @@
+  o Minor bugfixes (correctness):
+    - Remove a redundant check for the UseEntryGuards option from the
+      options_transition_affects_guards() function. Fixes bug 21492;
+      bugfix on 0.3.0.1-alpha.
+

diff --git a/src/or/config.c b/src/or/config.c
index e979930b106e4c2b76ea7af228605f21b154ff97..a527571cb024a82cae16288c90d9fd852dcd8e13 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1587,7 +1587,6 @@ options_transition_affects_guards(const or_options_t *old,
   return
     (old->UseEntryGuards != new->UseEntryGuards ||
      old->UseBridges != new->UseBridges ||
-     old->UseEntryGuards != new->UseEntryGuards ||
      old->ClientUseIPv4 != new->ClientUseIPv4 ||
      old->ClientUseIPv6 != new->ClientUseIPv6 ||
      old->FascistFirewall != new->FascistFirewall ||