]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Don't call neighbors_init() when icp_port is set to 0
authorserassio <>
Sun, 3 Apr 2005 23:11:21 +0000 (23:11 +0000)
committerserassio <>
Sun, 3 Apr 2005 23:11:21 +0000 (23:11 +0000)
src/main.cc

index d8b009161d163fe1266437e591725c22066ac005..0ab3a9e30b0613d5ada9290a8d6d7c8d3e67879a 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.405 2005/03/18 15:47:42 hno Exp $
+ * $Id: main.cc,v 1.406 2005/04/03 17:11:21 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -561,11 +561,18 @@ mainReconfigure(void)
 #endif
 
     serverConnectionsOpen();
-    neighbors_init();
+
+    if (theOutIcpConnection >= 0)
+        neighbors_init();
+
     storeDirOpenSwapLogs();
+
     mimeInit(Config.mimeTablePathname);
+
     writePidFile();            /* write PID file */
+
     debug(1, 1) ("Ready to serve requests.\n");
+
     reconfiguring = 0;
 }
 
@@ -791,7 +798,8 @@ mainInitialize(void)
 
     serverConnectionsOpen();
 
-    neighbors_init();
+    if (theOutIcpConnection >= 0)
+        neighbors_init();
 
     if (Config.chroot_dir)
         no_suid();