tor

commit d07810a3c96b7c063696fd3a27d9ad09f5141135
parent 0ea2e15d84c375a36b9f6a471b21ca6537f78fc3
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 22 Nov 2023 15:02:14 +0000

Merge branch 'fix-bridge-exit-warn' into 'main'

Fix bridge exit warn

Closes #40884

See merge request tpo/core/tor!783
Diffstat:
A
changes/bug40884
 | 
3
+++
M
src/feature/relay/relay_config.c
 | 
4
++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/bug40884 b/changes/bug40884
@@ -0,0 +1,3 @@
+  o Minor bugfixes (bridge):
+    - Don't warn when BridgeRelay is 1 and ExitRelay is explicitly set to 0.
+      Fixes bug 40884; bugfix on 0.4.8.3-rc.
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
@@ -1151,8 +1151,8 @@ options_validate_relay_mode(const or_options_t *old_options,
     REJECT("BridgeRelay is 1, ORPort is not set. This is an invalid "
            "combination.");
 
-  if (options->BridgeRelay == 1 && (options->ExitRelay == 1 ||
-      !policy_using_default_exit_options(options))) {
+  if (options->BridgeRelay == 1 && !(options->ExitRelay == 0 ||
+      policy_using_default_exit_options(options))) {
     log_warn(LD_CONFIG, "BridgeRelay is 1, but ExitRelay is 1 or an "
            "ExitPolicy is configured. Tor will start, but it will not "
            "function as an exit relay.");