[or-cvs] r10302: minimal backport of r10238 (in tor/branches/tor-0_1_2-patches: doc src/or)

[arma at seul.org]

Author: arma
Date: 2007-05-24 13:11:12 -0400 (Thu, 24 May 2007)
New Revision: 10302

Modified:
   tor/branches/tor-0_1_2-patches/doc/tor.1.in
   tor/branches/tor-0_1_2-patches/src/or/config.c
Log:
minimal backport of r10238


Modified: tor/branches/tor-0_1_2-patches/doc/tor.1.in
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/tor.1.in	2007-05-24 15:48:53 UTC (rev 10301)
+++ tor/branches/tor-0_1_2-patches/doc/tor.1.in	2007-05-24 17:11:12 UTC (rev 10302)
@@ -417,13 +417,6 @@
 (Default: 10 minutes)
 .LP
 .TP
-\fBNodeFamily \fR\fInickname\fR,\fInickname\fR,\fI...\fP
-The named Tor servers constitute a "family" of similar or co-administered
-servers, so never use any two of them in the same circuit. Defining a
-NodeFamily is only needed when a server doesn't list the family itself
-(with MyFamily). This option can be used multiple times.
-.LP
-.TP
 \fBEnforceDistinctSubnets \fR\fB0\fR|\fB1\fR\fP
 If 1, Tor will not put two servers whose IP addresses are "too
 close" on the same circuit.  Currently, two addresses are

Modified: tor/branches/tor-0_1_2-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/config.c	2007-05-24 15:48:53 UTC (rev 10301)
+++ tor/branches/tor-0_1_2-patches/src/or/config.c	2007-05-24 17:11:12 UTC (rev 10302)
@@ -2734,6 +2734,9 @@
     return -1;
   if (check_nickname_list(options->MyFamily, "MyFamily", msg))
     return -1;
+
+  if (options->NodeFamilies)
+    COMPLAIN("NodeFamily config option is broken in this version of Tor.");
   for (cl = options->NodeFamilies; cl; cl = cl->next) {
     if (check_nickname_list(cl->value, "NodeFamily", msg))
       return -1;