[or-cvs] Resolve init-services-in-do-hup issue

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv30067

Modified Files:
	main.c 
Log Message:
Resolve init-services-in-do-hup issue

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- main.c	9 Apr 2004 19:34:55 -0000	1.233
+++ main.c	9 Apr 2004 19:37:50 -0000	1.234
@@ -540,8 +540,6 @@
     log_fn(LOG_ERR,"Error reloading rendezvous service keys");
     exit(1);
   }
-  /* We'll re-call rend_services_init after the new directory arrives.
-   * XXXX but what if we're the the directory? */
   if(retry_all_connections() < 0) {
     log_fn(LOG_ERR,"Failed to bind one of the listener ports.");
     return -1;
@@ -553,6 +551,12 @@
     if(dirserv_parse_fingerprint_file(keydir) < 0) {
       log_fn(LOG_WARN, "Error reloading fingerprints. Continuing with old list.");
     }
+    /* Since we aren't fetching a directory, we won't retry rendezvous points
+     * when it gets in.  Try again now. */
+    if (rend_services_init()<0) {
+      log_fn(LOG_ERR,"Error updating rendezvous services");
+      return -1;
+    }
   } else {
     /* fetch a new directory */
     directory_initiate_command(router_pick_directory_server(),