[tor/master] Actually set *expires_out in addressmap_rewrite.

commit 2e1ed0815d3f426e7e30b09f3c781425c76e72d5 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 13 09:42:23 2015 -0500 Actually set *expires_out in addressmap_rewrite. Fixes 14193; bugfix on 35d08e30d, which went into 0.2.3.17-beta. --- changes/bug14193 | 4 ++++ src/or/addressmap.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug14193 b/changes/bug14193 new file mode 100644 index 0000000..a700668 --- /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 8ad2432..908d94f 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); }
participants (1)
-
nickm@torproject.org