51 files changed, 1424 insertions, 417 deletions
diff --git a/.gitignore b/.gitignore
index bda7b276..4dca502c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,6 +191,7 @@ NP-VERSION-FILE
 /plugins/.libs
 /plugins/Makefile
 /plugins/Makefile.in
+/plugins/libnpcommon.a
 /plugins/negate
 /plugins/stamp-h*
 /plugins/urlize
diff --git a/ChangeLog b/ChangeLog
index 050d42bf..acc35759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-23  Robin Sonefors <robin.sonefors@op5.com>
+        * plugins/check_snmp.c: fix memory allocation if using >= 8 oids
 2012-06-27  Holger Weiss <holger@zedat.fu-berlin.de>
        * plugins/check_tcp.c: check_tcp: Print performance data even with
diff --git a/NEWS b/NEWS
index 293bd9dc..df2652f9 100644
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,41 @@ This file documents the major additions and syntax changes between releases.
        ENHANCEMENTS
        New check_dbi plugin for checking an (SQL) database using DBI
        Let OpenSSL load its configuration file (see the OPENSSL_config(3) man page)
+        Add performance data to check_apt
        Add performance data to check_procs
+        Added -4/-6 options to check_dig (Ville Mattila)
+        New check_oracle --connect option to perform real login
+        New check_nagios -t option to override the default timeout
+        New check_disk -N/--include-type option to limit the filesystem types to check
+        Allow for building the plugins in parallel
+        Add --without-{dbi,ldap,radius} options to ./configure
+        Made Verbose output of check_sensors compliant (Gabriele Tozzi)
+        New switch -E/--extended-perfdata for check_http to print additional performance data (Sebastian Nohn)
+        New check_http -d option to specify a string to expect within the response headers
+        Add support for executing queries to check_pgsql
+        Let check_pgsql accept a UNIX socket directory as hostname
+        New check_pgsql -o option to specify additional connection parameters
+        New check_fping -S option to specify the source IP address
+        New check_fping -I option to specify the interface to bind to
+        Let check_fping support IPv6
+        New check_procs -k option to ignore kernel threads (on Linux)
+        Let check_procs use /proc/<PID>/exe (if available) instead of getpid(2), unless -T is specified
+        Let check_mysql support SSL
+        Let check_mysql add perfromance metrics for all checks
+        New check_snmp --offset option to allow for adding/substracting an offset value to sensor data
        FIXES
        Change the MAIL FROM command generated by check_smtp to be RFC compliant
        Fix compilation of check_http without SSL support
        Fix check_snmp reversed threshold ranges (backward-compatibility)
+        Fix check_snmp memory violation when using more than 8 oids (Robin Sonefors)
+        Fix check_apt security regular expression (Alex Bradley)
+        Fix check_http handling extra header (-k) containing semicolons (Richard Leitner)
+        Fix check_apt handling unknown exit codes from apt-get (Richard Leitner)
+        Fix deprecated imports of check_nmap.py (Fabio Rueda)
+        WARNINGS
+        check_http behaviour of -k/--header changed since it does not seperate multiple headers by semicolons anymore. Use multiple -k switches instead.
 1.4.16 27th June 2012
        ENHANCEMENTS
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 9f2eec0f..1f673e98 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -36,10 +36,9 @@ check_ldap:
 check_mysql, check_mysql_query:
        - Requires the MySQL libraries available from
-          http://www.mysql.org/
+          http://dev.mysql.com/downloads/
                Lib: libmysql, libmysqlclient
-                Redhat Powertools Source: mysql-3.20.32a-3.i386.rpm, mysql-devel-3.20.32a-3.i386.rpm (these seem to be broken, however)
+                Redhat Source (RHEL6, YUM): mysql-devel, mysql-libs
-                RPMS from www.mysql.org work better
          Must have mysql_config in PATH or specified with --with-mysql=DIR for DIR/bin/mysql_config
 check_pqsql:
diff --git a/THANKS.in b/THANKS.in
index 51935119..54315afa 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -275,3 +275,13 @@ Tobias Brox
 William Leibzon
 Jochen Bern
 Anders Kaseorg
+Robin Sonefors
+Alex Bradley
+Brian De Wolf
+Richard Leitner
+Diego Elio Pettenò
+Vaclav Ovsik
+Roman Fiedler
+Fabio Rueda
+Gabriele Tozzi
+Sebastian Nohn
diff --git a/configure.in b/configure.in
index 1d4ed006..43fe4ade 100644
--- a/configure.in
+++ b/configure.in
@@ -255,55 +255,66 @@ fi
 LIBS="$_SAVEDLIBS"
 CPPFLAGS="$_SAVEDCPPFLAGS"
+AC_ARG_WITH([dbi], [AS_HELP_STRING([--without-dbi], [Skips the dbi plugin])])
 dnl Check for DBI libraries
-_SAVEDLIBS="$LIBS"
+AS_IF([test "x$with_dbi" != "xno"], [
-AC_CHECK_LIB(dbi,dbi_initialize)
+  _SAVEDLIBS="$LIBS"
-if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
+  AC_CHECK_LIB(dbi,dbi_initialize)
-  EXTRAS="$EXTRAS check_dbi"
+  if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
-        DBILIBS="-ldbi"
+    EXTRAS="$EXTRAS check_dbi"
-  AC_SUBST(DBILIBS)
+        DBILIBS="-ldbi"
-else
+    AC_SUBST(DBILIBS)
-  AC_MSG_WARN([Skipping dbi plugin])
+  else
-  AC_MSG_WARN([install DBI libs to compile this plugin (see REQUIREMENTS).])
+    AC_MSG_WARN([Skipping dbi plugin])
-fi
+    AC_MSG_WARN([install DBI libs to compile this plugin (see REQUIREMENTS).])
-LIBS="$_SAVEDLIBS"
+  fi
+  LIBS="$_SAVEDLIBS"
+])
+AC_ARG_WITH([radius], [AS_HELP_STRING([--without-radius], [Skips the radius plugin])])
 dnl Check for radius libraries
-_SAVEDLIBS="$LIBS"
+AS_IF([test "x$with_radius" != "xno"], [
-AC_CHECK_LIB(radiusclient,rc_read_config)
+  _SAVEDLIBS="$LIBS"
-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+  AC_CHECK_LIB(radiusclient,rc_read_config)
-  EXTRAS="$EXTRAS check_radius"
+  if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-        RADIUSLIBS="-lradiusclient"
-  AC_SUBST(RADIUSLIBS)
-else
-  AC_CHECK_LIB(radiusclient-ng,rc_read_config)
-  if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
    EXTRAS="$EXTRAS check_radius"
-          RADIUSLIBS="-lradiusclient-ng"
+        RADIUSLIBS="-lradiusclient"
    AC_SUBST(RADIUSLIBS)
  else
-    AC_MSG_WARN([Skipping radius plugin])
+    AC_CHECK_LIB(radiusclient-ng,rc_read_config)
-    AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+    if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
+      EXTRAS="$EXTRAS check_radius"
+          RADIUSLIBS="-lradiusclient-ng"
+      AC_SUBST(RADIUSLIBS)
+    else
+      AC_MSG_WARN([Skipping radius plugin])
+      AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+    fi
  fi
-fi
+  LIBS="$_SAVEDLIBS"
-LIBS="$_SAVEDLIBS"
+])
+AC_ARG_WITH([ldap], [AS_HELP_STRING([--without-ldap], [Skips the LDAP plugin])])
 dnl Check for LDAP libraries
-_SAVEDLIBS="$LIBS"
+AS_IF([test "x$with_ldap" != "xno"], [
-AC_CHECK_LIB(ldap,main,,,-llber)
+  _SAVEDLIBS="$LIBS"
-if test "$ac_cv_lib_ldap_main" = "yes"; then
+  AC_CHECK_LIB(ldap,main,,,-llber)
-  LDAPLIBS="-lldap -llber"\
+  if test "$ac_cv_lib_ldap_main" = "yes"; then
-  LDAPINCLUDE="-I/usr/include/ldap"
+    LDAPLIBS="-lldap -llber"\
-  AC_SUBST(LDAPLIBS)
+    LDAPINCLUDE="-I/usr/include/ldap"
-  AC_SUBST(LDAPINCLUDE)
+    AC_SUBST(LDAPLIBS)
-  AC_CHECK_FUNCS(ldap_set_option)
+    AC_SUBST(LDAPINCLUDE)
-  EXTRAS="$EXTRAS check_ldap"
+    AC_CHECK_FUNCS(ldap_set_option)
-        AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
+    EXTRAS="$EXTRAS check_ldap"
-else
+        AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-  AC_MSG_WARN([Skipping LDAP plugin])
+  else
-  AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
+    AC_MSG_WARN([Skipping LDAP plugin])
-fi
+    AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
-LIBS="$_SAVEDLIBS"
+  fi
+  LIBS="$_SAVEDLIBS"
+])
 dnl Check for headers used by check_ide_smart
 AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
@@ -1367,13 +1378,22 @@ then
 fi
 AC_PATH_PROG(PATH_TO_FPING,fping)
+AC_PATH_PROG(PATH_TO_FPING6,fping6)
 AC_ARG_WITH(fping_command,
            ACX_HELP_STRING([--with-fping-command=PATH],
                            [Path to fping command]), PATH_TO_FPING=$withval)
+AC_ARG_WITH(fping6_command,
+            ACX_HELP_STRING([--with-fping6-command=PATH],
+                            [Path to fping6 command]), PATH_TO_FPING6=$withval)
 if test -n "$PATH_TO_FPING"
 then
        AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping])
        EXTRAS="$EXTRAS check_fping"
+        if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then
+                AC_DEFINE_UNQUOTED(PATH_TO_FPING6,"$PATH_TO_FPING6",[path to fping6])
+        fi
 else
        AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
 fi
diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
index c24b0cd2..6650a42b 100644
--- a/contrib/check_linux_raid.pl
+++ b/contrib/check_linux_raid.pl
@@ -28,8 +28,8 @@ use utils qw(%ERRORS);
 # die with an error if we're not on Linux
 if ($^O ne 'linux') {
-    print "This plugin only applicable on Linux.\n";
+        print "This plugin only applicable on Linux.\n";
-    exit $ERRORS{'UNKNOWN'};
+        exit $ERRORS{'UNKNOWN'};
 }
 sub max_state($$){
@@ -50,6 +50,7 @@ my $code = "UNKNOWN";
 my $msg = "";
 my %status;
 my %recovery;
+my %resyncing;
 my %finish;
 my %active;
 my %devices;
@@ -65,6 +66,10 @@ while(defined $nextdev){
                                $recovery{$device} = $1;
                                ($finish{$device}) = /finish=(.*?min)/;
                                $device=undef;
+                        } elsif (/resync =\s+(.*?)\s/) {
+                                $resyncing{$device} = $1;
+                                ($finish{$device}) = /finish=(.*?min)/;
+                                $device=undef;
                        } elsif (/^\s*$/) {
                                $device=undef;
                        }
@@ -95,8 +100,14 @@ foreach my $k (sort keys %devices){
                        $code = max_state($code, "CRITICAL");
                }
        } elsif ($status{$k} =~ /U+/) {
-                $msg .= sprintf " %s status=%s.", $devices{$k}, $status{$k};
+                if (defined $resyncing{$k}) {
-                $code = max_state($code, "OK");
+                        $msg .= sprintf " %s status=%s, resync=%s, finish=%s.",
+                                $devices{$k}, $status{$k}, $resyncing{$k}, $finish{$k};
+                        $code = max_state($code, "WARNING");
+                } else {
+                        $msg .= sprintf " %s status=%s.", $devices{$k}, $status{$k};
+                        $code = max_state($code, "OK");
+                }
        } else {
                if ($active{$k}) {
                        $msg .= sprintf " %s active with no status information.",
@@ -112,4 +123,3 @@ foreach my $k (sort keys %devices){
 print $code, $msg, "\n";
 exit ($ERRORS{$code});
diff --git a/contrib/check_nmap.py b/contrib/check_nmap.py
index 07f6d7fa..481a62bf 100644
--- a/contrib/check_nmap.py
+++ b/contrib/check_nmap.py
@@ -43,7 +43,7 @@ _version_ = '1.21'
 # 0.20   2000-07-10 jaclu Initial release
-import sys, os, string, whrandom
+import sys, os, string, random
 import tempfile
 from getopt import getopt
@@ -207,8 +207,7 @@ class CheckNmap:
        # _if_ two processes in deed get the same tmp-file
        # the only result is a normal error message to nagios
        #
-        r=whrandom.whrandom()
+        self.tmp_file=tempfile.mktemp('.%s') % random.randint(0,100000)
-        self.tmp_file=tempfile.mktemp('.%s')%r.randint(0,100000)
        if self.debug:
            print 'Tmpfile is: %s'%self.tmp_file
        #
@@ -388,7 +387,7 @@ Version: %s""" % _version_
 def doc_syntax():
    print """
-Usage: check_ports [-v|--debug] [-H|--host host] [-V|--version] [-h|--help]
+Usage: check_nmap.py [-v|--debug] [-H|--host host] [-V|--version] [-h|--help]
                   [-o|--optional port1,port2,port3 ...] [-r|--range range]
                   [-p|--port port1,port2,port3 ...] [-t|--timeout timeout]"""
    
diff --git a/gl/Makefile.am b/gl/Makefile.am
index e9e23026..edc7db15 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1182,6 +1182,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+              -e 's|@''GNULIB__EXIT''@|$(GNULIB__EXIT)|g' \
              -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
              -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
              -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
@@ -1206,13 +1207,12 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
              -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
              -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
+              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
              -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
-              -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
              -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
              -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
              -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
              -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
-              -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
              -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
              -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
              -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
@@ -1221,7 +1221,6 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
              -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
              -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
              -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
              -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
              -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
@@ -1232,9 +1231,12 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
              -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
              -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+              -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
              -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+              -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
              -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
              -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+              -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
              -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
              -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
              -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
diff --git a/gl/fsusage.c b/gl/fsusage.c
index 10db467d..17102aad 100644
--- a/gl/fsusage.c
+++ b/gl/fsusage.c
@@ -94,7 +94,7 @@
 int
 get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
 {
-#if defined STAT_STATVFS                /* POSIX */
+#if defined STAT_STATVFS                /* POSIX, except glibc/Linux */
  struct statvfs fsd;
@@ -156,7 +156,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
                    : (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1));
  fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.s_tinode);
-#elif defined STAT_STATFS3_OSF1
+#elif defined STAT_STATFS3_OSF1         /* OSF/1 */
  struct statfs fsd;
@@ -165,7 +165,9 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
-#elif defined STAT_STATFS2_BSIZE        /* 4.3BSD, SunOS 4, HP-UX, AIX */
+#elif defined STAT_STATFS2_BSIZE        /* glibc/Linux, 4.3BSD, SunOS 4, \
+                                           MacOS X < 10.4, FreeBSD < 5.0, \
+                                           NetBSD < 3.0, OpenBSD < 4.4 */
  struct statfs fsd;
@@ -189,7 +191,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
    }
 # endif /* STATFS_TRUNCATES_BLOCK_COUNTS */
-#elif defined STAT_STATFS2_FSIZE        /* 4.4BSD */
+#elif defined STAT_STATFS2_FSIZE        /* 4.4BSD and older NetBSD */
  struct statfs fsd;
@@ -198,7 +200,8 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
-#elif defined STAT_STATFS4              /* SVR3, Dynix, Irix, AIX */
+#elif defined STAT_STATFS4              /* SVR3, Dynix, old Irix, old AIX, \
+                                           Dolphin */
 # if !_AIX && !defined _SEQUENT_ && !defined DOLPHIN
 #  define f_bavail f_bfree
diff --git a/gl/m4/fcntl-o.m4 b/gl/m4/fcntl-o.m4
index d416a61c..1adacc8a 100644
--- a/gl/m4/fcntl-o.m4
+++ b/gl/m4/fcntl-o.m4
@@ -1,4 +1,4 @@
-# fcntl-o.m4 serial 1
+# fcntl-o.m4 serial 2
 dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,11 @@ dnl Written by Paul Eggert.
 AC_DEFUN([gl_FCNTL_O_FLAGS],
 [
  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+  dnl AC_GNU_SOURCE.
+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+    [AC_REQUIRE([AC_GNU_SOURCE])])
  AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
    [AC_RUN_IFELSE(
       [AC_LANG_PROGRAM(
diff --git a/gl/m4/fsusage.m4 b/gl/m4/fsusage.m4
index 216b9dd8..68684c27 100644
--- a/gl/m4/fsusage.m4
+++ b/gl/m4/fsusage.m4
@@ -1,4 +1,4 @@
-# serial 25
+# serial 26
 # Obtaining file system usage information.
 # Copyright (C) 1997-1998, 2000-2001, 2003-2010 Free Software Foundation, Inc.
@@ -44,7 +44,8 @@ ac_fsusage_space=no
 # systems.  That system is reported to work fine with STAT_STATFS4 which
 # is what it gets when this test fails.
 if test $ac_fsusage_space = no; then
-  # SVR4
+  # glibc/{Hurd,kFreeBSD}, MacOS X >= 10.4, FreeBSD >= 5.0, NetBSD >= 3.0,
+  # OpenBSD >= 4.4, AIX, HP-UX, IRIX, Solaris, Cygwin, Interix, BeOS.
  AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs],
                 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #if defined __GLIBC__ && defined __linux__
@@ -97,8 +98,13 @@ if test $ac_fsusage_space = no; then
 fi
 if test $ac_fsusage_space = no; then
-# AIX
+  # glibc/Linux, MacOS X < 10.4, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4.
-  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
+  # (glibc/{Hurd,kFreeBSD}, MacOS X >= 10.4, FreeBSD >= 5.0, NetBSD >= 3.0,
+  # OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.)
+  # (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and
+  # <sys/vfs.h>.)
+  # (On Solaris, statfs has 4 arguments.)
+  AC_MSG_CHECKING([for two-argument statfs with statfs.f_bsize dnl
 member (AIX, 4.3BSD)])
  AC_CACHE_VAL([fu_cv_sys_stat_statfs2_bsize],
  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -131,7 +137,8 @@ member (AIX, 4.3BSD)])
 fi
 if test $ac_fsusage_space = no; then
-# SVR3
+  # SVR3
+  # (Solaris already handled above.)
  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
  AC_CACHE_VAL([fu_cv_sys_stat_statfs4],
  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -150,13 +157,17 @@ if test $ac_fsusage_space = no; then
  if test $fu_cv_sys_stat_statfs4 = yes; then
    ac_fsusage_space=yes
    AC_DEFINE([STAT_STATFS4], [1],
-              [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
+      [  Define if statfs takes 4 args.  (SVR3, Dynix, old Irix, old AIX, Dolphin)])
  fi
 fi
 if test $ac_fsusage_space = no; then
-# 4.4BSD and NetBSD
+  # 4.4BSD and older NetBSD
-  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
+  # (OSF/1 already handled above.)
+  # (On AIX, you need to include <sys/statfs.h>, not only <sys/mount.h>.)
+  # (On Solaris, statfs has 4 arguments and 'struct statfs' is not declared in
+  # <sys/mount.h>.)
+  AC_MSG_CHECKING([for two-argument statfs with statfs.f_fsize dnl
 member (4.4BSD and NetBSD)])
  AC_CACHE_VAL([fu_cv_sys_stat_statfs2_fsize],
  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -223,6 +234,7 @@ fi
 if test $ac_fsusage_space = no; then
  # SVR2
+  # (AIX, HP-UX, OSF/1 already handled above.)
  AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/filsys.h>
        ]])],
    [AC_DEFINE([STAT_READ_FILSYS], [1],
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index fc3f3538..b5e6b438 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -254,7 +254,7 @@ AC_DEFUN([gl_INIT],
  # Code from module locale:
  gl_LOCALE_H
  # Code from module malloc:
-  AC_FUNC_MALLOC
+  gl_FUNC_MALLOC_GNU
  AC_DEFINE([GNULIB_MALLOC_GNU], 1, [Define to indicate the 'malloc' module.])
  # Code from module malloc-posix:
  gl_FUNC_MALLOC_POSIX
diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4
index 59b367df..9f3be3a2 100644
--- a/gl/m4/lib-link.m4
+++ b/gl/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 23 (gettext-0.18.2)
+# lib-link.m4 serial 24 (gettext-0.18.2)
 dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -165,7 +165,7 @@ AC_DEFUN([AC_LIB_FROMPACKAGE],
  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
  define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
  popdef([PACKUP])
  popdef([PACK])
 ])
diff --git a/gl/m4/malloc.m4 b/gl/m4/malloc.m4
index 910ac922..fe5befc2 100644
--- a/gl/m4/malloc.m4
+++ b/gl/m4/malloc.m4
@@ -1,25 +1,40 @@
-# malloc.m4 serial 9
+# malloc.m4 serial 10
 dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+# gl_FUNC_MALLOC_GNU
+# ------------------
+# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if
+# it is not.
+AC_DEFUN([gl_FUNC_MALLOC_GNU],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  dnl _AC_FUNC_MALLOC_IF is defined in Autoconf.
+  _AC_FUNC_MALLOC_IF(
+    [AC_DEFINE([HAVE_MALLOC], [1],
+               [Define to 1 if your system has a GNU libc compatible 'malloc'
+                function, and to 0 otherwise.])],
+    [AC_DEFINE([HAVE_MALLOC], [0])
+     gl_REPLACE_MALLOC
+    ])
+])
 # gl_FUNC_MALLOC_POSIX
 # --------------------
 # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
 # fails), and replace malloc if it is not.
 AC_DEFUN([gl_FUNC_MALLOC_POSIX],
 [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
  if test $gl_cv_func_malloc_posix = yes; then
-    HAVE_MALLOC_POSIX=1
    AC_DEFINE([HAVE_MALLOC_POSIX], [1],
      [Define if the 'malloc' function is POSIX compliant.])
  else
-    AC_LIBOBJ([malloc])
+    gl_REPLACE_MALLOC
-    HAVE_MALLOC_POSIX=0
  fi
-  AC_SUBST([HAVE_MALLOC_POSIX])
 ])
 # Test whether malloc, realloc, calloc are POSIX compliant,
@@ -39,3 +54,9 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX],
        ], [gl_cv_func_malloc_posix=yes], [gl_cv_func_malloc_posix=no])
    ])
 ])
+AC_DEFUN([gl_REPLACE_MALLOC],
+[
+  AC_LIBOBJ([malloc])
+  REPLACE_MALLOC=1
+])
diff --git a/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
index dd84796d..fc150197 100644
--- a/gl/m4/stdlib_h.m4
+++ b/gl/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 28
+# stdlib_h.m4 serial 30
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -33,7 +33,7 @@ AC_DEFUN([gl_STDLIB_H],
 #if HAVE_RANDOM_H
 # include <random.h>
 #endif
-    ]], [atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp
+    ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt mkdtemp
    mkostemp mkostemps mkstemp mkstemps ptsname random_r initstat_r srandom_r
    setstate_r realpath rpmatch setenv strtod strtoll strtoull unlockpt
    unsetenv])
@@ -50,6 +50,7 @@ AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
+  GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
  GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
  GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
  GNULIB_CANONICALIZE_FILE_NAME=0;  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME])
@@ -75,13 +76,12 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
  GNULIB_UNLOCKPT=0;      AC_SUBST([GNULIB_UNLOCKPT])
  GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
  HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
-  HAVE_CALLOC_POSIX=1;       AC_SUBST([HAVE_CALLOC_POSIX])
  HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
  HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
  HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
  HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
-  HAVE_MALLOC_POSIX=1;       AC_SUBST([HAVE_MALLOC_POSIX])
  HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
  HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
@@ -89,7 +89,6 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
  HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
  HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
-  HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
  HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
  HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
@@ -100,9 +99,12 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
  HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
  HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
  HAVE_UNSETENV=1;           AC_SUBST([HAVE_UNSETENV])
+  REPLACE_CALLOC=0;          AC_SUBST([REPLACE_CALLOC])
  REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
+  REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
  REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
  REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
+  REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
  REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
  REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
  REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index d74c2518..d4ac4690 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -74,6 +74,12 @@ struct random_data
 # include <unistd.h>
 #endif
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#  define __attribute__(Spec)   /* empty */
+# endif
+#endif
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -95,6 +101,23 @@ struct random_data
 #endif
+#if @GNULIB__EXIT@
+/* Terminate the current process with the given return code, without running
+   the 'atexit' handlers.  */
+# if !@HAVE__EXIT@
+_GL_FUNCDECL_SYS (_Exit, void, (int status) __attribute__ ((__noreturn__)));
+# endif
+_GL_CXXALIAS_SYS (_Exit, void, (int status));
+_GL_CXXALIASWARN (_Exit);
+#elif defined GNULIB_POSIXCHECK
+# undef _Exit
+# if HAVE_RAW_DECL__EXIT
+_GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
+                 "use gnulib module _Exit for portability");
+# endif
+#endif
 #if @GNULIB_ATOLL@
 /* Parse a signed decimal integer.
   Returns the value of the integer.  Errors are not detected.  */
@@ -112,7 +135,7 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - "
 #endif
 #if @GNULIB_CALLOC_POSIX@
-# if !@HAVE_CALLOC_POSIX@
+# if @REPLACE_CALLOC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef calloc
 #   define calloc rpl_calloc
@@ -218,7 +241,7 @@ _GL_WARN_ON_USE (ptsname, "grantpt is not portable - "
 #endif
 #if @GNULIB_MALLOC_POSIX@
-# if !@HAVE_MALLOC_POSIX@
+# if @REPLACE_MALLOC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef malloc
 #   define malloc rpl_malloc
@@ -477,7 +500,7 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
 #if @GNULIB_REALLOC_POSIX@
-# if !@HAVE_REALLOC_POSIX@
+# if @REPLACE_REALLOC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef realloc
 #   define realloc rpl_realloc
diff --git a/gl/str-two-way.h b/gl/str-two-way.h
index c08f60ef..4d555f92 100644
--- a/gl/str-two-way.h
+++ b/gl/str-two-way.h
@@ -95,26 +95,37 @@
   A critical factorization has the property that the local period
   equals the global period.  All strings have at least one critical
   factorization with the left half smaller than the global period.
+   And while some strings have more than one critical factorization,
+   it is provable that with an ordered alphabet, at least one of the
+   critical factorizations corresponds to a maximal suffix.
   Given an ordered alphabet, a critical factorization can be computed
   in linear time, with 2 * NEEDLE_LEN comparisons, by computing the
-   larger of two ordered maximal suffixes.  The ordered maximal
+   shorter of two ordered maximal suffixes.  The ordered maximal
-   suffixes are determined by lexicographic comparison of
+   suffixes are determined by lexicographic comparison while tracking
   periodicity.  */
 static size_t
 critical_factorization (const unsigned char *needle, size_t needle_len,
                        size_t *period)
 {
-  /* Index of last byte of left half, or SIZE_MAX.  */
+  /* Index of last byte of left half.  */
  size_t max_suffix, max_suffix_rev;
  size_t j; /* Index into NEEDLE for current candidate suffix.  */
  size_t k; /* Offset into current period.  */
  size_t p; /* Intermediate period.  */
  unsigned char a, b; /* Current comparison bytes.  */
+  /* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered
+     out 0-length needles.  */
+  if (needle_len < 3)
+    {
+      *period = 1;
+      return needle_len - 1;
+    }
  /* Invariants:
-     0 <= j < NEEDLE_LEN - 1
+     1 <= j < NEEDLE_LEN - 1
-     -1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed)
+     0 <= max_suffix{,_rev} < j
     min(max_suffix, max_suffix_rev) < global period of NEEDLE
     1 <= p <= global period of NEEDLE
     p == global period of the substring NEEDLE[max_suffix{,_rev}+1...j]
@@ -122,9 +133,8 @@ critical_factorization (const unsigned char *needle, size_t needle_len,
  */
  /* Perform lexicographic search.  */
-  max_suffix = SIZE_MAX;
+  max_suffix = 0;
-  j = 0;
+  j = k = p = 1;
-  k = p = 1;
  while (j + k < needle_len)
    {
      a = CANON_ELEMENT (needle[j + k]);
@@ -157,9 +167,8 @@ critical_factorization (const unsigned char *needle, size_t needle_len,
  *period = p;
  /* Perform reverse lexicographic search.  */
-  max_suffix_rev = SIZE_MAX;
+  max_suffix_rev = 0;
-  j = 0;
+  j = k = p = 1;
-  k = p = 1;
  while (j + k < needle_len)
    {
      a = CANON_ELEMENT (needle[j + k]);
@@ -190,8 +199,20 @@ critical_factorization (const unsigned char *needle, size_t needle_len,
        }
    }
-  /* Choose the longer suffix.  Return the first byte of the right
+  /* Choose the shorter suffix.  Return the index of the first byte of
-     half, rather than the last byte of the left half.  */
+     the right half, rather than the last byte of the left half.
+     For some examples, 'banana' has two critical factorizations, both
+     exposed by the two lexicographic extreme suffixes of 'anana' and
+     'nana', where both suffixes have a period of 2.  On the other
+     hand, with 'aab' and 'bba', both strings have a single critical
+     factorization of the last byte, with the suffix having a period
+     of 1.  While the maximal lexicographic suffix of 'aab' is 'b',
+     the maximal lexicographic suffix of 'bba' is 'ba', which is not a
+     critical factorization.  Conversely, the maximal reverse
+     lexicographic suffix of 'a' works for 'bba', but not 'ab' for
+     'aab'.  The shorter suffix of the two will always be a critical
+     factorization.  */
  if (max_suffix_rev + 1 < max_suffix + 1)
    return max_suffix + 1;
  *period = p;
@@ -226,9 +247,9 @@ two_way_short_needle (const unsigned char *haystack, size_t haystack_len,
     first.  */
  if (CMP_FUNC (needle, needle + period, suffix) == 0)
    {
-      /* Entire needle is periodic; a mismatch can only advance by the
+      /* Entire needle is periodic; a mismatch in the left half can
-         period, so use memory to avoid rescanning known occurrences
+         only advance by the period, so use memory to avoid rescanning
-         of the period.  */
+         known occurrences of the period in the right half.  */
      size_t memory = 0;
      j = 0;
      while (AVAILABLE (haystack, haystack_len, j, needle_len))
@@ -330,9 +351,9 @@ two_way_long_needle (const unsigned char *haystack, size_t haystack_len,
     first.  */
  if (CMP_FUNC (needle, needle + period, suffix) == 0)
    {
-      /* Entire needle is periodic; a mismatch can only advance by the
+      /* Entire needle is periodic; a mismatch in the left half can
-         period, so use memory to avoid rescanning known occurrences
+         only advance by the period, so use memory to avoid rescanning
-         of the period.  */
+         known occurrences of the period in the right half.  */
      size_t memory = 0;
      size_t shift;
      j = 0;
diff --git a/gl/string.in.h b/gl/string.in.h
index 13c0f095..f64fce30 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -41,10 +41,12 @@
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
 #  define __attribute__(Spec) /* empty */
 # endif
+#endif
 /* The attribute __pure__ was added in gcc 2.96.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define __pure__ /* empty */
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# endif
+#else
+# define _GL_ATTRIBUTE_PURE /* empty */
 #endif
@@ -62,13 +64,13 @@
 #   define memchr rpl_memchr
 #  endif
 _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  __attribute__ ((__pure__))
+                                  _GL_ATTRIBUTE_PURE
                                  _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
 # else
 #  if ! @HAVE_MEMCHR@
 _GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n)
-                                  __attribute__ ((__pure__))
+                                  _GL_ATTRIBUTE_PURE
                                  _GL_ARG_NONNULL ((1)));
 #  endif
  /* On some systems, this function is defined as an overloaded function:
@@ -102,7 +104,8 @@ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
 _GL_FUNCDECL_RPL (memmem, void *,
                  (void const *__haystack, size_t __haystack_len,
                   void const *__needle, size_t __needle_len)
-                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ARG_NONNULL ((1, 3)));
 _GL_CXXALIAS_RPL (memmem, void *,
                  (void const *__haystack, size_t __haystack_len,
                   void const *__needle, size_t __needle_len));
@@ -111,7 +114,8 @@ _GL_CXXALIAS_RPL (memmem, void *,
 _GL_FUNCDECL_SYS (memmem, void *,
                  (void const *__haystack, size_t __haystack_len,
                   void const *__needle, size_t __needle_len)
-                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)));
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ARG_NONNULL ((1, 3)));
 #  endif
 _GL_CXXALIAS_SYS (memmem, void *,
                  (void const *__haystack, size_t __haystack_len,
@@ -152,7 +156,7 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - "
 #if @GNULIB_MEMRCHR@
 # if ! @HAVE_DECL_MEMRCHR@
 _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
-                                   __attribute__ ((__pure__))
+                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 # endif
  /* On some systems, this function is defined as an overloaded function:
@@ -182,7 +186,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - "
 #if @GNULIB_RAWMEMCHR@
 # if ! @HAVE_RAWMEMCHR@
 _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
-                                     __attribute__ ((__pure__))
+                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
 # endif
  /* On some systems, this function is defined as an overloaded function:
@@ -272,7 +276,7 @@ _GL_WARN_ON_USE (strchr, "strchr cannot work correctly on character strings "
 #if @GNULIB_STRCHRNUL@
 # if ! @HAVE_STRCHRNUL@
 _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
-                                     __attribute__ ((__pure__))
+                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
 # endif
  /* On some systems, this function is defined as an overloaded function:
@@ -378,13 +382,13 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - "
 #   define strnlen rpl_strnlen
 #  endif
 _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   __attribute__ ((__pure__))
+                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
 _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
-                                   __attribute__ ((__pure__))
+                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
@@ -414,7 +418,7 @@ _GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings "
 #if @GNULIB_STRPBRK@
 # if ! @HAVE_STRPBRK@
 _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
-                                   __attribute__ ((__pure__))
+                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1, 2)));
 # endif
  /* On some systems, this function is defined as an overloaded function:
@@ -514,7 +518,7 @@ _GL_WARN_ON_USE (strsep, "strsep is unportable - "
 #   define strstr rpl_strstr
 #  endif
 _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle)
-                                  __attribute__ ((__pure__))
+                                  _GL_ATTRIBUTE_PURE
                                  _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
 # else
@@ -556,14 +560,16 @@ _GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot "
 #  endif
 _GL_FUNCDECL_RPL (strcasestr, char *,
                  (const char *haystack, const char *needle)
-                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strcasestr, char *,
                  (const char *haystack, const char *needle));
 # else
 #  if ! @HAVE_STRCASESTR@
 _GL_FUNCDECL_SYS (strcasestr, char *,
                  (const char *haystack, const char *needle)
-                  __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ARG_NONNULL ((1, 2)));
 #  endif
  /* On some systems, this function is defined as an overloaded function:
       extern "C++" { const char * strcasestr (const char *, const char *); }
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index d4a08005..79e1110a 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -38,7 +38,7 @@ main (int argc, char **argv)
        state_data *temp_state_data;
        time_t  current_time;
-        plan_tests(141);
+        plan_tests(150);
        ok( this_nagios_plugin==NULL, "nagios_plugin not initialised");
@@ -132,6 +132,18 @@ main (int argc, char **argv)
        ok( check_range(0, range)     == TRUE, "0 - alert");
        free(range);
+        range = parse_range_string("@1:1");
+        ok( range != NULL, "'@1:1' is a valid range");
+        ok( range->start == 1, "Start correct");
+        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->end == 1, "End correct");
+        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
+        ok( check_range(0.5, range) == FALSE, "0.5 - no alert");
+        ok( check_range(1, range) == TRUE, "1 - alert");
+        ok( check_range(5.2, range) == FALSE, "5.2 - no alert");
+        free(range);
        range = parse_range_string("1:1");
        ok( range != NULL, "'1:1' is a valid range");
        ok( range->start == 1, "Start correct");
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 664795eb..2a8ab21d 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -18,6 +18,7 @@ print_usage() {
  echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
  echo "  $PROGNAME --db <ORACLE_SID>"
  echo "  $PROGNAME --login <ORACLE_SID>"
+  echo "  $PROGNAME --connect <ORACLE_SID>"
  echo "  $PROGNAME --cache <ORACLE_SID> <USER> <PASS> <CRITICAL> <WARNING>"
  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
  echo "  $PROGNAME --oranames <Hostname>"
@@ -39,6 +40,8 @@ print_help() {
  echo "   filesystem for sgadefORACLE_SID.dbf"
  echo "--login SID"
  echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+  echo "--connect SID"
+  echo "   Attempt a login and alert if an ORA- error is returned"
  echo "--cache"
  echo "   Check local database for library and buffer cache hit ratios"
  echo "       --->  Requires Oracle user/password and SID specified."
@@ -187,6 +190,18 @@ case "$cmd" in
        exit $STATE_CRITICAL
    fi
    ;;
+--connect)
+    connectchk=`sqlplus $2 < /dev/null`
+    connectchk2=` echo  $connectchk | grep -c ORA-`
+    if [ ${connectchk2} -eq 0 ] ; then
+        echo "OK - login successful"
+        exit $STATE_OK
+    else
+        connectchk3=` echo "$connectchk" | grep "ORA-" | head -1`
+        echo "CRITICAL - $connectchk3"
+        exit $STATE_CRITICAL
+    fi
+    ;;
 --cache)
    if [ ${5} -gt ${6} ] ; then
        echo "UNKNOWN - Warning level is less then Crit"
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index ffaa9748..874e1049 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -44,25 +44,28 @@ case "$1" in
        *)
                sensordata=`sensors 2>&1`
                status=$?
-                if test "$1" = "-v" -o "$1" = "--verbose"; then
-                        echo ${sensordata}
-                fi
                if test ${status} -eq 127; then
-                        echo "SENSORS UNKNOWN - command not found (did you install lmsensors?)"
+                        text="SENSORS UNKNOWN - command not found (did you install lmsensors?)"
-                        exit $STATE_UNKNOWN
+                        exit=$STATE_UNKNOWN
                elif test ${status} -ne 0; then
-                        echo "WARNING - sensors returned state $status"
+                        text="WARNING - sensors returned state $status"
-                        exit $STATE_WARNING
+                        exit=$STATE_WARNING
-                fi
+                elif echo ${sensordata} | egrep ALARM > /dev/null; then
-                if echo ${sensordata} | egrep ALARM > /dev/null; then
+                        text="SENSOR CRITICAL - Sensor alarm detected!"
-                        echo SENSOR CRITICAL - Sensor alarm detected!
+                        exit=$STATE_CRITICAL
-                        exit $STATE_CRITICAL
                elif echo ${sensordata} | egrep FAULT > /dev/null \
                    && test "$1" != "-i" -a "$1" != "--ignore-fault"; then
-                        echo SENSOR UNKNOWN - Sensor reported fault
+                        text="SENSOR UNKNOWN - Sensor reported fault"
-                        exit $STATE_UNKNOWN
+                        exit=$STATE_UNKNOWN
+                else
+                        text="SENSORS OK"
+                        exit=$STATE_OK
                fi
-                echo sensor ok
-                exit $STATE_OK
+                echo "$text"
+                if test "$1" = "-v" -o "$1" = "--verbose"; then
+                        echo ${sensordata}
+                fi
+                exit $exit
                ;;
 esac
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 0eb0255b..64969dbf 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -39,15 +39,19 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
        check_nagios check_by_ssh check_dns check_nt check_ide_smart    \
        check_procs check_mysql_query check_apt check_dbi
-EXTRA_DIST = t tests utils.c netutils.c sslutils.c popen.c utils.h netutils.h \
+EXTRA_DIST = t tests
-        popen.h common.h runcmd.c runcmd.h
 PLUGINHDRS = common.h
-BASEOBJS = utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
+noinst_LIBRARIES = libnpcommon.a
-NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
-SSLOBJS = sslutils.o
+libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c  \
+        popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
+BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a
+NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
+SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS)
 TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
@@ -62,19 +66,19 @@ test-debug:
 ##############################################################################
 # the actual targets
-check_apt_LDADD = $(BASEOBJS) runcmd.o
+check_apt_LDADD = $(BASEOBJS)
 check_cluster_LDADD = $(BASEOBJS)
 check_dbi_LDADD = $(NETLIBS) $(DBILIBS)
-check_dig_LDADD = $(NETLIBS) runcmd.o 
+check_dig_LDADD = $(NETLIBS)
-check_disk_LDADD = $(BASEOBJS) popen.o
+check_disk_LDADD = $(BASEOBJS)
-check_dns_LDADD = $(NETLIBS) runcmd.o
+check_dns_LDADD = $(NETLIBS)
 check_dummy_LDADD = $(BASEOBJS)
-check_fping_LDADD = $(NETLIBS) popen.o
+check_fping_LDADD = $(NETLIBS)
-check_game_LDADD = $(BASEOBJS) runcmd.o
+check_game_LDADD = $(BASEOBJS)
-check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+check_http_LDADD = $(SSLOBJS)
-check_hpjd_LDADD = $(NETLIBS) popen.o
+check_hpjd_LDADD = $(NETLIBS)
 check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
-check_load_LDADD = $(BASEOBJS) popen.o
+check_load_LDADD = $(BASEOBJS)
 check_mrtg_LDADD = $(BASEOBJS)
 check_mrtgtraf_LDADD = $(BASEOBJS)
 check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
@@ -83,22 +87,22 @@ check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
 check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
 check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
 check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
-check_nagios_LDADD = $(BASEOBJS) runcmd.o
+check_nagios_LDADD = $(BASEOBJS)
 check_nt_LDADD = $(NETLIBS) 
 check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
 check_nwstat_LDADD = $(NETLIBS)
 check_overcr_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
-check_ping_LDADD = $(NETLIBS) popen.o
+check_ping_LDADD = $(NETLIBS)
 check_procs_LDADD = $(BASEOBJS)
 check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
 check_real_LDADD = $(NETLIBS)
 check_snmp_LDADD = $(BASEOBJS)
-check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+check_smtp_LDADD = $(SSLOBJS)
 check_ssh_LDADD = $(NETLIBS)
-check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
+check_swap_LDADD = $(MATHLIBS) $(BASEOBJS)
-check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+check_tcp_LDADD = $(SSLOBJS)
 check_time_LDADD = $(NETLIBS)
 check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ups_LDADD = $(NETLIBS)
@@ -106,62 +110,11 @@ check_users_LDADD = $(BASEOBJS)
 check_by_ssh_LDADD = $(NETLIBS)
 check_ide_smart_LDADD = $(BASEOBJS)
 negate_LDADD = $(BASEOBJS)
-urlize_LDADD = $(BASEOBJS) popen.o
+urlize_LDADD = $(BASEOBJS)
-check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS)
-check_cluster_DEPENDENCIES = check_cluster.c $(BASEOBJS) $(DEPLIBS)
-check_dbi_DEPENDENCIES = check_dbi.c $(NETOBJS) $(DEPLIBS)
-check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS)
-check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS) 
-check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS)
-check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS)
-check_fping_DEPENDENCIES = check_fping.c $(NETOBJS) popen.o $(DEPLIBS)
-check_game_DEPENDENCIES = check_game.c  $(DEPLIBS) runcmd.o
-check_http_DEPENDENCIES = check_http.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
-check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) popen.o $(DEPLIBS)
-check_ide_smart_DEPENDENCIES = check_ide_smart.c $(BASEOBJS) $(DEPLIBS)
-check_ldap_DEPENDENCIES = check_ldap.c $(NETOBJS) $(DEPLIBS)
-check_load_DEPENDENCIES = check_load.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_mrtg_DEPENDENCIES = check_mrtg.c $(DEPLIBS)
-check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c $(DEPLIBS)
-check_mysql_DEPENDENCIES = check_mysql.c $(NETOBJS) $(DEPLIBS)
-check_mysql_query_DEPENDENCIES = check_mysql_query.c $(NETOBJS) $(DEPLIBS)
-check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) runcmd.o $(DEPLIBS)
-check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
-check_ntp_DEPENDENCIES = check_ntp.c $(NETOBJS) $(DEPLIBS)
-check_ntp_peer_DEPENDENCIES = check_ntp_peer.c $(NETOBJS) $(DEPLIBS)
-check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
-check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
-check_pgsql_DEPENDENCIES = check_pgsql.c $(NETOBJS)  $(DEPLIBS)
-check_ping_DEPENDENCIES = check_ping.c $(NETOBJS) popen.o $(DEPLIBS)
-check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_radius_DEPENDENCIES = check_radius.c $(NETOBJS)  $(DEPLIBS)
-check_real_DEPENDENCIES = check_real.c $(NETOBJS) $(DEPLIBS)
-check_snmp_DEPENDENCIES = check_snmp.c $(BASEOBJS) $(DEPLIBS)
-check_smtp_DEPENDENCIES = check_smtp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
-check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
-check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
-check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
-check_ntp_time_DEPENDENCIES = check_ntp_time.c $(NETOBJS) $(DEPLIBS)
-check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
-check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) $(DEPLIBS)
-negate_DEPENDENCIES = negate.c $(BASEOBJS) $(DEPLIBS)
-urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
 ##############################################################################
 # secondary dependencies
-popen.o: popen.c popen.h $(PLUGINHDRS)
-runcmd.o: runcmd.c runcmd.h $(PLUGINHDRS)
-utils.o: utils.c utils.h $(PLUGINHDRS)
-netutils.o: netutils.c netutils.h $(PLUGINHDRS)
-sslutils.o: sslutils.c netutils.h $(PLUGINHDRS)
 all-local: $(check_tcp_programs)
 $(check_tcp_programs): check_tcp
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 7efa596b..daeb7578 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -41,6 +41,8 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 /* some constants */
 typedef enum { UPGRADE, DIST_UPGRADE, NO_UPGRADE } upgrade_type;
+/* Character for hidden input file option (for testing). */
+#define INPUT_FILE_OPT CHAR_MAX+1
 /* the default opts can be overridden via the cmdline */
 #define UPGRADE_DEFAULT_OPTS "-o 'Debug::NoLocking=true' -s -qq"
 #define UPDATE_DEFAULT_OPTS "-q"
@@ -49,8 +51,10 @@ typedef enum { UPGRADE, DIST_UPGRADE, NO_UPGRADE } upgrade_type;
 #ifndef PATH_TO_APTGET
 # define PATH_TO_APTGET "/usr/bin/apt-get"
 #endif /* PATH_TO_APTGET */
+/* String found at the beginning of the apt output lines we're interested in */
+#define PKGINST_PREFIX "Inst "
 /* the RE that catches security updates */
-#define SECURITY_RE "^[^\\(]*\\([^ ]* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)"
+#define SECURITY_RE "^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)"
 /* some standard functions */
 int process_arguments(int, char **);
@@ -75,6 +79,7 @@ static char *update_opts = NULL; /* options to override defaults for update */
 static char *do_include = NULL;  /* regexp to only include certain packages */
 static char *do_exclude = NULL;  /* regexp to only exclude certain packages */
 static char *do_critical = NULL;  /* regexp specifying critical packages */
+static char *input_filename = NULL; /* input filename for testing */
 /* other global variables */
 static int stderr_warning = 0;   /* if a cmd issued output on stderr */
@@ -107,11 +112,11 @@ int main (int argc, char **argv) {
                result = max_state(result, STATE_CRITICAL);
        } else if(packages_available > 0){
                result = max_state(result, STATE_WARNING);
-        } else {
+        } else if(result > STATE_UNKNOWN){
-                result = max_state(result, STATE_OK);
+                result = STATE_UNKNOWN;
        }
-        printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s\n"),
+        printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s|available_upgrades=%d;;;0 critical_updates=%d;;;0\n"),
               state_text(result),
               packages_available,
               (upgrade==DIST_UPGRADE)?"dist-upgrade":"upgrade",
@@ -119,7 +124,9 @@ int main (int argc, char **argv) {
               (stderr_warning)?" warnings detected":"",
               (stderr_warning && exec_warning)?",":"",
               (exec_warning)?" errors detected":"",
-               (stderr_warning||exec_warning)?". run with -v for information.":""
+               (stderr_warning||exec_warning)?". run with -v for information.":"",
+                packages_available,
+                   sec_count
               );
        return result;
@@ -141,6 +148,7 @@ int process_arguments (int argc, char **argv) {
                {"include", required_argument, 0, 'i'},
                {"exclude", required_argument, 0, 'e'},
                {"critical", required_argument, 0, 'c'},
+                {"input-file", required_argument, 0, INPUT_FILE_OPT},
                {0, 0, 0, 0}
        };
@@ -195,6 +203,9 @@ int process_arguments (int argc, char **argv) {
                case 'c':
                        do_critical=add_to_regexp(do_critical, optarg);
                        break;
+                case INPUT_FILE_OPT:
+                        input_filename = optarg;
+                        break;
                default:
                        /* print short usage statement if args not parsable */
                        usage5();
@@ -211,22 +222,18 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
        struct output chld_out, chld_err;
        regex_t ireg, ereg, sreg;
        char *cmdline=NULL, rerrbuf[64];
-        const char *include_ptr=NULL, *crit_ptr=NULL;
        if(upgrade==NO_UPGRADE) return STATE_OK;
        /* compile the regexps */
-        if(do_include!=NULL) include_ptr=do_include;
+        if (do_include != NULL) {
-        else include_ptr="^Inst";
+                regres=regcomp(&ireg, do_include, REG_EXTENDED);
-        if(do_critical!=NULL) crit_ptr=do_critical;
+                if (regres!=0) {
-        else crit_ptr=SECURITY_RE;
+                        regerror(regres, &ireg, rerrbuf, 64);
+                        die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
-        regres=regcomp(&ireg, include_ptr, REG_EXTENDED);
+                }
-        if(regres!=0) {
-                regerror(regres, &ireg, rerrbuf, 64);
-                die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
        }
+   
        if(do_exclude!=NULL){
                regres=regcomp(&ereg, do_exclude, REG_EXTENDED);
                if(regres!=0) {
@@ -235,6 +242,8 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
                            progname, rerrbuf);
                }
        }
+   
+        const char *crit_ptr = (do_critical != NULL) ? do_critical : SECURITY_RE;
        regres=regcomp(&sreg, crit_ptr, REG_EXTENDED);
        if(regres!=0) {
                regerror(regres, &ereg, rerrbuf, 64);
@@ -243,8 +252,14 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
        }
        cmdline=construct_cmdline(upgrade, upgrade_opts);
-        /* run the upgrade */
+        if (input_filename != NULL) {
-        result = np_runcmd(cmdline, &chld_out, &chld_err, 0);
+                /* read input from a file for testing */
+                result = cmd_file_read(input_filename, &chld_out, 0);
+        } else {
+                /* run the upgrade */
+                result = np_runcmd(cmdline, &chld_out, &chld_err, 0);
+        }
+   
        /* apt-get upgrade only changes exit status if there is an
         * internal error when run in dry-run mode.  therefore we will
         * treat such an error as UNKNOWN */
@@ -269,7 +284,8 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
                        printf("%s\n", chld_out.line[i]);
                }
                /* if it is a package we care about */
-                if(regexec(&ireg, chld_out.line[i], 0, NULL, 0)==0){
+                if (strncmp(PKGINST_PREFIX, chld_out.line[i], strlen(PKGINST_PREFIX)) == 0 &&
+                    (do_include == NULL || regexec(&ireg, chld_out.line[i], 0, NULL, 0) == 0)) {
                        /* if we're not excluding, or it's not in the
                         * list of stuff to exclude */
                        if(do_exclude==NULL ||
@@ -289,7 +305,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
        *secpkgcount=spc;
        /* If we get anything on stderr, at least set warning */
-        if(chld_err.buflen){
+        if (input_filename == NULL && chld_err.buflen) {
                stderr_warning=1;
                result = max_state(result, STATE_WARNING);
                if(verbose){
@@ -298,7 +314,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
                        }
                }
        }
-        regfree(&ireg);
+        if (do_include != NULL) regfree(&ireg);
        regfree(&sreg);
        if(do_exclude!=NULL) regfree(&ereg);
        free(cmdline);
@@ -348,15 +364,15 @@ char* add_to_regexp(char *expr, const char *next){
        char *re=NULL;
        if(expr==NULL){
-                re=malloc(sizeof(char)*(strlen("^Inst () ")+strlen(next)+1));
+                re=malloc(sizeof(char)*(strlen("()")+strlen(next)+1));
                if(!re) die(STATE_UNKNOWN, "malloc failed!\n");
-                sprintf(re, "^Inst (%s) ", next);
+                sprintf(re, "(%s)", next);
        } else {
                /* resize it, adding an extra char for the new '|' separator */
-                re=realloc(expr, sizeof(char)*strlen(expr)+1+strlen(next)+1);
+                re=realloc(expr, sizeof(char)*(strlen(expr)+1+strlen(next)+1));
                if(!re) die(STATE_UNKNOWN, "realloc failed!\n");
                /* append it starting at ')' in the old re */
-                sprintf((char*)(re+strlen(re)-2), "|%s) ", next);
+                sprintf((char*)(re+strlen(re)-1), "|%s)", next);
        }
        return re;
@@ -430,7 +446,7 @@ print_help (void)
  printf ("    %s\n", _("Do not run the upgrade.  Probably not useful (without -u at least)."));
  printf (" %s\n", "-i, --include=REGEXP");
  printf ("    %s\n", _("Include only packages matching REGEXP.  Can be specified multiple times"));
-  printf ("    %s\n", _("the values will be combined together.  Any patches matching this list"));
+  printf ("    %s\n", _("the values will be combined together.  Any packages matching this list"));
  printf ("    %s\n", _("cause the plugin to return WARNING status.  Others will be ignored."));
  printf ("    %s\n", _("Default is to include all packages."));
  printf (" %s\n", "-e, --exclude=REGEXP");
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 893e0a14..c113d87b 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -54,6 +54,7 @@ char *record_type = "A";
 char *expected_address = NULL;
 char *dns_server = NULL;
 char *dig_args = "";
+char *query_transport = "";
 int verbose = FALSE;
 int server_port = DEFAULT_PORT;
 double warning_interval = UNDEFINED;
@@ -77,7 +78,7 @@ main (int argc, char **argv)
  textdomain (PACKAGE);
  /* Set signal handling and alarm */
-  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
+  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
    usage_va(_("Cannot catch SIGALRM"));
  /* Parse extra opts if any */
@@ -87,8 +88,8 @@ main (int argc, char **argv)
    usage_va(_("Could not parse arguments"));
  /* get the command to run */
-  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s",
+  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s",
-            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args);
+            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport);
  alarm (timeout_interval);
  gettimeofday (&tv, NULL);
@@ -199,6 +200,8 @@ process_arguments (int argc, char **argv)
    {"record_type", required_argument, 0, 'T'},
    {"expected_address", required_argument, 0, 'a'},
    {"port", required_argument, 0, 'p'},
+    {"use-ipv4", no_argument, 0, '4'},
+    {"use-ipv6", no_argument, 0, '6'},
    {0, 0, 0, 0}
  };
@@ -206,7 +209,7 @@ process_arguments (int argc, char **argv)
    return ERROR;
  while (1) {
-    c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:p:a:A:", longopts, &option);
+    c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
    if (c == -1 || c == EOF)
      break;
@@ -269,6 +272,12 @@ process_arguments (int argc, char **argv)
    case 'a':
      expected_address = optarg;
      break;
+    case '4':
+      query_transport = "-4";
+      break;
+    case '6':
+      query_transport = "-6";
+      break;
    default:                  /* usage5 */
      usage5();
    }
@@ -325,6 +334,10 @@ print_help (void)
  printf (UT_HOST_PORT, 'p', myport);
+  printf (" %s\n","-4, --use-ipv4");
+  printf ("    %s\n",_("Force dig to only use IPv4 query transport"));
+  printf (" %s\n","-6, --use-ipv6");
+  printf ("    %s\n",_("Force dig to only use IPv6 query transport"));
  printf (" %s\n","-l, --query_address=STRING");
  printf ("    %s\n",_("Machine name to lookup"));
  printf (" %s\n","-T, --record_type=STRING");
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 6ba7bdf3..4ea03935 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -91,9 +91,12 @@ static int stat_remote_fs = 0;
 /* Linked list of filesystem types to omit.
   If the list is empty, don't exclude any types.  */
 static struct name_list *fs_exclude_list;
+/* Linked list of filesystem types to check.
+   If the list is empty, include all types.  */
+static struct name_list *fs_include_list;
 static struct name_list *dp_exclude_list;
 static struct parameter_list *path_select_list = NULL;
@@ -255,6 +258,9 @@ main (int argc, char **argv)
               (np_find_name (dp_exclude_list, me->me_devname) ||
                np_find_name (dp_exclude_list, me->me_mountdir))) {
        continue;
+      /* Skip not included fstypes */
+      } else if (fs_include_list && !np_find_name (fs_include_list, me->me_type)) {
+        continue;
      }
      stat_path(path);
@@ -419,6 +425,7 @@ process_arguments (int argc, char **argv)
    {"partition", required_argument, 0, 'p'},
    {"exclude_device", required_argument, 0, 'x'},
    {"exclude-type", required_argument, 0, 'X'},
+    {"include-type", required_argument, 0, 'N'},
    {"group", required_argument, 0, 'g'},
    {"eregi-path", required_argument, 0, 'R'},
    {"eregi-partition", required_argument, 0, 'R'},
@@ -452,7 +459,7 @@ process_arguments (int argc, char **argv)
      strcpy (argv[c], "-t");
  while (1) {
-    c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklLg:R:r:i:I:MEA", longopts, &option);
+    c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:N:mklLg:R:r:i:I:MEA", longopts, &option);
    if (c == -1 || c == EOF)
      break;
@@ -591,6 +598,9 @@ process_arguments (int argc, char **argv)
    case 'X':                 /* exclude file system type */
      np_add_name(&fs_exclude_list, optarg);
      break;
+    case 'N':                 /* include file system type */
+      np_add_name(&fs_include_list, optarg);
+      break;
    case 'v':                 /* verbose */
      verbose++;
      break;
@@ -900,6 +910,8 @@ print_help (void)
  printf (UT_VERBOSE);
  printf (" %s\n", "-X, --exclude-type=TYPE");
  printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
+  printf (" %s\n", "-N, --include-type=TYPE");
+  printf ("    %s\n", _("Check only filesystems of indicated type (may be repeated)"));
  printf ("\n");
  printf ("%s\n", _("Examples:"));
@@ -922,7 +934,7 @@ print_usage (void)
  printf ("%s\n", _("Usage:"));
  printf (" %s -w limit -c limit [-W limit] [-K limit] {-p path | -x device}\n", progname);
  printf ("[-C] [-E] [-e] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n");
-  printf ("[-t timeout] [-u unit] [-v] [-X type]\n");
+  printf ("[-t timeout] [-u unit] [-v] [-X type] [-N type]\n");
 }
 void
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 91af730b..ac6cfc38 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -91,7 +91,7 @@ main (int argc, char **argv)
  textdomain (PACKAGE);
  /* Set signal handling and alarm */
-  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
    usage_va(_("Cannot catch SIGALRM"));
  }
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 675a547c..c7cce97d 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -52,6 +52,8 @@ void print_help (void);
 void print_usage (void);
 char *server_name = NULL;
+char *sourceip = NULL;
+char *sourceif = NULL;
 int packet_size = PACKET_SIZE;
 int packet_count = PACKET_COUNT;
 int target_timeout = 0;
@@ -72,6 +74,8 @@ main (int argc, char **argv)
 /* normaly should be  int result = STATE_UNKNOWN; */
  int status = STATE_UNKNOWN;
+  int result = 0;
+  char *fping_prog = NULL;
  char *server = NULL;
  char *command_line = NULL;
  char *input_buffer = NULL;
@@ -95,8 +99,21 @@ main (int argc, char **argv)
    xasprintf(&option_string, "%s-t %d ", option_string, target_timeout);
  if (packet_interval)
    xasprintf(&option_string, "%s-p %d ", option_string, packet_interval);
+  if (sourceip)
-  xasprintf (&command_line, "%s %s-b %d -c %d %s", PATH_TO_FPING,
+    xasprintf(&option_string, "%s-S %s ", option_string, sourceip);
+  if (sourceif)
+    xasprintf(&option_string, "%s-I %s ", option_string, sourceif);
+#ifdef PATH_TO_FPING6
+  if (address_family == AF_INET6)
+    fping_prog = strdup(PATH_TO_FPING6);
+  else
+    fping_prog = strdup(PATH_TO_FPING);
+#else
+  fping_prog = strdup(PATH_TO_FPING);
+#endif
+  xasprintf (&command_line, "%s %s-b %d -c %d %s", fping_prog,
            option_string, packet_size, packet_count, server);
  if (verbose)
@@ -130,10 +147,24 @@ main (int argc, char **argv)
  (void) fclose (child_stderr);
  /* close the pipe */
-  if (spclose (child_process))
+  if (result = spclose (child_process))
    /* need to use max_state not max */
    status = max_state (status, STATE_WARNING);
+  if (result > 1 ) {
+    status = max_state (status, STATE_UNKNOWN);
+    if (result == 2) {
+      die (STATE_UNKNOWN, _("FPING UNKNOWN - IP address not found\n"));
+    }
+    if (result == 3) {
+      die (STATE_UNKNOWN, _("FPING UNKNOWN - invalid commandline argument\n"));
+    }
+    if (result == 4) {
+      die (STATE_UNKNOWN, _("FPING UNKNOWN - failed system call\n"));
+    }
+  }
  printf ("FPING %s - %s\n", state_text (status), server_name);
  return status;
@@ -159,6 +190,10 @@ textscan (char *buf)
               "host");
  }
+  else if (strstr (buf, "Operation not permitted") || strstr (buf, "No such device") ) {
+    die (STATE_UNKNOWN, _("FPING UNKNOWN - %s parameter error\n"),
+               "host");
+  }
  else if (strstr (buf, "is down")) {
    die (STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
@@ -232,6 +267,8 @@ process_arguments (int argc, char **argv)
  int option = 0;
  static struct option longopts[] = {
    {"hostname", required_argument, 0, 'H'},
+    {"sourceip", required_argument, 0, 'S'},
+    {"sourceif", required_argument, 0, 'I'},
    {"critical", required_argument, 0, 'c'},
    {"warning", required_argument, 0, 'w'},
    {"bytes", required_argument, 0, 'b'},
@@ -241,6 +278,8 @@ process_arguments (int argc, char **argv)
    {"verbose", no_argument, 0, 'v'},
    {"version", no_argument, 0, 'V'},
    {"help", no_argument, 0, 'h'},
+    {"use-ipv4", no_argument, 0, '4'},
+    {"use-ipv6", no_argument, 0, '6'},
    {0, 0, 0, 0}
  };
@@ -258,7 +297,7 @@ process_arguments (int argc, char **argv)
  }
  while (1) {
-    c = getopt_long (argc, argv, "+hVvH:c:w:b:n:T:i:", longopts, &option);
+    c = getopt_long (argc, argv, "+hVvH:S:c:w:b:n:T:i:I:46", longopts, &option);
    if (c == -1 || c == EOF || c == 1)
      break;
@@ -281,6 +320,24 @@ process_arguments (int argc, char **argv)
      }
      server_name = strscpy (server_name, optarg);
      break;
+    case 'S':                 /* sourceip */
+      if (is_host (optarg) == FALSE) {
+        usage2 (_("Invalid hostname/address"), optarg);
+      }
+      sourceip = strscpy (sourceip, optarg);
+      break;
+    case 'I':                 /* sourceip */
+      sourceif = strscpy (sourceif, optarg);
+    case '4':                 /* IPv4 only */
+      address_family = AF_INET;
+      break;
+    case '6':                 /* IPv6 only */
+#ifdef USE_IPV6
+      address_family = AF_INET6;
+#else
+      usage (_("IPv6 support not available\n"));
+#endif
+      break;
    case 'c':
      get_threshold (optarg, rv);
      if (rv[RTA]) {
@@ -402,6 +459,8 @@ print_help (void)
  printf (UT_HELP_VRSN);
  printf (UT_EXTRA_OPTS);
+  printf (UT_IPv46);
  printf (" %s\n", "-H, --hostname=HOST");
  printf ("    %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)"));
  printf (" %s\n", "-w, --warning=THRESHOLD");
@@ -413,15 +472,22 @@ print_help (void)
  printf (" %s\n", "-n, --number=INTEGER");
  printf ("    %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT);
  printf (" %s\n", "-T, --target-timeout=INTEGER");
-  printf ("    %s (default: fping's default for -t)\n", _("Target timeout (ms)"),PACKET_COUNT);
+  printf ("    %s (default: fping's default for -t)\n", _("Target timeout (ms)"));
  printf (" %s\n", "-i, --interval=INTEGER");
-  printf ("    %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"),PACKET_COUNT);
+  printf ("    %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"));
+  printf (" %s\n", "-S, --sourceip=HOST");
+  printf ("    %s\n", _("name or IP Address of sourceip"));
+  printf (" %s\n", "-I, --sourceif=IF");
+  printf ("    %s\n", _("source interface name"));
  printf (UT_VERBOSE);
  printf ("\n");
  printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
  printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
  printf (" %s\n", _("packet loss to trigger an alarm state."));
+  printf ("\n");
+  printf (" %s\n", _("IPv4 is used by default. Specify -6 to use IPv6."));
  printf (UT_SUPPORT);
 }
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 9231a559..ea7a6736 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1,40 +1,40 @@
 /*****************************************************************************
-* 
+*
 * Nagios check_http plugin
-* 
+*
 * License: GPL
-* Copyright (c) 1999-2008 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Nagios Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains the check_http plugin
-* 
+*
 * This plugin tests the HTTP service on the specified host. It can test
 * normal (http) and secure (https) servers, follow redirects, search for
 * strings and regular expressions, check connection times, and report on
 * certificate expiration times.
-* 
+*
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
+*
-* 
+*
 *****************************************************************************/
 /* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
 const char *progname = "check_http";
-const char *copyright = "1999-2011";
+const char *copyright = "1999-2013";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "common.h"
@@ -43,7 +43,6 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "base64.h"
 #include <ctype.h>
-#define INPUT_DELIMITER ";"
 #define STICKY_NONE 0
 #define STICKY_HOST 1
 #define STICKY_PORT 2
@@ -85,6 +84,7 @@ int errcode;
 int invert_regex = 0;
 struct timeval tv;
+struct timeval tv_temp;
 #define HTTP_URL "/"
 #define CRLF "\r\n"
@@ -100,7 +100,9 @@ char *user_agent;
 int server_url_length;
 int server_expect_yn = 0;
 char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+char header_expect[MAX_INPUT_BUFFER] = "";
 char string_expect[MAX_INPUT_BUFFER] = "";
+char output_header_search[30] = "";
 char output_string_search[30] = "";
 char *warning_thresholds = NULL;
 char *critical_thresholds = NULL;
@@ -115,6 +117,7 @@ int followsticky = STICKY_NONE;
 int use_ssl = FALSE;
 int use_sni = FALSE;
 int verbose = FALSE;
+int show_extended_perfdata = FALSE;
 int sd;
 int min_page_len = 0;
 int max_page_len = 0;
@@ -131,6 +134,11 @@ void redir (char *pos, char *status_line);
 int server_type_check(const char *type);
 int server_port_check(int ssl_flag);
 char *perfd_time (double microsec);
+char *perfd_time_connect (double microsec);
+char *perfd_time_ssl (double microsec);
+char *perfd_time_firstbyte (double microsec);
+char *perfd_time_headers (double microsec);
+char *perfd_time_transfer (double microsec);
 char *perfd_size (int page_len);
 void print_help (void);
 void print_usage (void);
@@ -199,6 +207,7 @@ process_arguments (int argc, char **argv)
    {"port", required_argument, 0, 'p'},
    {"authorization", required_argument, 0, 'a'},
    {"proxy_authorization", required_argument, 0, 'b'},
+    {"header-string", required_argument, 0, 'd'},
    {"string", required_argument, 0, 's'},
    {"expect", required_argument, 0, 'e'},
    {"regex", required_argument, 0, 'r'},
@@ -216,6 +225,7 @@ process_arguments (int argc, char **argv)
    {"invert-regex", no_argument, NULL, INVERT_REGEX},
    {"use-ipv4", no_argument, 0, '4'},
    {"use-ipv6", no_argument, 0, '6'},
+    {"extended-perfdata", no_argument, 0, 'E'},
    {0, 0, 0, 0}
  };
@@ -236,7 +246,7 @@ process_arguments (int argc, char **argv)
  }
  while (1) {
-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:e:p:s:R:r:u:f:C:nlLS::m:M:N", longopts, &option);
+    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:nlLS::m:M:N:E", longopts, &option);
    if (c == -1 || c == EOF)
      break;
@@ -385,6 +395,10 @@ process_arguments (int argc, char **argv)
        free(http_method);
      http_method = strdup (optarg);
      break;
+    case 'd': /* string or substring */
+      strncpy (header_expect, optarg, MAX_INPUT_BUFFER - 1);
+      header_expect[MAX_INPUT_BUFFER - 1] = 0;
+      break;
    case 's': /* string or substring */
      strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
      string_expect[MAX_INPUT_BUFFER - 1] = 0;
@@ -471,6 +485,9 @@ process_arguments (int argc, char **argv)
                    }
                  }
                  break;
+    case 'E': /* show extended perfdata */
+      show_extended_perfdata = TRUE;
+      break;
    }
  }
@@ -812,17 +829,33 @@ check_http (void)
  char *pos;
  long microsec;
  double elapsed_time;
+  long microsec_connect;
+  double elapsed_time_connect;
+  long microsec_ssl;
+  double elapsed_time_ssl;
+  long microsec_firstbyte;
+  double elapsed_time_firstbyte;
+  long microsec_headers;
+  double elapsed_time_headers;
+  long microsec_transfer;
+  double elapsed_time_transfer;
  int page_len = 0;
  int result = STATE_OK;
  /* try to connect to the host at the given port number */
+  gettimeofday (&tv_temp, NULL);
  if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
    die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+  microsec_connect = deltime (tv_temp);
 #ifdef HAVE_SSL
+  elapsed_time_connect = (double)microsec_connect / 1.0e6;
  if (use_ssl == TRUE) {
+    gettimeofday (&tv_temp, NULL);
    result = np_net_ssl_init_with_hostname_and_version(sd, (use_sni ? host_name : NULL), ssl_version);
    if (result != STATE_OK)
      return result;
+    microsec_ssl = deltime (tv_temp);
+    elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
    if (check_cert == TRUE) {
      result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
      np_net_ssl_cleanup();
@@ -854,8 +887,7 @@ check_http (void)
  /* optionally send any other header tag */
  if (http_opt_headers_count) {
    for (i = 0; i < http_opt_headers_count ; i++) {
-      for ((pos = strtok(http_opt_headers[i], INPUT_DELIMITER)); pos; (pos = strtok(NULL, INPUT_DELIMITER)))
+      xasprintf (&buf, "%s%s\r\n", buf, http_opt_headers[i]);
-        xasprintf (&buf, "%s%s\r\n", buf, pos);
    }
    /* This cannot be free'd here because a redirection will then try to access this and segfault */
    /* Covered in a testcase in tests/check_http.t */
@@ -891,11 +923,19 @@ check_http (void)
  }
  if (verbose) printf ("%s\n", buf);
+  gettimeofday (&tv_temp, NULL);
  my_send (buf, strlen (buf));
+  microsec_headers = deltime (tv_temp);
+  elapsed_time_headers = (double)microsec_headers / 1.0e6;
  /* fetch the page */
  full_page = strdup("");
+  gettimeofday (&tv_temp, NULL);
  while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
+    if ((i >= 1) && (elapsed_time_firstbyte <= 0.000001)) {
+      microsec_firstbyte = deltime (tv_temp);
+      elapsed_time_firstbyte = (double)microsec_firstbyte / 1.0e6;
+    }
    buffer[i] = '\0';
    xasprintf (&full_page_new, "%s%s", full_page, buffer);
    free (full_page);
@@ -907,6 +947,8 @@ check_http (void)
                  break;
                }
  }
+  microsec_transfer = deltime (tv_temp);
+  elapsed_time_transfer = (double)microsec_transfer / 1.0e6;
  if (i < 0 && errno != ECONNRESET) {
 #ifdef HAVE_SSL
@@ -1050,6 +1092,17 @@ check_http (void)
  }
  /* Page and Header content checks go here */
+  if (strlen (header_expect)) {
+    if (!strstr (header, header_expect)) {
+      strncpy(&output_header_search[0],header_expect,sizeof(output_header_search));
+      if(output_header_search[sizeof(output_header_search)-1]!='\0') {
+        bcopy("...",&output_header_search[sizeof(output_header_search)-4],4);
+      }
+      xasprintf (&msg, _("%sheader '%s' not found on '%s://%s:%d%s', "), msg, output_header_search, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
+      result = STATE_CRITICAL;
+    }
+  }
  if (strlen (string_expect)) {
    if (!strstr (page, string_expect)) {
@@ -1108,11 +1161,25 @@ check_http (void)
    msg[strlen(msg)-3] = '\0';
  /* check elapsed time */
-  xasprintf (&msg,
+  if (show_extended_perfdata)
-            _("%s - %d bytes in %.3f second response time %s|%s %s"),
+    xasprintf (&msg,
-            msg, page_len, elapsed_time,
+           _("%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"),
-            (display_html ? "</A>" : ""),
+           msg, page_len, elapsed_time,
-            perfd_time (elapsed_time), perfd_size (page_len));
+           (display_html ? "</A>" : ""),
+           perfd_time (elapsed_time),
+           perfd_size (page_len),
+           perfd_time_connect (elapsed_time_connect),
+           use_ssl == TRUE ? perfd_time_ssl (elapsed_time_ssl) : "",
+           perfd_time_headers (elapsed_time_headers),
+           perfd_time_firstbyte (elapsed_time_firstbyte),
+           perfd_time_transfer (elapsed_time_transfer));
+  else
+    xasprintf (&msg,
+           _("%s - %d bytes in %.3f second response time %s|%s %s"),
+           msg, page_len, elapsed_time,
+           (display_html ? "</A>" : ""),
+           perfd_time (elapsed_time),
+           perfd_size (page_len));
  result = max_state_alt(get_status(elapsed_time, thlds), result);
@@ -1301,7 +1368,30 @@ char *perfd_time (double elapsed_time)
                   TRUE, 0, FALSE, 0);
 }
+char *perfd_time_connect (double elapsed_time_connect)
+{
+  return fperfdata ("time_connect", elapsed_time_connect, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0);
+}
+char *perfd_time_ssl (double elapsed_time_ssl)
+{
+  return fperfdata ("time_ssl", elapsed_time_ssl, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0);
+}
+char *perfd_time_headers (double elapsed_time_headers)
+{
+  return fperfdata ("time_headers", elapsed_time_headers, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0);
+}
+char *perfd_time_firstbyte (double elapsed_time_firstbyte)
+{
+  return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0);
+}
+char *perfd_time_transfer (double elapsed_time_transfer)
+{
+  return fperfdata ("time_transfer", elapsed_time_transfer, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0);
+}
 char *perfd_size (int page_len)
 {
@@ -1362,6 +1452,8 @@ print_help (void)
  printf ("    %s", _("the first (status) line of the server response (default: "));
  printf ("%s)\n", HTTP_EXPECT);
  printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
+  printf (" %s\n", "-d, --header-string=STRING");
+  printf ("    %s\n", _("String to expect in the response headers"));
  printf (" %s\n", "-s, --string=STRING");
  printf ("    %s\n", _("String to expect in the content"));
  printf (" %s\n", "-u, --url=PATH");
@@ -1463,7 +1555,7 @@ print_usage (void)
  printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
  printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-a auth]\n");
  printf ("       [-b proxy_auth] [-f <ok|warning|critcal|follow|sticky|stickyport>]\n");
-  printf ("       [-e <expect>] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
+  printf ("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
  printf ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
  printf ("       [-A string] [-k string] [-S <version>] [--sni] [-C <warn_age>[,<crit_age>]]\n");
  printf ("       [-T <content-type>] [-j method]\n");
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index cacc6c24..521c902d 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -5,7 +5,7 @@
 * License: GPL
 * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2009 Nagios Plugins Development Team
+* Copyright (c) 1999-2011 Nagios Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 *****************************************************************************/
 const char *progname = "check_mysql";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2011";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #define SLAVERESULTSIZE 70
@@ -49,12 +49,44 @@ char *db_host = NULL;
 char *db_socket = NULL;
 char *db_pass = NULL;
 char *db = NULL;
+char *ca_cert = NULL;
+char *ca_dir = NULL;
+char *cert = NULL;
+char *key = NULL;
+char *ciphers = NULL;
+bool ssl = false;
 char *opt_file = NULL;
 char *opt_group = NULL;
 unsigned int db_port = MYSQL_PORT;
 int check_slave = 0, warn_sec = 0, crit_sec = 0;
 int verbose = 0;
+static double warning_time = 0;
+static double critical_time = 0;
+#define LENGTH_METRIC_UNIT 6
+static const char *metric_unit[LENGTH_METRIC_UNIT] = {
+        "Open_files",
+        "Open_tables",
+        "Qcache_free_memory",
+        "Qcache_queries_in_cache",
+        "Threads_connected",
+        "Threads_running"
+};
+#define LENGTH_METRIC_COUNTER 9
+static const char *metric_counter[LENGTH_METRIC_COUNTER] = {
+        "Connections",
+        "Qcache_hits",
+        "Qcache_inserts",
+        "Qcache_lowmem_prunes",
+        "Qcache_not_cached",
+        "Queries",
+        "Questions",
+        "Table_locks_waited",
+        "Uptime"
+};
 thresholds *my_threshold = NULL;
 int process_arguments (int, char **);
@@ -75,6 +107,9 @@ main (int argc, char **argv)
        char *result = NULL;
        char *error = NULL;
        char slaveresult[SLAVERESULTSIZE];
+        char* perf;
+        perf = strdup ("");
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
@@ -97,6 +132,8 @@ main (int argc, char **argv)
        else
                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
+        if (ssl)
+                mysql_ssl_set(&mysql,key,cert,ca_cert,ca_dir,ciphers);
        /* establish a connection to the server and error checking */
        if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
                if (mysql_errno (&mysql) == CR_UNKNOWN_HOST)
@@ -126,6 +163,37 @@ main (int argc, char **argv)
                        die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
        }
+        /* try to fetch some perf data */
+        if (mysql_query (&mysql, "show global status") == 0) {
+                if ( (res = mysql_store_result (&mysql)) == NULL) {
+                        error = strdup(mysql_error(&mysql));
+                        mysql_close (&mysql);
+                        die (STATE_CRITICAL, _("status store_result error: %s\n"), error);
+                }
+                while ( (row = mysql_fetch_row (res)) != NULL) {
+                        int i;
+                        for(i = 0; i < LENGTH_METRIC_UNIT; i++) {
+                                if (strcmp(row[0], metric_unit[i]) == 0) {
+                                        xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i],
+                                                atol(row[1]), "", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0));
+                                        continue;
+                                }
+                        }
+                        for(i = 0; i < LENGTH_METRIC_COUNTER; i++) {
+                                if (strcmp(row[0], metric_counter[i]) == 0) {
+                                        xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i],
+                                                atol(row[1]), "c", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0));
+                                        continue;
+                                }
+                        }
+                }
+                /* remove trailing space */
+                if (strlen(perf) > 0)
+                    perf[strlen(perf) - 1] = '\0';
+        }
        if(check_slave) {
                /* check the slave status */
                if (mysql_query (&mysql, "show slave status") != 0) {
@@ -165,7 +233,7 @@ main (int argc, char **argv)
                        }
                } else {
-                        /* mysql 4.x.x */
+                        /* mysql 4.x.x and mysql 5.x.x */
                        int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, i, num_fields;
                        MYSQL_FIELD* fields;
@@ -186,13 +254,17 @@ main (int argc, char **argv)
                                }
                        }
+                        /* Check if slave status is available */
                        if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) {
                                mysql_free_result (res);
                                mysql_close (&mysql);
                                die (STATE_CRITICAL, "Slave status unavailable\n");
                        }
+                        /* Save slave status in slaveresult */
                        snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown");
+                        /* Raise critical error if SQL THREAD or IO THREAD are stopped */
                        if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
                                mysql_free_result (res);
                                mysql_close (&mysql);
@@ -207,17 +279,24 @@ main (int argc, char **argv)
                                }
                        }
+                        /* Check Seconds Behind against threshold */
                        if ((seconds_behind_field != -1) && (strcmp (row[seconds_behind_field], "NULL") != 0)) {
                                double value = atof(row[seconds_behind_field]);
                                int status;
                                status = get_status(value, my_threshold);
+                                xasprintf (&perf, "%s %s", perf, fperfdata ("seconds behind master", value, "s",
+                                        TRUE, (double) warning_time,
+                                        TRUE, (double) critical_time,
+                                        FALSE, 0,
+                                        FALSE, 0));
                                if (status == STATE_WARNING) {
-                                        printf("SLOW_SLAVE %s: %s\n", _("WARNING"), slaveresult);
+                                        printf("SLOW_SLAVE %s: %s|%s\n", _("WARNING"), slaveresult, perf);
                                        exit(STATE_WARNING);
                                } else if (status == STATE_CRITICAL) {
-                                        printf("SLOW_SLAVE %s: %s\n", _("CRITICAL"), slaveresult);
+                                        printf("SLOW_SLAVE %s: %s|%s\n", _("CRITICAL"), slaveresult, perf);
                                        exit(STATE_CRITICAL);
                                }
                        }
@@ -232,9 +311,9 @@ main (int argc, char **argv)
        /* print out the result of stats */
        if (check_slave) {
-                printf ("%s %s\n", result, slaveresult);
+                printf ("%s %s|%s\n", result, slaveresult, perf);
        } else {
-                printf ("%s\n", result);
+                printf ("%s|%s\n", result, perf);
        }
        return STATE_OK;
@@ -265,6 +344,12 @@ process_arguments (int argc, char **argv)
                {"verbose", no_argument, 0, 'v'},
                {"version", no_argument, 0, 'V'},
                {"help", no_argument, 0, 'h'},
+                {"ssl", no_argument, 0, 'l'},
+                {"ca-cert", optional_argument, 0, 'C'},
+                {"key", required_argument,0,'k'},
+                {"cert", required_argument,0,'a'},
+                {"ca-dir", required_argument, 0, 'D'},
+                {"ciphers", required_argument, 0, 'L'},
                {0, 0, 0, 0}
        };
@@ -272,7 +357,7 @@ process_arguments (int argc, char **argv)
                return ERROR;
        while (1) {
-                c = getopt_long (argc, argv, "hvVSP:p:u:d:f:g:H:s:c:w:", longopts, &option);
+                c = getopt_long (argc, argv, "hlvVSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
                if (c == -1 || c == EOF)
                        break;
@@ -292,6 +377,24 @@ process_arguments (int argc, char **argv)
                case 'd':                                                                       /* database */
                        db = optarg;
                        break;
+                case 'l':
+                        ssl = true;
+                        break;
+                case 'C':
+                        ca_cert = optarg;
+                        break;
+                case 'a':
+                        cert = optarg;
+                        break;
+                case 'k':
+                        key = optarg;
+                        break;
+                case 'D':
+                        ca_dir = optarg;
+                        break;
+                case 'L':
+                        ciphers = optarg;
+                        break;
                case 'u':                                                                       /* username */
                        db_user = optarg;
                        break;
@@ -318,9 +421,11 @@ process_arguments (int argc, char **argv)
                        break;
                case 'w':
                        warning = optarg;
+                        warning_time = strtod (warning, NULL);
                        break;
                case 'c':
                        critical = optarg;
+                        critical_time = strtod (critical, NULL);
                        break;
                case 'V':                                                                       /* version */
                        print_revision (progname, NP_VERSION);
@@ -434,6 +539,19 @@ print_help (void)
  printf (" %s\n", "-c, --critical");
  printf ("    %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
  printf ("    %s\n", _("behind master"));
+  printf (" %s\n", "-l, --ssl");
+  printf ("    %s\n", _("Use ssl encryptation"));
+  printf (" %s\n", "-C, --ca-cert=STRING");
+  printf ("    %s\n", _("Path to CA signing the cert"));
+  printf (" %s\n", "-a, --cert=STRING");
+  printf ("    %s\n", _("Path to SSL certificate"));
+  printf (" %s\n", "-k, --key=STRING");
+  printf ("    %s\n", _("Path to private SSL key"));
+  printf (" %s\n", "-D, --ca-dir=STRING");
+  printf ("    %s\n", _("Path to CA directory"));
+  printf (" %s\n", "-L, --ciphers=STRING");
+  printf ("    %s\n", _("List of valid SSL ciphers"));
  printf ("\n");
  printf (" %s\n", _("There are no required arguments. By default, the local database is checked"));
@@ -454,6 +572,6 @@ print_usage (void)
 {
        printf ("%s\n", _("Usage:"));
  printf (" %s [-d database] [-H host] [-P port] [-s socket]\n",progname);
-  printf ("       [-u user] [-p password] [-S] [-f optfile]\n");
+  printf ("       [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n");
-  printf ("       [-g group]\n");
+  printf ("       [-C ca-cert] [-D ca-dir] [-L ciphers] [-f optfile] [-g group]\n");
 }
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index c8cdbc02..4fd6342d 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -205,6 +205,7 @@ process_arguments (int argc, char **argv)
                {"filename", required_argument, 0, 'F'},
                {"expires", required_argument, 0, 'e'},
                {"command", required_argument, 0, 'C'},
+                {"timeout", optional_argument, 0, 't'},
                {"version", no_argument, 0, 'V'},
                {"help", no_argument, 0, 'h'},
                {"verbose", no_argument, 0, 'v'},
@@ -226,7 +227,7 @@ process_arguments (int argc, char **argv)
        }
        while (1) {
-                c = getopt_long (argc, argv, "+hVvF:C:e:", longopts, &option);
+                c = getopt_long (argc, argv, "+hVvF:C:e:t:", longopts, &option);
                if (c == -1 || c == EOF || c == 1)
                        break;
@@ -251,6 +252,13 @@ process_arguments (int argc, char **argv)
                                die (STATE_UNKNOWN,
                                     _("Expiration time must be an integer (seconds)\n"));
                        break;
+                case 't':                                                                       /* timeout */
+                        if (is_intnonneg (optarg))
+                                timeout_interval = atoi (optarg);
+                        else
+                                die (STATE_UNKNOWN,
+                                     _("Timeout must be an integer (seconds)\n"));
+                        break;
                case 'v':
                        verbose++;
                        break;
@@ -296,11 +304,13 @@ print_help (void)
  printf ("    %s\n", _("Minutes aging after which logfile is considered stale"));
  printf (" %s\n", "-C, --command=STRING");
  printf ("    %s\n", _("Substring to search for in process arguments"));
+  printf (" %s\n", "-t, --timeout=INTEGER");
+  printf ("    %s\n", _("Timeout for the plugin in seconds"));
  printf (UT_VERBOSE);
  printf ("\n");
  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
+  printf (" %s\n", "check_nagios -t 20 -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
  printf (UT_SUPPORT);
 }
@@ -311,5 +321,5 @@ void
 print_usage (void)
 {
  printf ("%s\n", _("Usage:"));
-        printf ("%s -F <status log file> -e <expire_minutes> -C <process_string>\n", progname);
+        printf ("%s -F <status log file> -t <timeout_seconds> -e <expire_minutes> -C <process_string>\n", progname);
 }
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 89c4d8d3..52bbd1c5 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -94,6 +94,7 @@ int main(int argc, char **argv){
        char *description=NULL,*counter_unit = NULL;
        char *minval = NULL, *maxval = NULL, *errcvt = NULL;
        char *fds=NULL, *tds=NULL;
+        char *numstr;
        double total_disk_space=0;
        double free_disk_space=0;
@@ -265,7 +266,10 @@ int main(int argc, char **argv){
                        xasprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
                                                         (show_all==TRUE) ? "ShowAll" : "ShowFail",value_list);
                        fetch_data (server_address, server_port, send_buffer);
-                        return_code=atoi(strtok(recv_buffer,"&"));
+                        numstr = strtok(recv_buffer,"&");
+                        if (numstr == NULL)
+                                die(STATE_UNKNOWN, _("could not fetch information from server\n"));
+                        return_code=atoi(numstr);
                        temp_string=strtok(NULL,"&");
                        output_message = strdup (temp_string);
                }
@@ -275,8 +279,14 @@ int main(int argc, char **argv){
                xasprintf(&send_buffer,"%s&7", req_password);
                fetch_data (server_address, server_port, send_buffer);
-                mem_commitLimit=atof(strtok(recv_buffer,"&"));
+                numstr = strtok(recv_buffer,"&");
-                mem_commitByte=atof(strtok(NULL,"&"));
+                if (numstr == NULL)
+                        die(STATE_UNKNOWN, _("could not fetch information from server\n"));
+                mem_commitLimit=atof(numstr);
+                numstr = strtok(NULL,"&");
+                if (numstr == NULL)
+                        die(STATE_UNKNOWN, _("could not fetch information from server\n"));
+                mem_commitByte=atof(numstr);
                percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
                warning_used_space = ((float)warning_value / 100) * mem_commitLimit;
                critical_used_space = ((float)critical_value / 100) * mem_commitLimit;
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index b59c056d..76152e17 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -241,15 +241,19 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji
                DBG(printf("sending READSTAT request"));
                write(conn, &req, SIZEOF_NTPCM(req));
                DBG(print_ntp_control_message(&req));
-                /* Attempt to read the largest size packet possible */
-                req.count=htons(MAX_CM_SIZE);
+                do {
-                DBG(printf("recieving READSTAT response"))
+                        /* Attempt to read the largest size packet possible */
-                if(read(conn, &req, SIZEOF_NTPCM(req)) == -1)
+                        req.count=htons(MAX_CM_SIZE);
-                        die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
+                        DBG(printf("recieving READSTAT response"))
-                DBG(print_ntp_control_message(&req));
+                        if(read(conn, &req, SIZEOF_NTPCM(req)) == -1)
-                /* discard obviously invalid packets */
+                                die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
-                if (ntohs(req.count) > MAX_CM_SIZE)
+                        DBG(print_ntp_control_message(&req));
-                        die(STATE_CRITICAL, "NTP CRITICAL: Invalid packet received from NTP server\n");
+                        /* discard obviously invalid packets */
+                        if (ntohs(req.count) > MAX_CM_SIZE)
+                                die(STATE_CRITICAL, "NTP CRITICAL: Invalid packet received from NTP server\n");
+                } while (!(req.op&OP_READSTAT && ntohs(req.seq) == 1));
                if (LI(req.flags) == LI_ALARM) li_alarm = 1;
                /* Each peer identifier is 4 bytes in the data section, which
                 * we represent as a ntp_assoc_status_pair datatype.
@@ -312,10 +316,12 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji
                                write(conn, &req, SIZEOF_NTPCM(req));
                                DBG(print_ntp_control_message(&req));
-                                req.count = htons(MAX_CM_SIZE);
+                                do {
-                                DBG(printf("receiving READVAR response...\n"));
+                                        req.count = htons(MAX_CM_SIZE);
-                                read(conn, &req, SIZEOF_NTPCM(req));
+                                        DBG(printf("receiving READVAR response...\n"));
-                                DBG(print_ntp_control_message(&req));
+                                        read(conn, &req, SIZEOF_NTPCM(req));
+                                        DBG(print_ntp_control_message(&req));
+                                } while (!(req.op&OP_READVAR && ntohs(req.seq) == 2));
                                if(!(req.op&REM_ERROR))
                                        xasprintf(&data, "%s%s", data, req.data);
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 8b0769f1..8d60701f 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -3,7 +3,7 @@
 * Nagios check_pgsql plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2011 Nagios Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 *****************************************************************************/
 const char *progname = "check_pgsql";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2011";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "common.h"
@@ -42,6 +42,20 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #define DEFAULT_DB "template1"
 #define DEFAULT_HOST "127.0.0.1"
+/* return the PSQL server version as a 3-tuple */
+#define PSQL_SERVER_VERSION3(server_version) \
+        (server_version) / 10000, \
+        (server_version) / 100 - (int)((server_version) / 10000) * 100, \
+        (server_version) - (int)((server_version) / 100) * 100
+/* return true if the given host is a UNIX domain socket */
+#define PSQL_IS_UNIX_DOMAIN_SOCKET(host) \
+        ((NULL == (host)) || ('\0' == *(host)) || ('/' == *(host)))
+/* return a 3-tuple identifying a host/port independent of the socket type */
+#define PSQL_SOCKET3(host, port) \
+        ((NULL == (host)) || ('\0' == *(host))) ? DEFAULT_PGSOCKET_DIR : host, \
+        PSQL_IS_UNIX_DOMAIN_SOCKET (host) ? "/.s.PGSQL." : ":", \
+        port
 enum {
        DEFAULT_PORT = 5432,
        DEFAULT_WARN = 2,
@@ -56,6 +70,7 @@ void print_usage (void);
 void print_help (void);
 int is_pg_dbname (char *);
 int is_pg_logname (char *);
+int do_query (PGconn *, char *);
 char *pghost = NULL;                                            /* host name of the backend server */
 char *pgport = NULL;                                            /* port of the backend server */
@@ -65,14 +80,15 @@ char *pgtty = NULL;
 char dbName[NAMEDATALEN] = DEFAULT_DB;
 char *pguser = NULL;
 char *pgpasswd = NULL;
+char *pgparams = NULL;
 double twarn = (double)DEFAULT_WARN;
 double tcrit = (double)DEFAULT_CRIT;
+char *pgquery = NULL;
+char *query_warning = NULL;
+char *query_critical = NULL;
+thresholds *qthresholds = NULL;
 int verbose = 0;
-PGconn *conn;
-/*PGresult   *res;*/
 /******************************************************************************
 The (psuedo?)literate programming XML is contained within \@\@\- <XML> \-\@\@
@@ -115,10 +131,6 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 <sect2>
 <title>Future Enhancements</title>
 <para>ToDo List</para>
-<itemizedlist>
-<listitem>Add option to get password from a secured file rather than the command line</listitem>
-<listitem>Add option to specify the query to execute</listitem>
-</itemizedlist>
 </sect2>
@@ -132,8 +144,14 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 int
 main (int argc, char **argv)
 {
-        int elapsed_time;
+        PGconn *conn;
+        char *conninfo = NULL;
+        struct timeval start_timeval;
+        struct timeval end_timeval;
+        double elapsed_time;
        int status = STATE_UNKNOWN;
+        int query_status = STATE_UNKNOWN;
        /* begin, by setting the parameters for a backend connection if the
         * parameters are null, then the system will try to use reasonable
@@ -161,20 +179,41 @@ main (int argc, char **argv)
        }
        alarm (timeout_interval);
-        if (verbose)
+        if (pgparams)
-                printf("Connecting to database:\n DB: %s\n User: %s\n Host: %s\n Port: %d\n", dbName,
+                asprintf (&conninfo, "%s ", pgparams);
-                (pguser != NULL) ? pguser : "unspecified",
-                (pghost != NULL) ? pghost : "unspecified",
+        asprintf (&conninfo, "%sdbname = '%s'", conninfo ? conninfo : "", dbName);
-                (pgport != NULL) ? atoi(pgport) : DEFAULT_PORT);
+        if (pghost)
+                asprintf (&conninfo, "%s host = '%s'", conninfo, pghost);
+        if (pgport)
+                asprintf (&conninfo, "%s port = '%s'", conninfo, pgport);
+        if (pgoptions)
+                asprintf (&conninfo, "%s options = '%s'", conninfo, pgoptions);
+        /* if (pgtty) -- ignored by PQconnectdb */
+        if (pguser)
+                asprintf (&conninfo, "%s user = '%s'", conninfo, pguser);
+        if (verbose) /* do not include password (see right below) in output */
+                printf ("Connecting to PostgreSQL using conninfo: %s%s\n", conninfo,
+                                pgpasswd ? " password = <hidden>" : "");
+        if (pgpasswd)
+                asprintf (&conninfo, "%s password = '%s'", conninfo, pgpasswd);
        /* make a connection to the database */
-        time (&start_time);
+        gettimeofday (&start_timeval, NULL);
-        conn =
+        conn = PQconnectdb (conninfo);
-                PQsetdbLogin (pghost, pgport, pgoptions, pgtty, dbName, pguser, pgpasswd);
+        gettimeofday (&end_timeval, NULL);
-        time (&end_time);
-        elapsed_time = (int) (end_time - start_time);
+        while (start_timeval.tv_usec > end_timeval.tv_usec) {
+                --end_timeval.tv_sec;
+                end_timeval.tv_usec += 1000000;
+        }
+        elapsed_time = (double)(end_timeval.tv_sec - start_timeval.tv_sec)
+                + (double)(end_timeval.tv_usec - start_timeval.tv_usec) / 1000000.0;
        if (verbose)
-                printf("Time elapsed: %d\n", elapsed_time);
+                printf("Time elapsed: %f\n", elapsed_time);
        /* check to see that the backend connection was successfully made */
        if (verbose)
@@ -194,14 +233,32 @@ main (int argc, char **argv)
        else {
                status = STATE_OK;
        }
+        if (verbose) {
+                char *server_host = PQhost (conn);
+                int server_version = PQserverVersion (conn);
+                printf ("Successfully connected to database %s (user %s) "
+                                "at server %s%s%s (server version: %d.%d.%d, "
+                                "protocol version: %d, pid: %d)\n",
+                                PQdb (conn), PQuser (conn),
+                                PSQL_SOCKET3 (server_host, PQport (conn)),
+                                PSQL_SERVER_VERSION3 (server_version),
+                                PQprotocolVersion (conn), PQbackendPID (conn));
+        }
+        printf (_(" %s - database %s (%f sec.)|%s\n"),
+                state_text(status), dbName, elapsed_time,
+                fperfdata("time", elapsed_time, "s",
+                         !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, TRUE, 0, FALSE,0));
+        if (pgquery)
+                query_status = do_query (conn, pgquery);
        if (verbose)
                printf("Closing connection\n");
        PQfinish (conn);
-        printf (_(" %s - database %s (%d sec.)|%s\n"),
+        return (query_status > status) ? query_status : status;
-                state_text(status), dbName, elapsed_time,
-                fperfdata("time", elapsed_time, "s",
-                         (int)twarn, twarn, (int)tcrit, tcrit, TRUE, 0, FALSE,0));
-        return status;
 }
@@ -225,12 +282,16 @@ process_arguments (int argc, char **argv)
                {"authorization", required_argument, 0, 'a'},
                {"port", required_argument, 0, 'P'},
                {"database", required_argument, 0, 'd'},
+                {"option", required_argument, 0, 'o'},
+                {"query", required_argument, 0, 'q'},
+                {"query_critical", required_argument, 0, 'C'},
+                {"query_warning", required_argument, 0, 'W'},
                {"verbose", no_argument, 0, 'v'},
                {0, 0, 0, 0}
        };
        while (1) {
-                c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:v",
+                c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:o:q:C:W:v",
                                 longopts, &option);
                if (c == EOF)
@@ -263,8 +324,14 @@ process_arguments (int argc, char **argv)
                        else
                                twarn = strtod (optarg, NULL);
                        break;
+                case 'C':     /* critical query threshold */
+                        query_critical = optarg;
+                        break;
+                case 'W':     /* warning query threshold */
+                        query_warning = optarg;
+                        break;
                case 'H':     /* host */
-                        if (!is_host (optarg))
+                        if ((*optarg != '/') && (!is_host (optarg)))
                                usage2 (_("Invalid hostname/address"), optarg);
                        else
                                pghost = optarg;
@@ -291,12 +358,23 @@ process_arguments (int argc, char **argv)
                case 'a':
                        pgpasswd = optarg;
                        break;
+                case 'o':
+                        if (pgparams)
+                                asprintf (&pgparams, "%s %s", pgparams, optarg);
+                        else
+                                asprintf (&pgparams, "%s", optarg);
+                        break;
+                case 'q':
+                        pgquery = optarg;
+                        break;
                case 'v':
                        verbose++;
                        break;
                }
        }
+        set_thresholds (&qthresholds, query_warning, query_critical);
        return validate_arguments ();
 }
@@ -434,8 +512,6 @@ print_help (void)
        printf (UT_HOST_PORT, 'P', myport);
-        printf (UT_IPv46);
        printf (" %s\n", "-d, --database=STRING");
        printf ("    %s", _("Database to check "));
        printf (_("(default: %s)"), DEFAULT_DB);
@@ -443,11 +519,20 @@ print_help (void)
        printf ("    %s\n", _("Login name of user"));
        printf (" %s\n", "-p, --password = STRING");
        printf ("    %s\n", _("Password (BIG SECURITY ISSUE)"));
+        printf (" %s\n", "-o, --option = STRING");
+        printf ("    %s\n", _("Connection parameters (keyword = value), see below"));
        printf (UT_WARN_CRIT);
        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (" %s\n", "-q, --query=STRING");
+        printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
+        printf (" %s\n", "-W, --query-warning=RANGE");
+        printf ("    %s\n", _("SQL query value to result in warning status (double)"));
+        printf (" %s\n", "-C, --query-critical=RANGE");
+        printf ("    %s\n", _("SQL query value to result in critical status (double)"));
        printf (UT_VERBOSE);
        printf ("\n");
@@ -458,6 +543,22 @@ print_help (void)
        printf (" %s\n", _("connects to the template1 database, which is present in every functioning"));
        printf (" %s\n\n", _("PostgreSQL DBMS."));
+        printf (" %s\n", _("If a query is specified using the -q option, it will be executed after"));
+        printf (" %s\n", _("connecting to the server. The result from the query has to be numeric."));
+        printf (" %s\n", _("Multiple SQL commands, separated by semicolon, are allowed but the result "));
+        printf (" %s\n", _("of the last command is taken into account only. The value of the first"));
+        printf (" %s\n\n", _("column in the first row is used as the check result."));
+        printf (" %s\n", _("See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"));
+        printf (" %s\n\n", _("for details about how to access internal statistics of the database server."));
+        printf (" %s\n", _("For a list of available connection parameters which may be used with the -o"));
+        printf (" %s\n", _("command line option, see the documentation for PQconnectdb() in the chapter"));
+        printf (" %s\n", _("\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"));
+        printf (" %s\n", _("used to specify a service name in pg_service.conf to be used for additional"));
+        printf (" %s\n", _("connection parameters: -o 'service=<name>' or to specify the SSL mode:"));
+        printf (" %s\n\n", _("-o 'sslmode=require'."));
        printf (" %s\n", _("The plugin will connect to a local postmaster if no host is specified. To"));
        printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
        printf (" %s\n\n", _("connections (start the postmaster with the -i option)."));
@@ -475,6 +576,75 @@ void
 print_usage (void)
 {
        printf ("%s\n", _("Usage:"));
-        printf ("%s [-H <host>] [-4|-6] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
+        printf ("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
-        printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n");
+        printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n"
+                        "[-q <query>] [-C <critical query range>] [-W <warning query range>]\n");
 }
+int
+do_query (PGconn *conn, char *query)
+{
+        PGresult *res;
+        char *val_str;
+        double value;
+        char *endptr = NULL;
+        int my_status = STATE_UNKNOWN;
+        if (verbose)
+                printf ("Executing SQL query \"%s\".\n", query);
+        res = PQexec (conn, query);
+        if (PGRES_TUPLES_OK != PQresultStatus (res)) {
+                printf (_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"),
+                                        PQerrorMessage (conn));
+                return STATE_CRITICAL;
+        }
+        if (PQntuples (res) < 1) {
+                printf ("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
+                return STATE_WARNING;
+        }
+        if (PQnfields (res) < 1) {
+                printf ("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
+                return STATE_WARNING;
+        }
+        val_str = PQgetvalue (res, 0, 0);
+        if (! val_str) {
+                printf ("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
+                return STATE_CRITICAL;
+        }
+        value = strtod (val_str, &endptr);
+        if (verbose)
+                printf ("Query result: %f\n", value);
+        if (endptr == val_str) {
+                printf ("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
+                return STATE_CRITICAL;
+        }
+        else if ((endptr != NULL) && (*endptr != '\0')) {
+                if (verbose)
+                        printf ("Garbage after value: %s.\n", endptr);
+        }
+        my_status = get_status (value, qthresholds);
+        printf ("QUERY %s - ",
+                        (my_status == STATE_OK)
+                                ? _("OK")
+                                : (my_status == STATE_WARNING)
+                                        ? _("WARNING")
+                                        : (my_status == STATE_CRITICAL)
+                                                ? _("CRITICAL")
+                                                : _("UNKNOWN"));
+        printf (_("'%s' returned %f"), query, value);
+        printf ("|query=%f;%s;%s;;\n", value,
+                        query_warning ? query_warning : "",
+                        query_critical ? query_critical : "");
+        return my_status;
+}
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 00b032a7..d09bd8b6 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -42,6 +42,11 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "regex.h"
 #include <pwd.h>
+#include <errno.h>
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 int process_arguments (int, char **);
 int validate_arguments (void);
@@ -65,6 +70,10 @@ int options = 0; /* bitmask of filter criteria to test against */
 #define PCPU 256
 #define ELAPSED 512
 #define EREG_ARGS 1024
+#define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads:
+                                                        ppid of procs are compared to pid of this proc*/
 /* Different metrics */
 char *metric_name;
 enum metric {
@@ -90,9 +99,21 @@ regex_t re_args;
 char *fmt;
 char *fails;
 char tmp[MAX_INPUT_BUFFER];
+int kthread_filter = 0;
+int usepid = 0; /* whether to test for pid or /proc/pid/exe */
 FILE *ps_input = NULL;
+static int
+stat_exe (const pid_t pid, struct stat *buf) {
+        char *path;
+        int ret;
+        xasprintf(&path, "/proc/%d/exe", pid);
+        ret = stat(path, buf);
+        free(path);
+        return ret;
+}
 int
 main (int argc, char **argv)
@@ -102,9 +123,13 @@ main (int argc, char **argv)
        char *procprog;
        pid_t mypid = 0;
+        struct stat statbuf;
+        dev_t mydev = 0;
+        ino_t myino = 0;
        int procuid = 0;
        pid_t procpid = 0;
        pid_t procppid = 0;
+        pid_t kthread_ppid = 0;
        int procvsz = 0;
        int procrss = 0;
        int procseconds = 0;
@@ -125,6 +150,7 @@ main (int argc, char **argv)
        int crit = 0; /* number of processes in crit state */
        int i = 0, j = 0;
        int result = STATE_UNKNOWN;
+        int ret;
        output chld_out, chld_err;
        setlocale (LC_ALL, "");
@@ -144,8 +170,16 @@ main (int argc, char **argv)
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
-        /* get our pid */
+        /* find ourself */
        mypid = getpid();
+        if (usepid || stat_exe(mypid, &statbuf) == -1) {
+                /* usepid might have been set by -T */
+                usepid = 1;
+        } else {
+                usepid = 0;
+                mydev = statbuf.st_dev;
+                myino = statbuf.st_ino;
+        }
        /* Set signal handling and alarm timeout */
        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
@@ -200,7 +234,28 @@ main (int argc, char **argv)
                                        procetime, procprog, procargs);
                        /* Ignore self */
-                        if (mypid == procpid) continue;
+                        if ((usepid && mypid == procpid) ||
+                                (!usepid && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino) ||
+                                 (ret == -1 && errno == ENOENT))) {
+                                if (verbose >= 3)
+                                         printf("not considering - is myself or gone\n");
+                                continue;
+                        }
+                        /* filter kernel threads (childs of KTHREAD_PARENT)*/
+                        /* TODO adapt for other OSes than GNU/Linux
+                                        sorry for not doing that, but I've no other OSes to test :-( */
+                        if (kthread_filter == 1) {
+                                /* get pid KTHREAD_PARENT */
+                                if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT) )
+                                        kthread_ppid = procpid;
+                                if (kthread_ppid == procppid) {
+                                        if (verbose >= 2)
+                                                printf ("Ignore kernel thread: pid=%d ppid=%d prog=%s args=%s\n", procpid, procppid, procprog, procargs);
+                                        continue;
+                                }
+                        }
                        if ((options & STAT) && (strstr (statopts, procstat)))
                                resultsum |= STAT;
@@ -332,6 +387,7 @@ process_arguments (int argc, char **argv)
                {"timeout", required_argument, 0, 't'},
                {"status", required_argument, 0, 's'},
                {"ppid", required_argument, 0, 'p'},
+                {"user", required_argument, 0, 'u'},
                {"command", required_argument, 0, 'C'},
                {"vsz", required_argument, 0, 'z'},
                {"rss", required_argument, 0, 'r'},
@@ -343,6 +399,8 @@ process_arguments (int argc, char **argv)
                {"verbose", no_argument, 0, 'v'},
                {"ereg-argument-array", required_argument, 0, CHAR_MAX+1},
                {"input-file", required_argument, 0, CHAR_MAX+2},
+                {"no-kthreads", required_argument, 0, 'k'},
+                {"traditional-filter", no_argument, 0, 'T'},
                {0, 0, 0, 0}
        };
@@ -351,7 +409,7 @@ process_arguments (int argc, char **argv)
                        strcpy (argv[c], "-t");
        while (1) {
-                c = getopt_long (argc, argv, "Vvht:c:w:p:s:u:C:a:z:r:m:P:", 
+                c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T",
                        longopts, &option);
                if (c == -1 || c == EOF)
@@ -495,9 +553,15 @@ process_arguments (int argc, char **argv)
                        }
                                
                        usage4 (_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"));
+                case 'k':       /* linux kernel thread filter */
+                        kthread_filter = 1;
+                        break;
                case 'v':                                                                       /* command */
                        verbose++;
                        break;
+                case 'T':
+                        usepid = 1;
+                        break;
                case CHAR_MAX+2:
                        input_filename = optarg;
                        break;
@@ -648,6 +712,9 @@ print_help (void)
        printf (" %s\n", "-v, --verbose");
  printf ("    %s\n", _("Extra information. Up to 3 verbosity levels"));
+  printf (" %s\n", "-T, --traditional");
+  printf ("   %s\n", _("Filter own process the traditional way by PID instead of /proc/pid/exe"));
  printf ("\n");
        printf ("%s\n", "Filters:");
  printf (" %s\n", "-s, --state=STATUSFLAGS");
@@ -670,6 +737,8 @@ print_help (void)
  printf ("   %s\n", _("Only scan for processes with args that contain the regex STRING."));
  printf (" %s\n", "-C, --command=COMMAND");
  printf ("   %s\n", _("Only scan for exact matches of COMMAND (without path)."));
+  printf (" %s\n", "-k, --no-kthreads");
+  printf ("   %s\n", _("Only scan for non kernel threads (works on Linux only)."));
        printf(_("\n\
 RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\
@@ -704,5 +773,5 @@ print_usage (void)
  printf ("%s\n", _("Usage:"));
        printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
  printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
-  printf (" [-C command] [-t timeout] [-v]\n");
+  printf (" [-C command] [-k] [-t timeout] [-v]\n");
 }
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 79fa4824..d477a51e 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -99,9 +99,9 @@ char **responses = NULL;
 char *authtype = NULL;
 char *authuser = NULL;
 char *authpass = NULL;
-int warning_time = 0;
+double warning_time = 0;
 int check_warning_time = FALSE;
-int critical_time = 0;
+double critical_time = 0;
 int check_critical_time = FALSE;
 int verbose = 0;
 int use_ssl = FALSE;
@@ -417,9 +417,9 @@ main (int argc, char **argv)
        elapsed_time = (double)microsec / 1.0e6;
        if (result == STATE_OK) {
-                if (check_critical_time && elapsed_time > (double) critical_time)
+                if (check_critical_time && elapsed_time > critical_time)
                        result = STATE_CRITICAL;
-                else if (check_warning_time && elapsed_time > (double) warning_time)
+                else if (check_warning_time && elapsed_time > warning_time)
                        result = STATE_WARNING;
        }
@@ -552,21 +552,19 @@ process_arguments (int argc, char **argv)
                        nresponses++;
                        break;
                case 'c':                                                                       /* critical time threshold */
-                        if (is_intnonneg (optarg)) {
+                        if (!is_nonnegative (optarg))
-                                critical_time = atoi (optarg);
+                                usage4 (_("Critical time must be a positive"));
-                                check_critical_time = TRUE;
-                        }
                        else {
-                                usage4 (_("Critical time must be a positive integer"));
+                                critical_time = strtod (optarg, NULL);
+                                check_critical_time = TRUE;
                        }
                        break;
                case 'w':                                                                       /* warning time threshold */
-                        if (is_intnonneg (optarg)) {
+                        if (!is_nonnegative (optarg))
-                                warning_time = atoi (optarg);
+                                usage4 (_("Warning time must be a positive"));
-                                check_warning_time = TRUE;
-                        }
                        else {
-                                usage4 (_("Warning time must be a positive integer"));
+                                warning_time = strtod (optarg, NULL);
+                                check_warning_time = TRUE;
                        }
                        break;
                case 'v':                                                                       /* verbose */
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 8a8ee180..7c3bc4b9 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -63,6 +63,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #define L_CALCULATE_RATE CHAR_MAX+1
 #define L_RATE_MULTIPLIER CHAR_MAX+2
 #define L_INVERT_SEARCH CHAR_MAX+3
+#define L_OFFSET CHAR_MAX+4
 /* Gobble to string - stop incrementing c when c[0] match one of the
 * characters in s */
@@ -138,6 +139,7 @@ char *output_delim;
 char *miblist = NULL;
 int needmibs = FALSE;
 int calculate_rate = 0;
+double offset = 0.0;
 int rate_multiplier = 1;
 state_data *previous_state;
 double previous_value[MAX_OIDS];
@@ -200,8 +202,8 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
-        labels = malloc (labels_size);
+        labels = malloc (labels_size * sizeof(*labels));
-        unitv = malloc (unitv_size);
+        unitv = malloc (unitv_size * sizeof(*unitv));
        for (i = 0; i < MAX_OIDS; i++)
                eval_method[i] = CHECK_UNDEF;
@@ -274,35 +276,36 @@ main (int argc, char **argv)
                snmpcmd = strdup (PATH_TO_SNMPGET);
        }
-        /* 9 arguments to pass before authpriv options + 1 for host and numoids. Add one for terminating NULL */
+        /* 10 arguments to pass before authpriv options + 1 for host and numoids. Add one for terminating NULL */
-        command_line = calloc (9 + numauthpriv + 1 + numoids + 1, sizeof (char *));
+        command_line = calloc (10 + numauthpriv + 1 + numoids + 1, sizeof (char *));
        command_line[0] = snmpcmd;
-        command_line[1] = strdup ("-t");
+        command_line[1] = strdup ("-Le");
-        xasprintf (&command_line[2], "%d", timeout_interval);
+        command_line[2] = strdup ("-t");
-        command_line[3] = strdup ("-r");
+        xasprintf (&command_line[3], "%d", timeout_interval);
-        xasprintf (&command_line[4], "%d", retries);
+        command_line[4] = strdup ("-r");
-        command_line[5] = strdup ("-m");
+        xasprintf (&command_line[5], "%d", retries);
-        command_line[6] = strdup (miblist);
+        command_line[6] = strdup ("-m");
-        command_line[7] = "-v";
+        command_line[7] = strdup (miblist);
-        command_line[8] = strdup (proto);
+        command_line[8] = "-v";
+        command_line[9] = strdup (proto);
        for (i = 0; i < numauthpriv; i++) {
-                command_line[9 + i] = authpriv[i];
+                command_line[10 + i] = authpriv[i];
        }
-        xasprintf (&command_line[9 + numauthpriv], "%s:%s", server_address, port);
+        xasprintf (&command_line[10 + numauthpriv], "%s:%s", server_address, port);
        /* This is just for display purposes, so it can remain a string */
-        xasprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
+        xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s %s %s:%s",
                snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
                server_address, port);
        for (i = 0; i < numoids; i++) {
-                command_line[9 + numauthpriv + 1 + i] = oids[i];
+                command_line[10 + numauthpriv + 1 + i] = oids[i];
                xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);   
        }
-        command_line[9 + numauthpriv + 1 + numoids] = NULL;
+        command_line[10 + numauthpriv + 1 + numoids] = NULL;
        if (verbose)
                printf ("%s\n", cl_hidden_auth);
@@ -429,7 +432,7 @@ main (int argc, char **argv)
                        ptr = strpbrk (show, "0123456789");
                        if (ptr == NULL)
                                die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
-                        response_value[i] = strtod (ptr, NULL);
+                        response_value[i] = strtod (ptr, NULL) + offset;
                        if(calculate_rate) {
                                if (previous_state!=NULL) {
@@ -618,6 +621,7 @@ process_arguments (int argc, char **argv)
                {"next", no_argument, 0, 'n'},
                {"rate", no_argument, 0, L_CALCULATE_RATE},
                {"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
+                {"offset", required_argument, 0, L_OFFSET},
                {"invert-search", no_argument, 0, L_INVERT_SEARCH},
                {"perf-oids", no_argument, 0, 'O'},
                {0, 0, 0, 0}
@@ -768,9 +772,9 @@ process_arguments (int argc, char **argv)
                        break;
                case 'l':                                                                       /* label */
                        nlabels++;
-                        if (nlabels >= labels_size) {
+                        if (nlabels > labels_size) {
                                labels_size += 8;
-                                labels = realloc (labels, labels_size);
+                                labels = realloc (labels, labels_size * sizeof(*labels));
                                if (labels == NULL)
                                        die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                        }
@@ -780,13 +784,13 @@ process_arguments (int argc, char **argv)
                        if (ptr[0] == '\'')
                                labels[nlabels - 1] = ptr + 1;
                        while (ptr && (ptr = nextarg (ptr))) {
-                                if (nlabels >= labels_size) {
+                                nlabels++;
+                                if (nlabels > labels_size) {
                                        labels_size += 8;
-                                        labels = realloc (labels, labels_size);
+                                        labels = realloc (labels, labels_size * sizeof(*labels));
                                        if (labels == NULL)
                                                die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                }
-                                nlabels++;
                                ptr = thisarg (ptr);
                                if (ptr[0] == '\'')
                                        labels[nlabels - 1] = ptr + 1;
@@ -797,9 +801,9 @@ process_arguments (int argc, char **argv)
                case 'u':                                                                       /* units */
                        units = optarg;
                        nunits++;
-                        if (nunits >= unitv_size) {
+                        if (nunits > unitv_size) {
                                unitv_size += 8;
-                                unitv = realloc (unitv, unitv_size);
+                                unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                if (unitv == NULL)
                                        die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                        }
@@ -809,9 +813,9 @@ process_arguments (int argc, char **argv)
                        if (ptr[0] == '\'')
                                unitv[nunits - 1] = ptr + 1;
                        while (ptr && (ptr = nextarg (ptr))) {
-                                if (nunits >= unitv_size) {
+                                if (nunits > unitv_size) {
                                        unitv_size += 8;
-                                        unitv = realloc (unitv, unitv_size);
+                                        unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                        if (units == NULL)
                                                die (STATE_UNKNOWN, _("Could not realloc() units\n"));
                                }
@@ -832,6 +836,9 @@ process_arguments (int argc, char **argv)
                        if(!is_integer(optarg)||((rate_multiplier=atoi(optarg))<=0))
                                usage2(_("Rate multiplier must be a positive integer"),optarg);
                        break;
+                case L_OFFSET:
+                        offset=strtod(optarg,NULL);
+                        break;
                case L_INVERT_SEARCH:
                        invert_search=1;
                        break;
@@ -1080,6 +1087,8 @@ print_help (void)
        printf ("    %s\n", _("Enable rate calculation. See 'Rate Calculation' below"));
        printf (" %s\n", "--rate-multiplier");
        printf ("    %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
+        printf (" %s\n", "--offset=OFFSET");
+        printf ("    %s\n", _("Add/substract the specified OFFSET to numeric sensor data"));
        /* Tests Against Strings */
        printf (" %s\n", "-s, --string=STRING");
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index af3ae241..ce966c38 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,30 +1,30 @@
 /*****************************************************************************
-* 
+*
 * Nagios check_tcp plugin
-* 
+*
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains the check_tcp plugin
-* 
+*
-* 
+*
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * $Id$
-* 
+*
 *****************************************************************************/
 /* progname "check_tcp" changes depending on symlink called */
@@ -61,6 +61,7 @@ static int PORT = 0;
 static int server_port = 0;
 static char *server_address = NULL;
+static int host_specified = FALSE;
 static char *server_send = NULL;
 static char *server_quit = NULL;
 static char **server_expect;
@@ -462,6 +463,7 @@ process_arguments (int argc, char **argv)
 #endif
                        break;
                case 'H':                 /* hostname */
+                        host_specified = TRUE;
                        server_address = optarg;
                        break;
                case 'c':                 /* critical */
@@ -588,6 +590,10 @@ process_arguments (int argc, char **argv)
                }
        }
+        c = optind;
+        if(host_specified == FALSE && c < argc)
+                server_address = strdup (argv[c++]);
        if (server_address == NULL)
                usage4 (_("You must provide a server address"));
        else if (server_address[0] != '/' && is_host (server_address) == FALSE)
@@ -666,4 +672,3 @@ print_usage (void)
  printf ("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");
  printf ("[-D <warn days cert expire>[,<crit days cert expire>]] [-S <use SSL>] [-E]\n");
 }
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 7574b121..8aba1e33 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -256,7 +256,7 @@ np_runcmd_close(int fd)
 void
-popen_timeout_alarm_handler (int signo)
+runcmd_timeout_alarm_handler (int signo)
 {
        size_t i;
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index 211dee2c..5957562b 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -39,7 +39,7 @@ typedef struct output output;
 /** prototypes **/
 int np_runcmd(const char *, output *, output *, int);
-void popen_timeout_alarm_handler(int)
+void runcmd_timeout_alarm_handler(int)
        __attribute__((__noreturn__));
 /* only multi-threaded plugins need to bother with this */
diff --git a/plugins/t/check_apt.t b/plugins/t/check_apt.t
new file mode 100644
index 00000000..9ba0ff8e
--- /dev/null
+++ b/plugins/t/check_apt.t
@@ -0,0 +1,90 @@
+#!/usr/bin/perl -w -I ..
+#
+# Test check_apt using input files.
+# Contributed by Alex Bradley, October 2012
+#
+use strict;
+use Test::More;
+use NPTest;
+sub make_result_regexp {
+    my ($warning, $critical) = @_;
+    my $status;
+    if ($warning == 0 && $critical == 0) {
+        $status = "OK";
+    } elsif ($critical == 0) {
+        $status = "WARNING";
+    } else {
+        $status = "CRITICAL";
+    }
+    return sprintf('/^APT %s: %d packages available for upgrade \(%d critical updates\)\. |available_upgrades=%d;;;0 critical_updates=%d;;;0$/',
+        $status, $warning, $critical, $warning, $critical);
+}
+if (-x "./check_apt") {
+        plan tests => 28;
+} else {
+        plan skip_all => "No check_apt compiled";
+}
+my $result;
+my $testfile_command = "./check_apt %s --input-file=t/check_apt_input/%s";
+$result = NPTest->testCmd( sprintf($testfile_command, "", "debian1") );
+is( $result->return_code, 0, "No upgrades" );
+like( $result->output, make_result_regexp(0, 0), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "", "debian2") );
+is( $result->return_code, 1, "Debian apt output, warning" );
+like( $result->output, make_result_regexp(13, 0), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "", "debian3") );
+is( $result->return_code, 2, "Debian apt output, some critical" );
+like( $result->output, make_result_regexp(19, 4), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-c '^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)'", "debian3") );
+is( $result->return_code, 2, "Debian apt output - should have same result when default security regexp specified via -c" );
+like( $result->output, make_result_regexp(19, 4), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-i libc6", "debian3") );
+is( $result->return_code, 1, "Debian apt output, filter for libc6" );
+like( $result->output, make_result_regexp(3, 0), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-i libc6 -i xen", "debian3") );
+is( $result->return_code, 2, "Debian apt output, filter for libc6 and xen" );
+like( $result->output, make_result_regexp(9, 4), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-i libc6 -i xen -i linux", "debian3") );
+is( $result->return_code, 2, "Debian apt output, filter for libc6, xen, linux" );
+like( $result->output, make_result_regexp(12, 4), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-e libc6", "debian3") );
+is( $result->return_code, 2, "Debian apt output, filter out libc6" );
+like( $result->output, make_result_regexp(16, 4), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-e libc6 -e xen", "debian3") );
+is( $result->return_code, 1, "Debian apt output, filter out libc6 and xen" );
+like( $result->output, make_result_regexp(10, 0), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-e libc6 -e xen -e linux", "debian3") );
+is( $result->return_code, 1, "Debian apt output, filter out libc6, xen, linux" );
+like( $result->output, make_result_regexp(7, 0), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-c Debian-Security -c linux", "debian3") );
+is( $result->return_code, 2, "Debian apt output, critical on Debian-Security or linux" );
+like( $result->output, make_result_regexp(19, 9), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "-i lib -i linux -e gc1c -c linux-image", "debian3") );
+is( $result->return_code, 2, "Debian apt output, include lib and linux, exclude gc1c, critical on linux-image" );
+like( $result->output, make_result_regexp(10, 2), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "", "ubuntu1") );
+is( $result->return_code, 1, "Ubuntu apt output, warning" );
+like( $result->output, make_result_regexp(5, 0), "Output correct" );
+$result = NPTest->testCmd( sprintf($testfile_command, "", "ubuntu2") );
+is( $result->return_code, 2, "Ubuntu apt output, some critical" );
+like( $result->output, make_result_regexp(25, 14), "Output correct" );
diff --git a/plugins/t/check_apt_input/debian1 b/plugins/t/check_apt_input/debian1
new file mode 100644
index 00000000..317e7ea7
--- /dev/null
+++ b/plugins/t/check_apt_input/debian1
@@ -0,0 +1,4 @@
+NOTE: This is only a simulation!
+      apt-get needs root privileges for real execution.
+      Keep also in mind that locking is deactivated,
+      so don't depend on the relevance to the real current situation!
diff --git a/plugins/t/check_apt_input/debian2 b/plugins/t/check_apt_input/debian2
new file mode 100644
index 00000000..effd1553
--- /dev/null
+++ b/plugins/t/check_apt_input/debian2
@@ -0,0 +1,37 @@
+NOTE: This is only a simulation!
+      apt-get needs root privileges for real execution.
+      Keep also in mind that locking is deactivated,
+      so don't depend on the relevance to the real current situation!
+Reading package lists... Done
+Building dependency tree       
+Reading state information... Done
+The following packages will be upgraded:
+  base-files debian-archive-keyring dpkg firmware-linux-free libc-bin libc-dev-bin libc6 libc6-dev linux-base
+  linux-image-2.6.32-5-xen-amd64 linux-libc-dev locales lockfile-progs
+13 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst base-files [6.0squeeze5] (6.0squeeze6 Debian:6.0.6/stable [amd64])
+Conf base-files (6.0squeeze6 Debian:6.0.6/stable [amd64])
+Inst dpkg [1.15.8.12] (1.15.8.13 Debian:6.0.6/stable [amd64])
+Conf dpkg (1.15.8.13 Debian:6.0.6/stable [amd64])
+Inst linux-base [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [all])
+Inst linux-image-2.6.32-5-xen-amd64 [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [amd64])
+Inst debian-archive-keyring [2010.08.28] (2010.08.28+squeeze1 Debian:6.0.6/stable [all])
+Conf debian-archive-keyring (2010.08.28+squeeze1 Debian:6.0.6/stable [all])
+Inst libc6-dev [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64]) []
+Inst libc-dev-bin [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64]) []
+Inst linux-libc-dev [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [amd64]) []
+Inst libc-bin [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64]) [libc6:amd64 ]
+Conf libc-bin (2.11.3-4 Debian:6.0.6/stable [amd64]) [libc6:amd64 ]
+Inst libc6 [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64])
+Conf libc6 (2.11.3-4 Debian:6.0.6/stable [amd64])
+Inst locales [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [all])
+Inst firmware-linux-free [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [all])
+Inst lockfile-progs [0.1.15] (0.1.15+squeeze1 Debian:6.0.6/stable [amd64])
+Conf linux-base (2.6.32-46 Debian:6.0.6/stable [all])
+Conf linux-image-2.6.32-5-xen-amd64 (2.6.32-46 Debian:6.0.6/stable [amd64])
+Conf libc-dev-bin (2.11.3-4 Debian:6.0.6/stable [amd64])
+Conf linux-libc-dev (2.6.32-46 Debian:6.0.6/stable [amd64])
+Conf libc6-dev (2.11.3-4 Debian:6.0.6/stable [amd64])
+Conf locales (2.11.3-4 Debian:6.0.6/stable [all])
+Conf firmware-linux-free (2.6.32-46 Debian:6.0.6/stable [all])
+Conf lockfile-progs (0.1.15+squeeze1 Debian:6.0.6/stable [amd64])
diff --git a/plugins/t/check_apt_input/debian3 b/plugins/t/check_apt_input/debian3
new file mode 100644
index 00000000..719dce9b
--- /dev/null
+++ b/plugins/t/check_apt_input/debian3
@@ -0,0 +1,42 @@
+NOTE: This is only a simulation!
+      apt-get needs root privileges for real execution.
+      Keep also in mind that locking is deactivated,
+      so don't depend on the relevance to the real current situation!
+Inst base-files [6.0squeeze5] (6.0squeeze6 Debian:6.0.6/stable [amd64])
+Conf base-files (6.0squeeze6 Debian:6.0.6/stable [amd64])
+Inst dpkg [1.15.8.12] (1.15.8.13 Debian:6.0.6/stable [amd64])
+Conf dpkg (1.15.8.13 Debian:6.0.6/stable [amd64])
+Inst linux-base [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [all])
+Inst linux-image-2.6.32-5-amd64 [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [amd64])
+Inst xen-hypervisor-4.0-amd64 [4.0.1-5.3] (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Inst xen-linux-system-2.6.32-5-xen-amd64 [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [amd64]) []
+Inst linux-image-2.6.32-5-xen-amd64 [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [amd64])
+Inst debian-archive-keyring [2010.08.28] (2010.08.28+squeeze1 Debian:6.0.6/stable [all])
+Conf debian-archive-keyring (2010.08.28+squeeze1 Debian:6.0.6/stable [all])
+Inst libc6-i386 [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64]) []
+Inst libc-bin [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64]) [libc6:amd64 ]
+Conf libc-bin (2.11.3-4 Debian:6.0.6/stable [amd64]) [libc6:amd64 ]
+Inst libc6 [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [amd64])
+Conf libc6 (2.11.3-4 Debian:6.0.6/stable [amd64])
+Inst libgc1c2 [1:6.8-1.2] (1:6.8-2 Debian:6.0.6/stable [amd64])
+Inst locales [2.11.3-3] (2.11.3-4 Debian:6.0.6/stable [all])
+Inst firmware-linux-free [2.6.32-45] (2.6.32-46 Debian:6.0.6/stable [all])
+Inst libxenstore3.0 [4.0.1-5.3] (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Inst lockfile-progs [0.1.15] (0.1.15+squeeze1 Debian:6.0.6/stable [amd64])
+Inst xen-utils-4.0 [4.0.1-5.3] (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Inst xenstore-utils [4.0.1-5.3] (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Inst libconfig-inifiles-perl [2.52-1] (2.52-1+squeeze1 Debian:6.0.6/stable [all])
+Conf linux-base (2.6.32-46 Debian:6.0.6/stable [all])
+Conf linux-image-2.6.32-5-amd64 (2.6.32-46 Debian:6.0.6/stable [amd64])
+Conf xen-hypervisor-4.0-amd64 (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Conf linux-image-2.6.32-5-xen-amd64 (2.6.32-46 Debian:6.0.6/stable [amd64])
+Conf xen-linux-system-2.6.32-5-xen-amd64 (2.6.32-46 Debian:6.0.6/stable [amd64])
+Conf libc6-i386 (2.11.3-4 Debian:6.0.6/stable [amd64])
+Conf libgc1c2 (1:6.8-2 Debian:6.0.6/stable [amd64])
+Conf locales (2.11.3-4 Debian:6.0.6/stable [all])
+Conf firmware-linux-free (2.6.32-46 Debian:6.0.6/stable [all])
+Conf libxenstore3.0 (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Conf lockfile-progs (0.1.15+squeeze1 Debian:6.0.6/stable [amd64])
+Conf xen-utils-4.0 (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Conf xenstore-utils (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable [amd64])
+Conf libconfig-inifiles-perl (2.52-1+squeeze1 Debian:6.0.6/stable [all])
diff --git a/plugins/t/check_apt_input/ubuntu1 b/plugins/t/check_apt_input/ubuntu1
new file mode 100644
index 00000000..2f61c30e
--- /dev/null
+++ b/plugins/t/check_apt_input/ubuntu1
@@ -0,0 +1,14 @@
+NOTE: This is only a simulation!
+      apt-get needs root privileges for real execution.
+      Also keep in mind that locking is deactivated,
+      so don't depend on the relevance to the real current situation!
+Inst grub-pc [1.99-21ubuntu3.1] (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64]) []
+Inst grub-pc-bin [1.99-21ubuntu3.1] (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64]) []
+Inst grub2-common [1.99-21ubuntu3.1] (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64]) []
+Inst grub-efi-amd64-bin [1.99-21ubuntu3.1] (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64]) []
+Inst grub-common [1.99-21ubuntu3.1] (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64])
+Conf grub-common (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64])
+Conf grub2-common (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64])
+Conf grub-pc-bin (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64])
+Conf grub-pc (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64])
+Conf grub-efi-amd64-bin (1.99-21ubuntu3.4 Ubuntu:12.04/precise-updates [amd64])
diff --git a/plugins/t/check_apt_input/ubuntu2 b/plugins/t/check_apt_input/ubuntu2
new file mode 100644
index 00000000..29a14a02
--- /dev/null
+++ b/plugins/t/check_apt_input/ubuntu2
@@ -0,0 +1,54 @@
+NOTE: This is only a simulation!
+      apt-get needs root privileges for real execution.
+      Also keep in mind that locking is deactivated,
+      so don't depend on the relevance to the real current situation!
+Inst libc6-dev [2.15-0ubuntu10] (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64]) []
+Inst libc-dev-bin [2.15-0ubuntu10] (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64]) []
+Inst linux-libc-dev [3.2.0-29.46] (3.2.0-31.50 Ubuntu:12.04/precise-security [amd64]) []
+Inst tzdata [2012e-0ubuntu0.12.04] (2012e-0ubuntu0.12.04.1 Ubuntu:12.04/precise-security [all]) []
+Conf tzdata (2012e-0ubuntu0.12.04.1 Ubuntu:12.04/precise-security [all]) []
+Inst libc-bin [2.15-0ubuntu10] (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64]) [libc6:amd64 ]
+Conf libc-bin (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64]) [libc6:amd64 ]
+Inst libc6 [2.15-0ubuntu10] (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64])
+Conf libc6 (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64])
+Inst libapt-pkg4.12 [0.8.16~exp12ubuntu10.2] (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Conf libapt-pkg4.12 (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Inst ubuntu-keyring [2011.11.21] (2011.11.21.1 Ubuntu:12.04/precise-updates [all])
+Conf ubuntu-keyring (2011.11.21.1 Ubuntu:12.04/precise-updates [all])
+Inst gpgv [1.4.11-3ubuntu2] (1.4.11-3ubuntu2.1 Ubuntu:12.04/precise-security [amd64])
+Conf gpgv (1.4.11-3ubuntu2.1 Ubuntu:12.04/precise-security [amd64])
+Inst gnupg [1.4.11-3ubuntu2] (1.4.11-3ubuntu2.1 Ubuntu:12.04/precise-security [amd64])
+Conf gnupg (1.4.11-3ubuntu2.1 Ubuntu:12.04/precise-security [amd64])
+Inst apt [0.8.16~exp12ubuntu10.2] (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Conf apt (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Inst libssl1.0.0 [1.0.1-4ubuntu5.3] (1.0.1-4ubuntu5.5 Ubuntu:12.04/precise-updates [amd64])
+Conf libssl1.0.0 (1.0.1-4ubuntu5.5 Ubuntu:12.04/precise-updates [amd64])
+Inst libapt-inst1.4 [0.8.16~exp12ubuntu10.2] (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Inst resolvconf [1.63ubuntu15] (1.63ubuntu16 Ubuntu:12.04/precise-updates [all])
+Inst libdbus-1-3 [1.4.18-1ubuntu1] (1.4.18-1ubuntu1.1 Ubuntu:12.04/precise-security [amd64])
+Inst libxml2 [2.7.8.dfsg-5.1ubuntu4.1] (2.7.8.dfsg-5.1ubuntu4.2 Ubuntu:12.04/precise-security [amd64])
+Inst multiarch-support [2.15-0ubuntu10] (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64])
+Conf multiarch-support (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64])
+Inst apt-utils [0.8.16~exp12ubuntu10.2] (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Inst isc-dhcp-client [4.1.ESV-R4-0ubuntu5.2] (4.1.ESV-R4-0ubuntu5.5 Ubuntu:12.04/precise-security [amd64]) []
+Inst isc-dhcp-common [4.1.ESV-R4-0ubuntu5.2] (4.1.ESV-R4-0ubuntu5.5 Ubuntu:12.04/precise-security [amd64])
+Inst dbus [1.4.18-1ubuntu1] (1.4.18-1ubuntu1.1 Ubuntu:12.04/precise-security [amd64])
+Inst linux-firmware [1.79] (1.79.1 Ubuntu:12.04/precise-updates [all])
+Inst xserver-common [2:1.11.4-0ubuntu10.7] (2:1.11.4-0ubuntu10.8 Ubuntu:12.04/precise-updates [all])
+Inst xserver-xorg-core [2:1.11.4-0ubuntu10.7] (2:1.11.4-0ubuntu10.8 Ubuntu:12.04/precise-updates [amd64])
+Inst xserver-xorg-input-synaptics [1.6.2-1ubuntu1~precise1] (1.6.2-1ubuntu1~precise2 Ubuntu:12.04/precise-updates [amd64])
+Conf libc-dev-bin (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64])
+Conf linux-libc-dev (3.2.0-31.50 Ubuntu:12.04/precise-security [amd64])
+Conf libc6-dev (2.15-0ubuntu10.2 Ubuntu:12.04/precise-security [amd64])
+Conf libapt-inst1.4 (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Conf resolvconf (1.63ubuntu16 Ubuntu:12.04/precise-updates [all])
+Conf libdbus-1-3 (1.4.18-1ubuntu1.1 Ubuntu:12.04/precise-security [amd64])
+Conf libxml2 (2.7.8.dfsg-5.1ubuntu4.2 Ubuntu:12.04/precise-security [amd64])
+Conf apt-utils (0.8.16~exp12ubuntu10.3 Ubuntu:12.04/precise-updates [amd64])
+Conf isc-dhcp-common (4.1.ESV-R4-0ubuntu5.5 Ubuntu:12.04/precise-security [amd64])
+Conf isc-dhcp-client (4.1.ESV-R4-0ubuntu5.5 Ubuntu:12.04/precise-security [amd64])
+Conf dbus (1.4.18-1ubuntu1.1 Ubuntu:12.04/precise-security [amd64])
+Conf linux-firmware (1.79.1 Ubuntu:12.04/precise-updates [all])
+Conf xserver-common (2:1.11.4-0ubuntu10.8 Ubuntu:12.04/precise-updates [all])
+Conf xserver-xorg-core (2:1.11.4-0ubuntu10.8 Ubuntu:12.04/precise-updates [amd64])
+Conf xserver-xorg-input-synaptics (1.6.2-1ubuntu1~precise2 Ubuntu:12.04/precise-updates [amd64])
diff --git a/plugins/t/check_dig.t b/plugins/t/check_dig.t
index 323859e8..1ab4b426 100644
--- a/plugins/t/check_dig.t
+++ b/plugins/t/check_dig.t
@@ -10,30 +10,30 @@ use NPTest;
 plan skip_all => "check_dig not compiled" unless (-x "check_dig");
-plan tests => 12;
+plan tests => 16;
 my $successOutput = '/DNS OK - [\.0-9]+ seconds? response time/';
-my $hostname_valid = getTestParameter( 
+my $hostname_valid = getTestParameter(
                        "NP_HOSTNAME_VALID",
                        "A valid (known to DNS) hostname",
-                        "nagios.com"
+                        "nagiosplugins.org"
                        );
 my $hostname_valid_ip = getTestParameter(
                        "NP_HOSTNAME_VALID_IP",
                        "The IP address of the valid hostname $hostname_valid",
-                        "66.118.156.50",
+                        "67.207.143.200",
                        );
 my $hostname_valid_reverse = getTestParameter(
                        "NP_HOSTNAME_VALID_REVERSE",
                        "The hostname of $hostname_valid_ip",
-                        "66-118-156-50.static.sagonet.net.",
+                        "nagiosplugins.org.",
                        );
-my $hostname_invalid = getTestParameter( 
+my $hostname_invalid = getTestParameter(
-                        "NP_HOSTNAME_INVALID", 
+                        "NP_HOSTNAME_INVALID",
                        "An invalid (not known to DNS) hostname",
                        "nosuchhost.altinity.com",
                        );
@@ -69,6 +69,14 @@ SKIP: {
        cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
        like  ( $res->output, $successOutput, "Output OK" );
+        $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid  -t 5 -4");
+        cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
+        like  ( $res->output, $successOutput, "Output OK for IPv4" );
+        $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid  -t 5 -6");
+        cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
+        like  ( $res->output, $successOutput, "Output OK for IPv6" );
        $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -a $hostname_valid_ip -t 5");
        cmp_ok( $res->return_code, '==', 0, "Got expected address");
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 0a25c775..9948c539 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -8,22 +8,22 @@ use strict;
 use Test::More;
 use NPTest;
-plan tests => 28;
+plan tests => 30;
 my $successOutput = '/OK.*HTTP.*second/';
 my $res;
-my $host_tcp_http      = getTestParameter( "NP_HOST_TCP_HTTP", 
+my $host_tcp_http      = getTestParameter( "NP_HOST_TCP_HTTP",
-                "A host providing the HTTP Service (a web server)", 
+                "A host providing the HTTP Service (a web server)",
                "localhost" );
-my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", 
+my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE",
                "The hostname of system not responsive to network requests",
                "10.0.0.1" );
-my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID", 
+my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
-                "An invalid (not known to DNS) hostname",  
+                "An invalid (not known to DNS) hostname",
                "nosuchhost");
 my $internet_access = getTestParameter( "NP_INTERNET_ACCESS",
@@ -32,8 +32,8 @@ my $internet_access = getTestParameter( "NP_INTERNET_ACCESS",
 my $host_tcp_http2;
 if ($internet_access eq "no") {
-    $host_tcp_http2     = getTestParameter( "NP_HOST_TCP_HTTP2", 
+    $host_tcp_http2     = getTestParameter( "NP_HOST_TCP_HTTP2",
-            "A host providing an index page containing the string 'nagios'", 
+            "A host providing an index page containing the string 'nagios'",
            "www.nagios.com" );
 }
@@ -45,14 +45,9 @@ cmp_ok( $res->return_code, '==', 0, "Webserver $host_tcp_http responded" );
 like( $res->output, $successOutput, "Output OK" );
 $res = NPTest->testCmd(
-        "./check_http $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there;fred:here'"
+        "./check_http $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there' -k 'carl:frown'"
        );
-like( $res->output, '/bob:there\r\nfred:here\r\n/', "Got headers, delimited with ';'" );
+like( $res->output, '/bob:there\r\ncarl:frown\r\n/', "Got headers with multiple -k options" );
-$res = NPTest->testCmd(
-        "./check_http $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there;fred:here' -k 'carl:frown'"
-        );
-like( $res->output, '/bob:there\r\nfred:here\r\ncarl:frown\r\n/', "Got headers with multiple -k options" );
 $res = NPTest->testCmd(
        "./check_http $host_nonresponsive -wt 1 -ct 2"
@@ -123,6 +118,10 @@ SKIP: {
        $res = NPTest->testCmd( "./check_http www.verisign.com -C 1" );
        cmp_ok( $res->output, 'eq', $saved_cert_output, "Old syntax for cert checking still works");
+        $res = NPTest->testCmd( "./check_http --ssl www.verisign.com -E" );
+        like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
+        like  ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' );
        $res = NPTest->testCmd(
                "./check_http --ssl www.e-paycobalt.com"
                );
@@ -131,4 +130,7 @@ SKIP: {
        $res = NPTest->testCmd( "./check_http -H www.mozilla.com -u /firefox -f follow" );
        is( $res->return_code, 0, "Redirection based on location is okay");
+        $res = NPTest->testCmd( "./check_http -H www.mozilla.com --extended-perfdata" );
+        like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
 }
diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t
index 30f02488..a1a28836 100644
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
@@ -20,7 +20,7 @@ my $result;
 $result = NPTest->testCmd( "./check_procs -w 100000 -c 100000" );
 is( $result->return_code, 0, "Checking less than 10000 processes" );
-like( $result->output, '/^PROCS OK: [0-9]+ process(es)?$/', "Output correct" );
+like( $result->output, '/^PROCS OK: [0-9]+ process(es)? | procs=[0-9]+;100000;100000;0;$/', "Output correct" );
 $result = NPTest->testCmd( "./check_procs -w 100000 -c 100000 -s Z" );
 is( $result->return_code, 0, "Checking less than 100000 zombie processes" );
@@ -28,11 +28,11 @@ like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct
 $result = NPTest->testCmd( "./check_procs -w 0 -c 100000" );
 is( $result->return_code, 1, "Checking warning if processes > 0" );
-like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)?$/', "Output correct" );
+like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" );
 $result = NPTest->testCmd( "./check_procs -w 0 -c 0" );
 is( $result->return_code, 2, "Checking critical if processes > 0" );
-like( $result->output, '/^PROCS CRITICAL: [0-9]+ process(es)?$/', "Output correct" );
+like( $result->output, '/^PROCS CRITICAL: [0-9]+ process(es)? | procs=[0-9]+;0;0;0;$/', "Output correct" );
 $result = NPTest->testCmd( "./check_procs -w 0 -c 0 -s S" );
 is( $result->return_code, 2, "Checking critical if sleeping processes" );
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index 75c1e5fb..d6808bf2 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -9,7 +9,7 @@ use Test;
 use NPTest;
 use vars qw($tests);
-BEGIN {$tests = 7; plan tests => $tests}
+BEGIN {$tests = 14; plan tests => $tests}
 my $host_tcp_http      = getTestParameter( "host_tcp_http",      "NP_HOST_TCP_HTTP",      "localhost",
                                           "A host providing the HTTP Service (a web server)" );
@@ -27,6 +27,7 @@ my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on po
 my $t;
 $t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -wt 300 -ct 600",       0, $successOutput );
+$t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -wt 300 -ct 600 -6 ",   0, $successOutput );
 $t += checkCmd( "./check_tcp $host_tcp_http      -p 81 -wt   0 -ct   0 -to 1", 2 ); # use invalid port for this test
 $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt   0 -ct   0 -to 1", 2 );
 $t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -wt   0 -ct   0 -to 1", 2 );
@@ -34,6 +35,7 @@ $t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443",              0
 $t += checkCmd( "./check_tcp -S -D 9000,1    -H www.verisign.com -p 443",      0 );
 $t += checkCmd( "./check_tcp -S -D 9000      -H www.verisign.com -p 443",      1 );
 $t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443",      2 );
+$t += checkCmd( "./check_tcp -6 -p 80 www.heise.de",                           0 );
 # Need the \r\n to make it more standards compliant with web servers. Need the various quotes
 # so that perl doesn't interpret the \r\n and is passed onto command line correctly
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index 9f97abdc..c3085e13 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -17,7 +17,7 @@ use Test::More;
 use NPTest;
 use FindBin qw($Bin);
-my $common_tests = 66;
+my $common_tests = 70;
 my $ssl_only_tests = 8;
 # Check that all dependent modules are available
 eval {
@@ -151,6 +151,10 @@ sub run_server {
                                unshift @persist, $c;
                                delete($persist[1000]);
                                next MAINLOOP;
+                        } elsif ($r->url->path eq "/header_check") {
+                                $c->send_basic_header;
+                                $c->send_header('foo');
+                                $c->send_crlf;
                        } else {
                                $c->send_error(HTTP::Status->RC_FORBIDDEN);
                        }
@@ -223,6 +227,13 @@ sub run_common_tests {
        is( $result->return_code, 2, "Missing string check");
        like( $result->output, qr%HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        $result = NPTest->testCmd( "$command -u /header_check -d foo" );
+        is( $result->return_code, 0, "header_check search for string");
+        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second/', "Output correct" );
+        $result = NPTest->testCmd( "$command -u /header_check -d bar" );
+        is( $result->return_code, 2, "Missing header string check");
+        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
        my $cmd;
        $cmd = "$command -u /slow";