diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-09-13 17:01:08 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-09-13 17:01:08 +0000 |
| commit | 5fcc48d389b558f5c147667321bedc530649b74c (patch) | |
| tree | 35f641ae46a9a9400e9d952d0053c37e1f0f8496 /src/or/config.c | |
| parent | 9b1ad0074bd21e4494b25a9c22fde289207f6b76 (diff) | |
| download | tor-5fcc48d389b558f5c147667321bedc530649b74c.tar tor-5fcc48d389b558f5c147667321bedc530649b74c.tar.gz | |
r14425@Kushana: nickm | 2007-09-13 13:00:57 -0400
Do not load state when options->command is not RUN_TOR. (Resolves bug 499; backport candidate)
svn:r11437
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index 570c5363d..9cf6b96d5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1007,13 +1007,10 @@ options_act(or_options_t *old_options) } /* Load state */ - if (! global_state) { + if (! global_state && options->command == CMD_RUN_TOR) { if (or_state_load()) return -1; - - /* XXXX020 make this conditional? */ - if (options->command == CMD_RUN_TOR) - rep_hist_load_mtbf_data(time(NULL)); + rep_hist_load_mtbf_data(time(NULL)); } /* Bail out at this point if we're not going to be a client or server: |