diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-01-10 20:38:33 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-01-10 20:38:33 +0000 |
| commit | b2d79f278b27113d39077c6ab45c1efe86959eb8 (patch) | |
| tree | d53b63c6232799beb7b4a064b34eabf9e4bdc08c | |
| parent | f4299f0f44b7d5e6c07988a3bd4265ac7219d186 (diff) | |
| download | tor-b2d79f278b27113d39077c6ab45c1efe86959eb8.tar.gz tor-b2d79f278b27113d39077c6ab45c1efe86959eb8.zip | |
or_state_validate() needs an extra arg too or it will crash
svn:r5772
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index d6f0220d15..5539eeafcc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -358,7 +358,8 @@ static int write_configuration_file(const char *fname, or_options_t *options); static config_line_t *get_assigned_option(config_format_t *fmt, or_options_t *options, const char *key); static void config_init(config_format_t *fmt, void *options); -static int or_state_validate(or_state_t *old_options, or_state_t *options); +static int or_state_validate(or_state_t *old_options, or_state_t *options, + int from_setconf); static uint64_t config_parse_memunit(const char *s, int *ok); static int config_parse_interval(const char *s, int *ok); @@ -3562,8 +3563,9 @@ get_or_state_fname(void) } /** DOCDOC */ +/* XXX from_setconf is here because of bug 238 */ static int -or_state_validate(or_state_t *old_state, or_state_t *state) +or_state_validate(or_state_t *old_state, or_state_t *state, int from_setconf) { const char *err; tor_version_t v; @@ -3629,7 +3631,7 @@ or_state_load(void) goto done; } - if (or_state_validate(NULL, new_state) < 0) + if (or_state_validate(NULL, new_state, 1) < 0) goto done; if (contents) |