[or-cvs] Avoid potential infinite recursion when building a descriptor

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/nickm/src/tor/src/or

Modified Files:
	router.c 
Log Message:
Avoid potential infinite recursion when building a descriptor

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- router.c	18 Oct 2005 17:43:54 -0000	1.223
+++ router.c	24 Oct 2005 03:04:05 -0000	1.224
@@ -402,10 +402,9 @@
 check_whether_dirport_reachable(void)
 {
   or_options_t *options = get_options();
-  routerinfo_t *ri = router_get_my_routerinfo();
   return !options->DirPort ||
          options->AssumeReachable ||
-         (ri && !ri->dir_port) ||
+         we_are_hibernating() ||
          can_reach_dir_port;
 }