[or-cvs] r14374: forward-port r14373 (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-04-15 19:06:31 -0400 (Tue, 15 Apr 2008)
New Revision: 14374

Modified:
   tor/trunk/src/or/connection.c
Log:
forward-port r14373


Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2008-04-15 23:05:44 UTC (rev 14373)
+++ tor/trunk/src/or/connection.c	2008-04-15 23:06:31 UTC (rev 14374)
@@ -485,7 +485,9 @@
        * retry as needed. (If a fetch is successful, the connection state
        * is changed to DIR_PURPOSE_HAS_FETCHED_RENDDESC to mark that
        * refetching is unnecessary.) */
-      if (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC_V2)
+       if (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC_V2 &&
+           dir_conn->rend_query &&
+           strlen(dir_conn->rend_query) == REND_SERVICE_ID_LEN_BASE32)
         rend_client_refetch_v2_renddesc(dir_conn->rend_query);
       break;
     case CONN_TYPE_OR: