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.
This commit is contained in:
Roger Dingledine 2012-11-12 23:47:21 -05:00
parent e567b4482a
commit 88bb48e785
2 changed files with 5 additions and 1 deletions

4
changes/bug7464 Normal file
View File

@ -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.

View File

@ -1199,7 +1199,7 @@ run_scheduled_events(time_t now)
if (router_rebuild_descriptor(1)<0) { if (router_rebuild_descriptor(1)<0) {
log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); 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); router_upload_dir_desc_to_dirservers(0);
} }