[or-cvs] The circus music begins playing as nickm and arma juggle an...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv15982/src/or

Modified Files:
	routerlist.c 
Log Message:
The circus music begins playing as nickm and arma juggle an ntohl.  Hoop-lah!

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- routerlist.c	26 Aug 2005 19:23:52 -0000	1.252
+++ routerlist.c	26 Aug 2005 19:25:36 -0000	1.253
@@ -1466,12 +1466,14 @@
       log_fn(LOG_WARN, "Couldn't find a suitable address. Returning.");
       return;
     }
-  } else if (tor_lookup_hostname(address, &a)) {
-    log_fn(LOG_WARN, "Unable to lookup address for directory server at %s",
-           address);
-    return;
+  } else {
+    if (tor_lookup_hostname(address, &a)) {
+      log_fn(LOG_WARN, "Unable to lookup address for directory server at %s",
+             address);
+      return;
+    }
+    a = ntohl(a);
   }
-  a = ntohl(a);
 
   ent = tor_malloc(sizeof(trusted_dir_server_t));
   if (address) {