torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

make the last patch do what i actually want. it was a bit tricky

Browse Source 
since we want the default guardversion to be 0 (which is what it is
if there's no guardversion line), yet when we're validating a freshly
configed and defaulted state, we don't want to complain.


svn:r11264
This commit is contained in:
Roger Dingledine
2007-08-24 08:12:25 +00:00
parent 9bacf68851
commit 738ecba367
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/config.c
+2 -1
View File
@@ -4357,7 +4357,7 @@ or_state_validate(or_state_t *old_state, or_state_t *state,
(void) from_setconf;
(void) old_state;
if (state->GuardVersion < RECOMMENDED_GUARD_VERSION) {
if (state->EntryGuards && state->GuardVersion < RECOMMENDED_GUARD_VERSION) {
config_free_lines(state->EntryGuards);
state->EntryGuards = NULL;
log_notice(LD_CONFIG, "Detected state file from old version '%s'. "
@@ -4524,6 +4524,7 @@ or_state_save(time_t now)
len = strlen(get_version())+8;
global_state->TorVersion = tor_malloc(len);
tor_snprintf(global_state->TorVersion, len, "Tor %s", get_version());
global_state->GuardVersion = RECOMMENDED_GUARD_VERSION;
state = config_dump(&state_format, global_state, 1, 0);
len = strlen(state)+256;