[or-cvs] r10471: Patch from robert hogan: avoid crash when DNS port is set mo (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-03 17:39:24 -0400 (Sun, 03 Jun 2007)
New Revision: 10471

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection.c
Log:
 r13174 at catbus:  nickm | 2007-06-03 17:39:20 -0400
 Patch from robert hogan: avoid crash when DNS port is set more than once.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13174] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-06-03 19:41:51 UTC (rev 10470)
+++ tor/trunk/ChangeLog	2007-06-03 21:39:24 UTC (rev 10471)
@@ -1,3 +1,9 @@
+Changes in version 0.2.0.3-alpha - 2007-??-??
+  o Minor bugfixes ():
+    - Fix a crash when DNSPort is set more than once. (Patch from Robert
+      Hogan.)
+
+
 Changes in version 0.2.0.2-alpha - 2007-06-02
   o Major bugfixes on 0.2.0.1-alpha:
     - Fix an assertion failure related to servers without extra-info digests.

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2007-06-03 19:41:51 UTC (rev 10470)
+++ tor/trunk/src/or/connection.c	2007-06-03 21:39:24 UTC (rev 10471)
@@ -2642,6 +2642,7 @@
     case CONN_TYPE_AP_NATD_LISTENER:
     case CONN_TYPE_DIR_LISTENER:
     case CONN_TYPE_CONTROL_LISTENER:
+    case CONN_TYPE_AP_DNS_LISTENER:
       tor_assert(conn->state == LISTENER_STATE_READY);
       break;
     case CONN_TYPE_OR: