r14427@Kushana: nickm | 2007-09-13 13:28:22 -0400
Backport: Do not load state when options->command is not RUN_TOR. (Resolves bug 499) svn:r11438
This commit is contained in:
parent
ff7e0e8971
commit
b228d62898
|
@ -3,6 +3,11 @@ Changes in version 0.1.2.18 - 2007-??-??
|
|||
- Fix possible segfaults in functions called from
|
||||
rend_process_relay_cell().
|
||||
|
||||
o Minor bugfixes:
|
||||
- Don't try to access (or alter) the state file when running
|
||||
--list-fingerprint or --verify-config or --hash-password. (Resolves
|
||||
bug 499.)
|
||||
|
||||
|
||||
Changes in version 0.1.2.17 - 2007-08-30
|
||||
o Major bugfixes (security):
|
||||
|
|
|
@ -917,16 +917,16 @@ options_act(or_options_t *old_options)
|
|||
tor_free(fn);
|
||||
}
|
||||
|
||||
/* Load state */
|
||||
if (! global_state)
|
||||
if (or_state_load())
|
||||
return -1;
|
||||
|
||||
/* Bail out at this point if we're not going to be a client or server:
|
||||
* we want to not fork, and to log stuff to stderr. */
|
||||
if (options->command != CMD_RUN_TOR)
|
||||
return 0;
|
||||
|
||||
/* Load state */
|
||||
if (! global_state)
|
||||
if (or_state_load())
|
||||
return -1;
|
||||
|
||||
{
|
||||
smartlist_t *sl = smartlist_create();
|
||||
char *errmsg = NULL;
|
||||
|
|
Loading…
Reference in New Issue