Fix error causing pinger to abort if ICMP unavailable, even if ICMPv6 is.

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 144f4cb400b789d29a8f4818dc66fb4208ff5548..639f953ebb0746ef880da382372a59cae128be94 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,13 +1,13 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.14 2007/12/27 15:48:55 hno Exp $
+#  $Id: Makefile.am,v 1.15 2008/01/08 11:10:48 amosjeffries Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
-##DIST_SUBDIRS = coss null ufs
+##DIST_SUBDIRS = coss ufs
 
 EXTRA_LIBRARIES = libcoss.a libufs.a
 noinst_LIBRARIES = @STORE_LIBS@

diff --git a/src/pinger.cc b/src/pinger.cc
index bd8feba7069a4579dcbb47612b12d24b16cac207..e6454ceb9e7b718e96c814f46a089d77d007e71c 100644 (file)
--- a/src/pinger.cc
+++ b/src/pinger.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: pinger.cc,v 1.60 2007/12/14 23:11:47 amosjeffries Exp $
+ * $Id: pinger.cc,v 1.61 2008/01/08 11:10:48 amosjeffries Exp $
  *
  * DEBUG: section 42    ICMP Pinger program
  * AUTHOR: Duane Wessels
@@ -135,8 +135,10 @@ main(int argc, char *argv[])
 #if USE_IPV6
         if(icmp6_worker == -1)
 #endif
+        {
             debugs(42, 0, "FATAL: pinger: Unable to open any ICMP sockets.");
             exit(1);
+        }
     }
 
     if( (squid_link = control.Open()) < 0) {