Make AuthDirHasIPv6Connectivity a BOOL.

This is a fix of unreleased tor. It solves ticket #6770.

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5e76105d2baf6a6d91f80bb037139eb42acb17a1..c4fac40d4c5510f112efb4768f0c934b7550c1cf 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1747,13 +1747,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS
     votes on whether to accept relays as hidden service directories.
     (Default: 1)
 
-**AuthDirHasIPv6Connectivity** **0**|**1**|**auto**::
+**AuthDirHasIPv6Connectivity** **0**|**1**::
 
     Authoritative directories only. When set to 0, OR ports with an
     IPv6 address are being accepted without reachability testing.
     When set to 1, IPv6 OR ports are being tested just like IPv4 OR
-    ports.  When set to auto, Tor tries to find out if the authority
-    relay has IPv6 connectivity or not. (Default: auto)
+    ports. (Default: 0)
 
 **AuthDirPublishIPv6** **0**|**1**::
 

diff --git a/src/or/config.c b/src/or/config.c
index f21016d48f0adf714addb9d8ad9dcd7af2b2392b..949d1a2bbf4b078c5445c2ad7cbb3563f64b29c4 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -204,7 +204,7 @@ static config_var_t _option_vars[] = {
   V(AuthDirListBadExits,         BOOL,     "0"),
   V(AuthDirMaxServersPerAddr,    UINT,     "2"),
   V(AuthDirMaxServersPerAuthAddr,UINT,     "5"),
-  V(AuthDirHasIPv6Connectivity,  AUTOBOOL, "auto"),
+  V(AuthDirHasIPv6Connectivity,  BOOL,     "0"),
   V(AuthDirPublishIPv6,          BOOL,     "0"),
   VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
   V(AutomapHostsOnResolve,       BOOL,     "0"),