[or-cvs] r9025: backport a workaround for the AuthDirRejectUnlisted assert f (in tor/branches/tor-0_1_1-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2006-12-04 17:42:23 -0500 (Mon, 04 Dec 2006)
New Revision: 9025

Modified:
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/routerlist.c
Log:
backport a workaround for the AuthDirRejectUnlisted assert failure


Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2006-12-04 22:13:02 UTC (rev 9024)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2006-12-04 22:42:23 UTC (rev 9025)
@@ -1,3 +1,10 @@
+Changes in version 0.1.1.26 - 200?-??-??
+  o Minor bugfixes:
+    - Fix an assert failure when a directory authority sets
+      AuthDirRejectUnlisted and then receives a descriptor from an
+      unlisted router (reported by seeess).
+
+
 Changes in version 0.1.1.25 - 2006-11-04
   o Major bugfixes:
     - When a client asks us to resolve (rather than connect to)

Modified: tor/branches/tor-0_1_1-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/routerlist.c	2006-12-04 22:13:02 UTC (rev 9024)
+++ tor/branches/tor-0_1_1-patches/src/or/routerlist.c	2006-12-04 22:42:23 UTC (rev 9025)
@@ -1533,7 +1533,8 @@
   if (authdir) {
     if (authdir_wants_to_reject_router(router, msg,
                                        !from_cache && !from_fetch)) {
-      tor_assert(*msg);
+      if (!*msg)
+        *msg = "no message";
       routerinfo_free(router);
       return -2;
     }