[or-cvs] r9096: a better fix. puts r8446 to bed. (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2006-12-12 16:09:30 -0500 (Tue, 12 Dec 2006)
New Revision: 9096

Modified:
   tor/trunk/src/or/circuituse.c
   tor/trunk/src/or/connection_edge.c
Log:
a better fix. puts r8446 to bed.


Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2006-12-12 20:23:17 UTC (rev 9095)
+++ tor/trunk/src/or/circuituse.c	2006-12-12 21:09:30 UTC (rev 9096)
@@ -1182,8 +1182,7 @@
         }
         return -1;
       }
-      if (!SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command) &&
-          !connection_ap_can_use_exit(conn, router)) {
+      if (!connection_ap_can_use_exit(conn, router)) {
         log_fn(opt ? LOG_INFO : LOG_WARN, LD_APP,
                "Requested exit point '%s' would refuse request. %s.",
                conn->chosen_exit_name, opt ? "Trying others" : "Closing");

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2006-12-12 20:23:17 UTC (rev 9095)
+++ tor/trunk/src/or/connection_edge.c	2006-12-12 21:09:30 UTC (rev 9096)
@@ -2404,7 +2404,7 @@
       return 0;
 
     /* Don't send DNS requests to non-exit servers by default. */
-    if (policy_is_reject_star(exit->exit_policy))
+    if (!conn->chosen_exit_name && policy_is_reject_star(exit->exit_policy))
       return 0;
   }
   return 1;