[or-cvs] r14297: Fix bug 641 and 650, I think. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-04-03 15:01:16 -0400 (Thu, 03 Apr 2008)
New Revision: 14297

Modified:
   tor/trunk/
   tor/trunk/src/or/connection_edge.c
Log:
 r19199 at catbus:  nickm | 2008-04-03 15:01:05 -0400
 Fix bug 641 and 650, I think.



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

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2008-04-03 16:18:20 UTC (rev 14296)
+++ tor/trunk/src/or/connection_edge.c	2008-04-03 19:01:16 UTC (rev 14297)
@@ -2772,7 +2772,7 @@
   if (conn->chosen_exit_name) {
     routerinfo_t *chosen_exit =
       router_get_by_nickname(conn->chosen_exit_name, 1);
-    if (!chosen_exit || memcpy(chosen_exit->cache_info.identity_digest,
+    if (!chosen_exit || memcmp(chosen_exit->cache_info.identity_digest,
                                exit->cache_info.identity_digest, DIGEST_LEN)) {
       /* doesn't match */
 //      log_debug(LD_APP,"Requested node '%s', considering node '%s'. No.",