summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2013-08-17 22:30:58 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2013-08-17 22:30:58 (GMT)
commit108baecaecbf09cc85c4925f82141beae40f7c1e (patch)
tree868b54bdb69676138153bc6ec7ffc24c3d4a6a03
parente4ccd85c5061fd2cc72e3f8ab7c9371751c93e34 (diff)
downloadmonitoring-plugins-108baecaecbf09cc85c4925f82141beae40f7c1e.tar.gz
check_fping: Use fping6(8) only if available
Let check_fping use IPv6 only if - the operating system supports IPv6, - the user didn't specify --without-ipv6, and - the "configure" script found the fping6(8) binary.
-rw-r--r--configure.in20
-rw-r--r--plugins/check_fping.c2
2 files changed, 10 insertions, 12 deletions
diff --git a/configure.in b/configure.in
index a5d4842..43fe4ad 100644
--- a/configure.in
+++ b/configure.in
@@ -1378,28 +1378,26 @@ then
1378fi 1378fi
1379 1379
1380AC_PATH_PROG(PATH_TO_FPING,fping) 1380AC_PATH_PROG(PATH_TO_FPING,fping)
1381AC_PATH_PROG(PATH_TO_FPING6,fping6)
1382
1381AC_ARG_WITH(fping_command, 1383AC_ARG_WITH(fping_command,
1382 ACX_HELP_STRING([--with-fping-command=PATH], 1384 ACX_HELP_STRING([--with-fping-command=PATH],
1383 [Path to fping command]), PATH_TO_FPING=$withval) 1385 [Path to fping command]), PATH_TO_FPING=$withval)
1386AC_ARG_WITH(fping6_command,
1387 ACX_HELP_STRING([--with-fping6-command=PATH],
1388 [Path to fping6 command]), PATH_TO_FPING6=$withval)
1389
1384if test -n "$PATH_TO_FPING" 1390if test -n "$PATH_TO_FPING"
1385then 1391then
1386 AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping]) 1392 AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping])
1387 EXTRAS="$EXTRAS check_fping" 1393 EXTRAS="$EXTRAS check_fping"
1394 if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then
1395 AC_DEFINE_UNQUOTED(PATH_TO_FPING6,"$PATH_TO_FPING6",[path to fping6])
1396 fi
1388else 1397else
1389 AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) 1398 AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
1390fi 1399fi
1391 1400
1392AC_PATH_PROG(PATH_TO_FPING6,fping6)
1393AC_ARG_WITH(fping6_command,
1394 ACX_HELP_STRING([--with-fping6-command=PATH],
1395 [Path to fping6 command]), PATH_TO_FPING6=$withval)
1396if test -n "$PATH_TO_FPING6"
1397then
1398 AC_DEFINE_UNQUOTED(PATH_TO_FPING6,"$PATH_TO_FPING6",[path to fping6])
1399else
1400 AC_MSG_WARN([Get fping6 from http://www.fping.com in order to make check_fping plugin])
1401fi
1402
1403AC_PATH_PROG(PATH_TO_SSH,ssh) 1401AC_PATH_PROG(PATH_TO_SSH,ssh)
1404AC_ARG_WITH(ssh_command, 1402AC_ARG_WITH(ssh_command,
1405 ACX_HELP_STRING([--with-ssh-command=PATH], 1403 ACX_HELP_STRING([--with-ssh-command=PATH],
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 1c227cd..fde1d79 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -103,7 +103,7 @@ main (int argc, char **argv)
103 if (sourceif) 103 if (sourceif)
104 xasprintf(&option_string, "%s-I %s ", option_string, sourceif); 104 xasprintf(&option_string, "%s-I %s ", option_string, sourceif);
105 105
106#ifdef USE_IPV6 106#ifdef PATH_TO_FPING6
107 if (address_family == AF_INET6) 107 if (address_family == AF_INET6)
108 fping_prog = strdup(PATH_TO_FPING6); 108 fping_prog = strdup(PATH_TO_FPING6);
109 else 109 else