Ignore SIGNAL NEWNYM on relay-only Tor instances

diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym
index f8758c2d58e6ffb86cbc4f3fdb2907a215ea774e..0ea09e08002c692060c8c8d3431dd96d12338306 100644 (file)
--- a/changes/forget-rend-descs-on-newnym
+++ b/changes/forget-rend-descs-on-newnym
@@ -5,6 +5,8 @@
   o Minor bugfixes:
     - Don't allow v0 hidden service authorities to act as clients.
       Required by fix for bug 3000.
+    - Ignore SIGNAL NEWNYM commands on relay-only Tor instances.
+      Required by fix for bug 3000.
   o Code simplifications and refactoring:
     - Allow rend_client_send_introduction to fail without closing the
       AP connection permanently.

diff --git a/src/or/main.c b/src/or/main.c
index 3bf21693f4e5025a7c13a9d685c37d82b42a34bf..a26be39fdf8b830d5000100207c81beae312c7b8 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -842,6 +842,13 @@ run_connection_housekeeping(int i, time_t now)
 static void
 signewnym_impl(time_t now)
 {
+  or_options_t *options = get_options();
+  if (!proxy_mode(options)) {
+    log_info(LD_CONTROL, "Ignoring SIGNAL NEWNYM because client functionality "
+             "is disabled.");
+    return;
+  }
+
   circuit_expire_all_dirty_circs();
   addressmap_clear_transient();
   rend_cache_purge();