From b9f9110ac77876b0c8c4fda19b6bb138e60da655 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 5 Aug 2013 12:14:48 -0400
Subject: Don't allow all ORPort values to be NoAdvertise

Fix for bug #9366
---
 src/or/config.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/or/config.c')

diff --git a/src/or/config.c b/src/or/config.c
index 72ceea395..ef90f23e6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5509,6 +5509,13 @@ check_server_ports(const smartlist_t *ports,
              "listening on one.");
     r = -1;
   }
+  if (n_orport_listeners && !n_orport_advertised) {
+    log_warn(LD_CONFIG, "We are listening on an ORPort, but not advertising "
+             "any ORPorts. This will keep us from building a %s "
+             "descriptor, and make us impossible to use.",
+             options->BridgeRelay ? "bridge" : "router");
+    r = -1;
+  }
   if (n_dirport_advertised && !n_dirport_listeners) {
     log_warn(LD_CONFIG, "We are advertising a DirPort, but not actually "
              "listening on one.");
-- 
cgit v1.2.3