[or-cvs] r11968: Correctly check for bad options to the "PublishServerDescrip (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-10-15 23:26:39 -0400 (Mon, 15 Oct 2007)
New Revision: 11968

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
Correctly check for bad options to the "PublishServerDescriptor"
config option. Bugfix on 0.2.0.1-alpha; reported by Matt Edman.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-16 03:04:10 UTC (rev 11967)
+++ tor/trunk/ChangeLog	2007-10-16 03:26:39 UTC (rev 11968)
@@ -22,6 +22,8 @@
     - Make the "next period" votes into "current period" votes immediately
       after publishing the consensus; avoid a heisenbug that made them stick
       around indefinitely.
+    - Correctly check for bad options to the "PublishServerDescriptor"
+      config option. Bugfix on 0.2.0.1-alpha; reported by Matt Edman.
 
   o Minor bugfixes (memory leaks):
     - Stop leaking memory on failing case of base32_decode.  Bugfix on

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-10-16 03:04:10 UTC (rev 11967)
+++ tor/trunk/src/or/config.c	2007-10-16 03:26:39 UTC (rev 11968)
@@ -2391,9 +2391,8 @@
 
 /** Parse an authority type from <b>list</b> and write it to *<b>auth</b>.  If
  * <b>compatible</b> is non-zero, treat "1" as "v1,v2" and treat "0" as "".
- * Return 0 on success or -(idx of first bad member) if not a recognized
- * authority type.
- */
+ * Return 0 on success or -1 if not a recognized authority type (in which
+ * case the value of *<b>auth</b> is undefined). */
 static int
 parse_authority_type_from_list(smartlist_t *list, authority_type_t *auth,
                                int compatible)
@@ -2418,7 +2417,7 @@
     else if (!strcasecmp(string, "") || (compatible && !strcmp(string, "0")))
       /* no authority */;
     else
-      return - string_sl_idx;
+      return -1;
     });
   return 0;
 }