X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=dirmngr%2Fdns-stuff.c;fp=dirmngr%2Fdns-stuff.c;h=e32e1e3e1bb827d31f9349465bc5e937a9bbba45;hb=e8c37e998ef31abe2ea7f0f6e643676d596f813a;hp=cf8cefb2eeaa574ca7905385be04f4fb6a7a25f9;hpb=1a482a1e6578f08c34d38b0bd564587b29e1081c;p=gnupg2.git

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index cf8cefb..e32e1e3 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -199,9 +199,9 @@ recursive_resolver_p (void)
 }
 
 
-/* Sets the module in Tor mode.  Returns 0 is this is possible or an
-   error code.  */
-gpg_error_t
+/* Puts this module eternally into Tor mode.  When called agained with
+ * NEW_CIRCUIT request a new TOR circuit for the next DNS query.  */
+void
 enable_dns_tormode (int new_circuit)
 {
   if (!*tor_socks_user || new_circuit)
@@ -215,7 +215,6 @@ enable_dns_tormode (int new_circuit)
       counter++;
     }
   tor_mode = 1;
-  return 0;
 }
 
 
@@ -548,7 +547,10 @@ reload_dns_stuff (int force)
       libdns_reinit_pending = 0;
     }
   else
-    libdns_reinit_pending = 1;
+    {
+      libdns_reinit_pending = 1;
+      libdns_tor_port = 0;  /* Start again with the default port.  */
+    }
 #else
   (void)force;
 #endif