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 (file)
index 0000000..9259cc7
--- /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 20a1e086a4440aee6a5529b777cfb1dd4cb32766..34bf3e50f5f7915f384ceb59c0ffbc3b3752ad59 100644 (file)
--- 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);
   }