Fix ServerDNSRandomizeCase so that setting it to 0 works.

Bugfix on 0.2.1.7-alpha.  Backport candidate. Fixes bug 905.

svn:r18063

diff --git a/ChangeLog b/ChangeLog
index 22bc33b9d9cc0006153a20acea67b223f3bb27b3..ab2adc2f182bd8165a9af3d34a69b051a7d4f066 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Changes in version 0.2.1.11-alpha - 2009-01-??
     - Try to make sure that the version of Libevent we're running with
       is binary-compatible with the one we built with.  May address bug
       897 and others.
+    - Make setting ServerDNSRandomizeCase to 0 actually work.  Bugfix
+      for bug 905.  Bugfix on 0.2.1.7-alpha.
 
   o Minor bugfixes:
     - Make outbound DNS packets respect the OutboundBindAddress setting.
@@ -394,7 +396,7 @@ Changes in version 0.2.1.7-alpha - 2008-11-08
     - Implement the 0x20 hack to better resist DNS poisoning: set the
       case on outgoing DNS requests randomly, and reject responses that do
       not match the case correctly. This logic can be disabled with the
-      ServerDNSRamdomizeCase setting, if you are using one of the 0.3%
+      ServerDNSRandomizeCase setting, if you are using one of the 0.3%
       of servers that do not reliably preserve case in replies. See
       "Increased DNS Forgery Resistance through 0x20-Bit Encoding"
       for more info.

diff --git a/src/or/dns.c b/src/or/dns.c
index f8191679bf088bd22352b9cda348b3cb098bcc80..d57e8fc5624199f1936af670aba7497e61b0d72e 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -198,9 +198,9 @@ dns_init(void)
   init_cache_map();
   evdns_set_random_bytes_fn(_dns_randfn);
   if (get_options()->ServerDNSRandomizeCase)
-    evdns_set_option("randomize-case", "1", DNS_OPTIONS_ALL);
+    evdns_set_option("randomize-case:", "1", DNS_OPTIONS_ALL);
   else
-    evdns_set_option("randomize-case", "0", DNS_OPTIONS_ALL);
+    evdns_set_option("randomize-case:", "0", DNS_OPTIONS_ALL);
   if (server_mode(get_options())) {
     int r = configure_nameservers(1);
     return r;