Browse Source

a better fix. puts r8446 to bed.

svn:r9096
Roger Dingledine 17 years ago
parent
commit
477438e6c7
2 changed files with 2 additions and 3 deletions
  1. 1 2
      src/or/circuituse.c
  2. 1 1
      src/or/connection_edge.c

+ 1 - 2
src/or/circuituse.c

@@ -1182,8 +1182,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn)
         }
         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");

+ 1 - 1
src/or/connection_edge.c

@@ -2404,7 +2404,7 @@ connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
       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;