From 5ad9dc2244d8d3c600f0776fe8cc99c701d5ae7f Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 25 Apr 2008 18:42:42 +0000
Subject: [PATCH] apply patch from lodger to simplify code a bit

svn:r14474
---
 src/or/dns.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/dns.c b/src/or/dns.c
index 041ae74bc0..5af868b27b 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -549,11 +549,12 @@ dns_resolve(edge_connection_t *exitconn)
   or_circuit_t *oncirc = TO_OR_CIRCUIT(exitconn->on_circuit);
   int is_resolve, r;
   char *hostname = NULL;
-  routerinfo_t *me = router_get_my_routerinfo();
+  routerinfo_t *me;
   is_resolve = exitconn->_base.purpose == EXIT_PURPOSE_RESOLVE;
 
-  if (is_resolve && me &&
-      policy_is_reject_star(me->exit_policy)) /* non-exit */
+  if (is_resolve &&
+      (!(me = router_get_my_routerinfo()) ||
+       policy_is_reject_star(me->exit_policy))) /* non-exit */
     r = -1;
   else
     r = dns_resolve_impl(exitconn, is_resolve, oncirc, &hostname);