[tor-commits] [tor/release-0.2.3] use a more logical operator

[arma at torproject.org]

commit 88bb48e785609afeab6b63677f789036e25b34cf
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Nov 12 23:47:21 2012 -0500

    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.
---
 changes/bug7464 |    4 ++++
 src/or/main.c   |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/changes/bug7464 b/changes/bug7464
new file mode 100644
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 20a1e08..34bf3e5 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);
   }