From: Roger Dingledine <arma@torproject.org>
Date: Tue, 13 Nov 2012 04:47:21 +0000 (-0500)
Subject: use a more logical operator
X-Git-Tag: tor-0.2.4.6-alpha~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88bb48e785609afeab6b63677f789036e25b34cf;p=thirdparty%2Ftor.git

use a more logical operator

Fix a harmless bug when opting against publishing a relay descriptor
because DisableNetwork is set.

Fixes bug 7464; bugfix on 0.2.3.9-alpha.
---

diff --git a/changes/bug7464 b/changes/bug7464
new file mode 100644
index 0000000000..9259cc74a3
--- /dev/null
+++ b/changes/bug7464
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix a harmless bug when opting against publishing a relay descriptor
+      because DisableNetwork is set. Fixes bug 7464; bugfix on
+      0.2.3.9-alpha.
diff --git a/src/or/main.c b/src/or/main.c
index 20a1e086a4..34bf3e50f5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1199,7 +1199,7 @@ run_scheduled_events(time_t now)
     if (router_rebuild_descriptor(1)<0) {
       log_info(LD_CONFIG, "Couldn't rebuild router descriptor");
     }
-    if (advertised_server_mode() & !options->DisableNetwork)
+    if (advertised_server_mode() && !options->DisableNetwork)
       router_upload_dir_desc_to_dirservers(0);
   }