From: Roger Dingledine <arma@torproject.org>
Date: Wed, 5 Sep 2012 22:17:41 +0000 (-0400)
Subject: make AuthDirHasIPv6Connectivity match the man page
X-Git-Tag: tor-0.2.4.1-alpha~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00b8272daa63e54e25f51bef7850c1c185dba5c;p=thirdparty%2Ftor.git

make AuthDirHasIPv6Connectivity match the man page

we can turn it into an autobool later if we have some way for it
to make a decision.

(patch possibly got lost when nickm merged #6770; or maybe nickm meant
for it to be this way. i'm not sure.)
---

diff --git a/src/or/config.c b/src/or/config.c
index 60276688ce..a4a794a14d 100644
--- 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, "0"),
+  V(AuthDirHasIPv6Connectivity,  BOOL,     "0"),
   VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
   V(AutomapHostsOnResolve,       BOOL,     "0"),
   V(AutomapHostsSuffixes,        CSV,      ".onion,.exit"),
diff --git a/src/or/or.h b/src/or/or.h
index 0b321fde06..3609d32b77 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3323,7 +3323,7 @@ typedef struct {
   int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this
                                      * number of servers per IP address shared
                                      * with an authority. */
-  int AuthDirHasIPv6Connectivity; /**< Autoboolean: are we on IPv6?  */
+  int AuthDirHasIPv6Connectivity; /**< Boolean: are we on IPv6?  */
 
   /** If non-zero, always vote the Fast flag for any relay advertising
    * this amount of capacity or more. */