diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-09-17 20:32:42 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-09-17 20:32:42 -0400 |
| commit | 67f280feb361ce5f5c0784e56e94cae87b917bba (patch) | |
| tree | 3f9f80e734e7e1df5906534fcd30b1135e6ff667 /src/or/config.c | |
| parent | b02b11c4b4dda362eb692e6b278f2855edd1e658 (diff) | |
| download | tor-67f280feb361ce5f5c0784e56e94cae87b917bba.tar tor-67f280feb361ce5f5c0784e56e94cae87b917bba.tar.gz | |
Let our config abbreviations rewrite more than once
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0712fbee7..474b887ba 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1515,7 +1515,10 @@ expand_abbrev(config_format_t *fmt, const char *option, int command_line, fmt->abbrevs[i].abbreviated, fmt->abbrevs[i].full); } - return fmt->abbrevs[i].full; + /* Keep going through the list in case we want to rewrite it more. + * (We could imagine recursing here, but I don't want to get the + * user into an infinite loop if we craft our list wrong.) */ + option = fmt->abbrevs[i].full; } } return option; |