From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Jan 2015 14:42:23 +0000 (-0500)
Subject: Actually set *expires_out in addressmap_rewrite.
X-Git-Tag: tor-0.2.6.3-alpha~135^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e1ed0815d3f426e7e30b09f3c781425c76e72d5;p=thirdparty%2Ftor.git

Actually set *expires_out in addressmap_rewrite.

Fixes 14193; bugfix on 35d08e30d, which went into 0.2.3.17-beta.
---

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);
 }