diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-13 09:42:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-13 09:42:23 -0500 |
| commit | 2e1ed0815d3f426e7e30b09f3c781425c76e72d5 (patch) | |
| tree | 23328ce8847801ffb869913dc158ce33984d8add | |
| parent | bba995e6660dbb49876886278f71d7d5a85f5f88 (diff) | |
| download | tor-2e1ed0815d3f426e7e30b09f3c781425c76e72d5.tar.gz tor-2e1ed0815d3f426e7e30b09f3c781425c76e72d5.zip | |
Actually set *expires_out in addressmap_rewrite.
Fixes 14193; bugfix on 35d08e30d, which went into 0.2.3.17-beta.
| -rw-r--r-- | changes/bug14193 | 4 | ||||
| -rw-r--r-- | src/or/addressmap.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug14193 b/changes/bug14193 new file mode 100644 index 0000000000..a7006685f5 --- /dev/null +++ b/changes/bug14193 @@ -0,0 +1,4 @@ + o Minor bugfixes (client DNS): + - Report the correct cached DNS expiration times. Previously, we + would report everything as "never expires." Fixes bug 14193; + bugfix on 0.2.3.17-beta. diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 8ad24323b5..908d94faa1 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -431,7 +431,7 @@ addressmap_rewrite(char *address, size_t maxlen, if (exit_source_out) *exit_source_out = exit_source; if (expires_out) - *expires_out = TIME_MAX; + *expires_out = expires; return (rewrites > 0); } |