Import Nagios Plugins site

Import the Nagios Plugins web site, Cronjobs, infrastructure scripts,
and configuration files.

627 files changed, 81295 insertions, 0 deletions

diff --git a/web/attachments/101025-check_ntp.patch b/web/attachments/101025-check_ntp.patch
new file mode 100644
index 0000000..373d521
--- /dev/null
+++ b/web/attachments/101025-check_ntp.patch
@@ -0,0 +1,40 @@
+Index: check_ntp.pl

+===================================================================

+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-scripts/check_ntp.pl,v

+retrieving revision 1.19

+diff -u -w -r1.19 check_ntp.pl

+--- check_ntp.pl        14 Oct 2003 02:40:31 -0000      1.19

++++ check_ntp.pl        10 Sep 2004 15:01:45 -0000

+@@ -358,13 +358,13 @@

+ } elsif( !$have_ntpq ) { # no errors from ntpdate and no ntpq or ntpq timed out

+        if (abs($offset) > $ocrit) {

+                $state = $ERRORS{'CRITICAL'};

+-               $answer = "Offset $offset msec > +/- $ocrit sec\n";

++               $answer = "Offset $offset sec > +/- $ocrit sec\n";

+        } elsif (abs($offset) > $owarn) {

+                $state = $ERRORS{'WARNING'};

+-               $answer = "Offset $offset msec > +/- $owarn sec\n";

++               $answer = "Offset $offset sec > +/- $owarn sec\n";

+        } elsif (( abs($offset) > $owarn) && $def_jitter ) {

+                $state = $ERRORS{'WARNING'};

+-               $answer = "Offset $offset msec > +/- $owarn sec, ntpq timed out\n";

++               $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out\n";

+        } elsif ( $def_jitter ) {

+                $state = $ERRORS{'WARNING'};

+                $answer = "Offset $offset secs, ntpq timed out\n";

+@@ -378,13 +378,13 @@

+ } else { # no errors from ntpdate or ntpq

+        if (abs($offset) > $ocrit) {

+                $state = $ERRORS{'CRITICAL'};

+-               $answer = "Offset $offset msec > +/- $ocrit sec, jitter $jitter msec\n";

++               $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec\n";

+        } elsif (abs($jitter) > $jcrit ) {

+                $state = $ERRORS{'CRITICAL'};

+                $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec \n";

+        } elsif (abs($offset) > $owarn) {

+                $state = $ERRORS{'WARNING'};

+-               $answer = "Offset $offset msec > +/- $owarn sec, jitter $jitter msec\n";

++               $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec\n";

+        } elsif (abs($jitter) > $jwarn ) {

+                $state = $ERRORS{'WARNING'};

+                $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec \n";

diff --git a/web/attachments/101069-check_swap.diff.txt b/web/attachments/101069-check_swap.diff.txt
new file mode 100644
index 0000000..24cfdad
--- /dev/null
+++ b/web/attachments/101069-check_swap.diff.txt
@@ -0,0 +1,18 @@
+49c49

+< char tmp_status[MAX_INPUT_BUFFER];

+---

+>

+197c197

+<                               printf (_("total=%llu, free=%llu\n"), dsktotal,

+dskfree);

+---

+>                               printf (_("total=%d, free=%d\n"), dsktotal, dskf

+ree);

+314,315c314,315

+<       sprintf (tmp_status, _(" %d%% free (%llu MB out of %llu MB)"),

+<                                               (100 - percent_used), free_swap,

+ total_swap);

+---

+>       asprintf (&tmp_status, _(" %d%% free (%llu MB out of %llu MB)"),

+>                                               (100 - percent_used), free_swap,

+ total_swap);

diff --git a/web/attachments/101436-check_oracle b/web/attachments/101436-check_oracle
new file mode 100644
index 0000000..16fb473
--- /dev/null
+++ b/web/attachments/101436-check_oracle
@@ -0,0 +1,284 @@
+#! /bin/bash
+#
+# latigid010@yahoo.com
+# 01/06/2000
+#
+#  This Nagios plugin was created to check Oracle status
+#
+
+PROGNAME=`basename $0`
+PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+REVISION=`echo '$Revision: 1.12 $' | sed -e 's/[^0-9.]//g'`
+
+. $PROGPATH/utils.sh
+
+
+print_usage() {
+  echo "Usage:"
+  echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+  echo "  $PROGNAME --db <ORACLE_SID>"
+  echo "  $PROGNAME --login <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>"
+  echo "  $PROGNAME --help"
+  echo "  $PROGNAME --version"
+}
+
+print_help() {
+  print_revision $PROGNAME $REVISION
+  echo ""
+  print_usage
+  echo ""
+  echo "Check Oracle status"
+  echo ""
+  echo "--tns SID/IP Address"
+  echo "   Check remote TNS server"
+  echo "--db SID"
+  echo "   Check local database (search /bin/ps for PMON process) and check"
+  echo "   filesystem for sgadefORACLE_SID.dbf"
+  echo "--login SID"
+  echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+  echo "--cache"
+  echo "   Check local database for library and buffer cache hit ratios"
+  echo "       --->  Requires Oracle user/password and SID specified."
+  echo "                --->  Requires select on v_$sysstat and v_$librarycache"
+  echo "--tablespace"
+  echo "   Check local database for tablespace capacity in ORACLE_SID"
+  echo "       --->  Requires Oracle user/password specified."
+  echo "                --->  Requires select on dba_data_files and dba_free_space"
+  echo "--oranames Hostname"
+  echo "   Check remote Oracle Names server"
+  echo "--help"
+  echo "   Print this help screen"
+  echo "--version"
+  echo "   Print version and license information"
+  echo ""
+  echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+  echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+  echo "tnsnames.ora file is locatable and is properly configured."
+  echo ""
+  echo "When checking local database status your ORACLE_SID is case sensitive."
+  echo ""
+  echo "If you want to use a default Oracle home, add in your oratab file:"
+  echo "*:/opt/app/oracle/product/7.3.4:N"
+  echo ""
+  support
+}
+
+case "$1" in
+1)
+    cmd='--tns'
+    ;;
+2)
+    cmd='--db'
+    ;;
+*)
+    cmd="$1"
+    ;;
+esac
+
+# Information options
+case "$cmd" in
+--help)
+                print_help
+    exit $STATE_OK
+    ;;
+-h)
+                print_help
+    exit $STATE_OK
+    ;;
+--version)
+                print_revision $PLUGIN $REVISION
+    exit $STATE_OK
+    ;;
+-V)
+                print_revision $PLUGIN $REVISION
+    exit $STATE_OK
+    ;;
+esac
+
+# Hunt down a reasonable ORACLE_HOME
+if [ -z "$ORACLE_HOME" ] ; then
+        # Adjust to taste
+        for oratab in /var/opt/oracle/oratab /etc/oratab
+        do
+        [ ! -f $oratab ] && continue
+        ORACLE_HOME=`IFS=:
+                while read SID ORACLE_HOME junk;
+                do
+                        if [ "$SID" = "$2" -o "$SID" = "*" ] ; then
+                                echo $ORACLE_HOME;
+                                exit;
+                        fi;
+                done < $oratab`
+        [ -n "$ORACLE_HOME" ] && break
+        done
+fi
+# Last resort
+[ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle
+
+if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then
+        echo "Cannot determine ORACLE_HOME for sid $2"
+        exit $STATE_UNKNOWN
+fi
+PATH=$PATH:$ORACLE_HOME/bin
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
+export ORACLE_HOME PATH LD_LIBRARY_PATH
+
+case "$cmd" in
+--tns)
+    tnschk=` tnsping $2`
+    tnschk2=` echo  $tnschk | grep -c OK`
+    if [ ${tnschk2} -eq 1 ] ; then 
+        tnschk3=` echo $tnschk | sed -e 's/.*(//' -e 's/).*//'`
+        echo "OK - reply time ${tnschk3} from $2"
+        exit $STATE_OK
+    else
+        echo "No TNS Listener on $2"
+        exit $STATE_CRITICAL
+    fi
+    ;;
+--oranames)
+    namesctl status $2 | awk '
+    /Server has been running for:/ {
+        msg = "OK: Up"
+        for (i = 6; i <= NF; i++) {
+            msg = msg " " $i
+        }
+        status = '$STATE_OK'
+    }
+    /error/ {
+        msg = "CRITICAL: " $0
+        status = '$STATE_CRITICAL'
+    }
+    END {
+        print msg
+        exit status
+    }'
+    ;;
+--db)
+    pmonchk=`ps -ef | grep -v grep | grep ${2} | grep -c pmon`
+    if [ ${pmonchk} -ge 1 ] ; then
+        echo "${2} OK - ${pmonchk} PMON process(es) running"
+        exit $STATE_OK
+    #if [ -f $ORACLE_HOME/dbs/sga*${2}* ] ; then
+        #if [ ${pmonchk} -eq 1 ] ; then
+    #utime=`ls -la $ORACLE_HOME/dbs/sga*$2* | cut -c 43-55`
+            #echo "${2} OK - running since ${utime}"
+            #exit $STATE_OK
+        #fi
+    else
+        echo "${2} Database is DOWN"
+        exit $STATE_CRITICAL
+    fi
+    ;;
+--login)
+    loginchk=`sqlplus dummy/user@$2 < /dev/null`
+    loginchk2=` echo  $loginchk | grep -c ORA-01017`
+    if [ ${loginchk2} -eq 1 ] ; then 
+        echo "OK - dummy login connected"
+        exit $STATE_OK
+    else
+        loginchk3=` echo "$loginchk" | grep "ORA-" | head -1`
+        echo "CRITICAL - $loginchk3"
+        exit $STATE_CRITICAL
+    fi
+    ;;
+--cache)
+    if [ ${5} -gt ${6} ] ; then
+        echo "UNKNOWN - Warning level is less then Crit"
+        exit $STATE_UNKNOWN
+    fi
+    result=`sqlplus -s ${3}/${4}@${2} << EOF
+set pagesize 0
+set numf '9999999.99'
+select (1-(pr.value/(dbg.value+cg.value)))*100
+from v\\$sysstat pr, v\\$sysstat dbg, v\\$sysstat cg
+where pr.name='physical reads'
+and dbg.name='db block gets'
+and cg.name='consistent gets';
+EOF`
+
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+      error=` echo "$result" | grep "ORA-" | head -1`
+      echo "CRITICAL - $error"
+      exit $STATE_CRITICAL
+    fi
+
+    buf_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` 
+    buf_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` 
+    result=`sqlplus -s ${3}/${4}@${2} << EOF
+set pagesize 0
+set numf '9999999.99'
+select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
+from v\\$librarycache lc;
+EOF`
+        
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+      error=` echo "$result" | grep "ORA-" | head -1`
+      echo "CRITICAL - $error"
+      exit $STATE_CRITICAL
+    fi
+
+    lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'`
+    lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'`
+
+    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
+        echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
+        exit $STATE_CRITICAL
+    fi
+    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
+        echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
+        exit $STATE_WARNING
+    fi
+    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
+
+    exit $STATE_OK
+    ;;
+--tablespace)
+    if [ ${6} -lt ${7} ] ; then
+        echo "UNKNOWN - Warning level is more then Crit"
+        exit $STATE_UNKNOWN
+    fi
+    result=`sqlplus -s ${3}/${4}@${2} << EOF
+set pagesize 0
+set numf '9999999.99'
+select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc
+from (
+select tablespace_name,sum(bytes)/1024/1024 total
+from dba_data_files group by tablespace_name) A,
+( select tablespace_name,sum(bytes)/1024/1024 free
+from dba_free_space group by tablespace_name) B
+where a.tablespace_name=b.tablespace_name and a.tablespace_name='${5}';
+EOF`
+
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+      error=` echo "$result" | grep "ORA-" | head -1`
+      echo "CRITICAL - $error"
+      exit $STATE_CRITICAL
+    fi
+
+    ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
+    ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
+    ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
+    ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
+    if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+        echo "No data returned by Oracle - tablespace $5 not found?"
+        exit $STATE_UNKNOWN
+    fi
+    if [ "$ts_pct" -ge ${6} ] ; then
+        echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
+        exit $STATE_CRITICAL
+    fi
+    if [ "$ts_pct" -ge ${7} ] ; then
+        echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
+        exit $STATE_WARNING
+    fi
+    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
+    exit $STATE_OK
+    ;;
+*)
+    print_usage
+                exit $STATE_UNKNOWN
+esac
diff --git a/web/attachments/101482-nagios-plugins-1.3.1-check_ldap.patchTLS b/web/attachments/101482-nagios-plugins-1.3.1-check_ldap.patchTLS
new file mode 100644
index 0000000..66046e3
--- /dev/null
+++ b/web/attachments/101482-nagios-plugins-1.3.1-check_ldap.patchTLS
@@ -0,0 +1,195 @@
+diff -r -p nagios-plugins-1.3.1/configure.in nagios-plugins-1.3.1-patchTLS/configure.in
+*** nagios-plugins-1.3.1/configure.in   Fri Jul 11 08:12:23 2003
+--- nagios-plugins-1.3.1-patchTLS/configure.in  Tue Sep 14 15:07:12 2004
+*************** if test "$ac_cv_lib_ldap_main" = "yes"; 
+*** 165,170 ****
+--- 165,171 ----
+    AC_SUBST(LDAPLIBS)
+    AC_SUBST(LDAPINCLUDE)
+    EXTRAS="$EXTRAS check_ldap"
++   AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
+  else
+    AC_MSG_WARN([Skipping LDAP plugin])
+    AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
+diff -r -p nagios-plugins-1.3.1/plugins/Makefile.am nagios-plugins-1.3.1-patchTLS/plugins/Makefile.am
+*** nagios-plugins-1.3.1/plugins/Makefile.am    Fri Jul 11 08:11:06 2003
+--- nagios-plugins-1.3.1-patchTLS/plugins/Makefile.am   Sat Sep 11 01:59:42 2004
+*************** $(check_tcp_programs): check_tcp
+*** 132,138 ****
+  
+  install-exec-hook:
+        cd $(DESTDIR)$(libexecdir) && \
+!       for i in $(check_tcp_programs) ; do rm -f $$i; ln -s -f check_tcp $$i ; done
+  
+  clean-local:
+        rm -f $(check_tcp_programs)
+--- 132,139 ----
+  
+  install-exec-hook:
+        cd $(DESTDIR)$(libexecdir) && \
+!       for i in $(check_tcp_programs) ; do rm -f $$i; ln -s -f check_tcp $$i ; done ;\
+!       rm -f check_ldaps ; ln -s -f check_ldap check_ldaps
+  
+  clean-local:
+        rm -f $(check_tcp_programs)
+diff -r -p nagios-plugins-1.3.1/plugins/check_ldap.c nagios-plugins-1.3.1-patchTLS/plugins/check_ldap.c
+*** nagios-plugins-1.3.1/plugins/check_ldap.c   Wed Jan 29 07:16:15 2003
+--- nagios-plugins-1.3.1-patchTLS/plugins/check_ldap.c  Tue Sep 14 15:16:05 2004
+***************
+*** 20,26 ****
+   *
+   *****************************************************************************/
+  
+! const char *progname = "check_ldap";
+  const char *revision = "$Revision: 1.4 $";
+  
+  #include "config.h"
+--- 20,26 ----
+   *
+   *****************************************************************************/
+  
+! char *progname = "check_ldap";
+  const char *revision = "$Revision: 1.4 $";
+  
+  #include "config.h"
+*************** char *ld_binddn = NULL;
+*** 50,55 ****
+--- 50,56 ----
+  unsigned int ld_port = DEFAULT_PORT;
+  int warn_time = UNDEFINED;
+  int crit_time = UNDEFINED;
++ char *SERVICE = "LDAP";
+  
+  int
+  main (int argc, char *argv[])
+*************** main (int argc, char *argv[])
+*** 60,65 ****
+--- 61,73 ----
+  
+        int t_diff;
+        time_t time0, time1;
++       int tls;
++ 
++       int version=3;
++ 
++       if (strstr(argv[0],"check_ldaps")) {
++                 asprintf (&progname, "check_ldaps");
++       }
+  
+        if (process_arguments (argc, argv) == ERROR)
+                usage ("check_ldap: could not parse arguments\n");
+*************** main (int argc, char *argv[])
+*** 74,84 ****
+        time (&time0);
+  
+        /* initialize ldap */
+        if (!(ld = ldap_open (ld_host, ld_port))) {
+-               /*ldap_perror(ld, "ldap_open"); */
+                printf ("Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
+  
+        /* bind to the ldap server */
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+--- 82,145 ----
+        time (&time0);
+  
+        /* initialize ldap */
++ #ifdef HAVE_LDAP_INIT
++       if (!(ld = ldap_init (ld_host, ld_port))) {
++               printf ("Could not connect to the server at port %i\n", ld_port);
++               return STATE_CRITICAL;
++       }
++ #else
+        if (!(ld = ldap_open (ld_host, ld_port))) {
+                printf ("Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
++ #endif /* HAVE_LDAP_INIT */
++ 
++ #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_PROTOCOL_VERSION)
++       ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
++ #endif /* LDAP_OPT_PROTOCOL_VERSION */
++ 
++         if (strstr(argv[0],"check_ldaps")) {
++               /* with TLS */
++               if ( ld_port == LDAPS_PORT ) {
++                       asprintf (&SERVICE, "LDAPS");
++ #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS)
++                       /* ldaps: set option tls */
++                       tls = LDAP_OPT_X_TLS_HARD;
++                       if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS)
++                       {
++                               /*ldap_perror(ld, "ldaps_option"); */
++                               printf ("Could not init TLS at port %i!\n", ld_port);
++                               return STATE_CRITICAL;
++                       }
++ #else
++                       printf ("TLS not supported by the libraries!\n", ld_port);
++                       return STATE_CRITICAL;
++ #endif /* LDAP_OPT_X_TLS */
++               } else {
++                       asprintf (&SERVICE, "LDAP-TLS");
++ #if defined(HAVE_LDAP_SET_OPTION) && defined(HAVE_LDAP_START_TLS_S)
++                       /* ldap with startTLS: set option version */
++                       if (ldap_get_option(ld,LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS )
++                       {
++                               if (version < LDAP_VERSION3)
++                               {
++                                       version = LDAP_VERSION3;
++                                       ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
++                               }
++                       }
++                       /* call start_tls */
++                       if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS)
++                       {
++                               /*ldap_perror(ld, "ldap_start_tls"); */
++                               printf ("Could not init startTLS at port %i!\n", ld_port);
++                               return STATE_CRITICAL;
++                       }
++ #else
++                       printf ("startTLS not supported by the library, needs LDAPv3!\n");
++                       return STATE_CRITICAL;
++ #endif /* HAVE_LDAP_START_TLS_S */
++               }
++       }
+  
+        /* bind to the ldap server */
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+*************** main (int argc, char *argv[])
+*** 109,125 ****
+        t_diff = time1 - time0;
+  
+        if (crit_time!=UNDEFINED && t_diff>=crit_time) {
+!               printf ("LDAP critical - %i seconds response time\n", t_diff);
+                return STATE_CRITICAL;
+        }
+  
+        if (warn_time!=UNDEFINED && t_diff>=warn_time) {
+!               printf ("LDAP warning - %i seconds response time\n", t_diff);
+                return STATE_WARNING;
+        }
+  
+        /* print out the result */
+!       printf ("LDAP ok - %i seconds response time\n", t_diff);
+  
+        return STATE_OK;
+  }
+--- 170,186 ----
+        t_diff = time1 - time0;
+  
+        if (crit_time!=UNDEFINED && t_diff>=crit_time) {
+!               printf ("%s critical - %i seconds response time\n", SERVICE, t_diff);
+                return STATE_CRITICAL;
+        }
+  
+        if (warn_time!=UNDEFINED && t_diff>=warn_time) {
+!               printf ("%s warning - %i seconds response time\n", SERVICE, t_diff);
+                return STATE_WARNING;
+        }
+  
+        /* print out the result */
+!       printf ("%s ok - %i seconds response time\n", SERVICE, t_diff);
+  
+        return STATE_OK;
+  }
diff --git a/web/attachments/101495-nagios-plugins-1.3.1-check_ldap.patchTLS b/web/attachments/101495-nagios-plugins-1.3.1-check_ldap.patchTLS
new file mode 100644
index 0000000..66046e3
--- /dev/null
+++ b/web/attachments/101495-nagios-plugins-1.3.1-check_ldap.patchTLS
@@ -0,0 +1,195 @@
+diff -r -p nagios-plugins-1.3.1/configure.in nagios-plugins-1.3.1-patchTLS/configure.in
+*** nagios-plugins-1.3.1/configure.in   Fri Jul 11 08:12:23 2003
+--- nagios-plugins-1.3.1-patchTLS/configure.in  Tue Sep 14 15:07:12 2004
+*************** if test "$ac_cv_lib_ldap_main" = "yes"; 
+*** 165,170 ****
+--- 165,171 ----
+    AC_SUBST(LDAPLIBS)
+    AC_SUBST(LDAPINCLUDE)
+    EXTRAS="$EXTRAS check_ldap"
++   AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
+  else
+    AC_MSG_WARN([Skipping LDAP plugin])
+    AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
+diff -r -p nagios-plugins-1.3.1/plugins/Makefile.am nagios-plugins-1.3.1-patchTLS/plugins/Makefile.am
+*** nagios-plugins-1.3.1/plugins/Makefile.am    Fri Jul 11 08:11:06 2003
+--- nagios-plugins-1.3.1-patchTLS/plugins/Makefile.am   Sat Sep 11 01:59:42 2004
+*************** $(check_tcp_programs): check_tcp
+*** 132,138 ****
+  
+  install-exec-hook:
+        cd $(DESTDIR)$(libexecdir) && \
+!       for i in $(check_tcp_programs) ; do rm -f $$i; ln -s -f check_tcp $$i ; done
+  
+  clean-local:
+        rm -f $(check_tcp_programs)
+--- 132,139 ----
+  
+  install-exec-hook:
+        cd $(DESTDIR)$(libexecdir) && \
+!       for i in $(check_tcp_programs) ; do rm -f $$i; ln -s -f check_tcp $$i ; done ;\
+!       rm -f check_ldaps ; ln -s -f check_ldap check_ldaps
+  
+  clean-local:
+        rm -f $(check_tcp_programs)
+diff -r -p nagios-plugins-1.3.1/plugins/check_ldap.c nagios-plugins-1.3.1-patchTLS/plugins/check_ldap.c
+*** nagios-plugins-1.3.1/plugins/check_ldap.c   Wed Jan 29 07:16:15 2003
+--- nagios-plugins-1.3.1-patchTLS/plugins/check_ldap.c  Tue Sep 14 15:16:05 2004
+***************
+*** 20,26 ****
+   *
+   *****************************************************************************/
+  
+! const char *progname = "check_ldap";
+  const char *revision = "$Revision: 1.4 $";
+  
+  #include "config.h"
+--- 20,26 ----
+   *
+   *****************************************************************************/
+  
+! char *progname = "check_ldap";
+  const char *revision = "$Revision: 1.4 $";
+  
+  #include "config.h"
+*************** char *ld_binddn = NULL;
+*** 50,55 ****
+--- 50,56 ----
+  unsigned int ld_port = DEFAULT_PORT;
+  int warn_time = UNDEFINED;
+  int crit_time = UNDEFINED;
++ char *SERVICE = "LDAP";
+  
+  int
+  main (int argc, char *argv[])
+*************** main (int argc, char *argv[])
+*** 60,65 ****
+--- 61,73 ----
+  
+        int t_diff;
+        time_t time0, time1;
++       int tls;
++ 
++       int version=3;
++ 
++       if (strstr(argv[0],"check_ldaps")) {
++                 asprintf (&progname, "check_ldaps");
++       }
+  
+        if (process_arguments (argc, argv) == ERROR)
+                usage ("check_ldap: could not parse arguments\n");
+*************** main (int argc, char *argv[])
+*** 74,84 ****
+        time (&time0);
+  
+        /* initialize ldap */
+        if (!(ld = ldap_open (ld_host, ld_port))) {
+-               /*ldap_perror(ld, "ldap_open"); */
+                printf ("Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
+  
+        /* bind to the ldap server */
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+--- 82,145 ----
+        time (&time0);
+  
+        /* initialize ldap */
++ #ifdef HAVE_LDAP_INIT
++       if (!(ld = ldap_init (ld_host, ld_port))) {
++               printf ("Could not connect to the server at port %i\n", ld_port);
++               return STATE_CRITICAL;
++       }
++ #else
+        if (!(ld = ldap_open (ld_host, ld_port))) {
+                printf ("Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
++ #endif /* HAVE_LDAP_INIT */
++ 
++ #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_PROTOCOL_VERSION)
++       ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
++ #endif /* LDAP_OPT_PROTOCOL_VERSION */
++ 
++         if (strstr(argv[0],"check_ldaps")) {
++               /* with TLS */
++               if ( ld_port == LDAPS_PORT ) {
++                       asprintf (&SERVICE, "LDAPS");
++ #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS)
++                       /* ldaps: set option tls */
++                       tls = LDAP_OPT_X_TLS_HARD;
++                       if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS)
++                       {
++                               /*ldap_perror(ld, "ldaps_option"); */
++                               printf ("Could not init TLS at port %i!\n", ld_port);
++                               return STATE_CRITICAL;
++                       }
++ #else
++                       printf ("TLS not supported by the libraries!\n", ld_port);
++                       return STATE_CRITICAL;
++ #endif /* LDAP_OPT_X_TLS */
++               } else {
++                       asprintf (&SERVICE, "LDAP-TLS");
++ #if defined(HAVE_LDAP_SET_OPTION) && defined(HAVE_LDAP_START_TLS_S)
++                       /* ldap with startTLS: set option version */
++                       if (ldap_get_option(ld,LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS )
++                       {
++                               if (version < LDAP_VERSION3)
++                               {
++                                       version = LDAP_VERSION3;
++                                       ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
++                               }
++                       }
++                       /* call start_tls */
++                       if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS)
++                       {
++                               /*ldap_perror(ld, "ldap_start_tls"); */
++                               printf ("Could not init startTLS at port %i!\n", ld_port);
++                               return STATE_CRITICAL;
++                       }
++ #else
++                       printf ("startTLS not supported by the library, needs LDAPv3!\n");
++                       return STATE_CRITICAL;
++ #endif /* HAVE_LDAP_START_TLS_S */
++               }
++       }
+  
+        /* bind to the ldap server */
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+*************** main (int argc, char *argv[])
+*** 109,125 ****
+        t_diff = time1 - time0;
+  
+        if (crit_time!=UNDEFINED && t_diff>=crit_time) {
+!               printf ("LDAP critical - %i seconds response time\n", t_diff);
+                return STATE_CRITICAL;
+        }
+  
+        if (warn_time!=UNDEFINED && t_diff>=warn_time) {
+!               printf ("LDAP warning - %i seconds response time\n", t_diff);
+                return STATE_WARNING;
+        }
+  
+        /* print out the result */
+!       printf ("LDAP ok - %i seconds response time\n", t_diff);
+  
+        return STATE_OK;
+  }
+--- 170,186 ----
+        t_diff = time1 - time0;
+  
+        if (crit_time!=UNDEFINED && t_diff>=crit_time) {
+!               printf ("%s critical - %i seconds response time\n", SERVICE, t_diff);
+                return STATE_CRITICAL;
+        }
+  
+        if (warn_time!=UNDEFINED && t_diff>=warn_time) {
+!               printf ("%s warning - %i seconds response time\n", SERVICE, t_diff);
+                return STATE_WARNING;
+        }
+  
+        /* print out the result */
+!       printf ("%s ok - %i seconds response time\n", SERVICE, t_diff);
+  
+        return STATE_OK;
+  }
diff --git a/web/attachments/102274-check_upsv2.c b/web/attachments/102274-check_upsv2.c
new file mode 100644
index 0000000..f238c7d
--- /dev/null
+++ b/web/attachments/102274-check_upsv2.c
@@ -0,0 +1,593 @@
+/******************************************************************************
+
+  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 2 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, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ ******************************************************************************/
+
+const char *progname = "check_ups";
+const char *revision = "$Revision: 1.13 $";
+const char *copyright = "2000-2002";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include <locale.h>
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
+enum {
+        PORT = 3493
+};
+
+#define CHECK_NONE       0
+
+#define UPS_NONE     0   /* no supported options */
+#define UPS_UTILITY  1   /* supports utility line voltage */
+#define UPS_BATTPCT  2   /* supports percent battery remaining */
+#define UPS_STATUS   4   /* supports UPS status */
+#define UPS_TEMP     8   /* supports UPS temperature */
+#define UPS_LOADPCT     16   /* supports load percent */
+
+#define UPSSTATUS_NONE     0
+#define UPSSTATUS_OFF      1
+#define UPSSTATUS_OL       2
+#define UPSSTATUS_OB       4
+#define UPSSTATUS_LB       8
+#define UPSSTATUS_CAL     16
+#define UPSSTATUS_RB      32  /*Replace Battery */
+#define UPSSTATUS_UNKOWN  64
+
+enum { NOSUCHVAR = ERROR-1 };
+
+int server_port = PORT;
+char *server_address;
+char *ups_name = NULL;
+double warning_value = 0.0;
+double critical_value = 0.0;
+int check_warn = FALSE;
+int check_crit = FALSE;
+int check_variable = UPS_NONE;
+int supported_options = UPS_NONE;
+int status = UPSSTATUS_NONE;
+
+double ups_utility_voltage = 0.0;
+double ups_battery_percent = 0.0;
+double ups_load_percent = 0.0;
+double ups_temperature = 0.0;
+char *ups_status;
+
+int determine_status (void);
+int get_ups_variable (const char *, char *, size_t);
+
+int process_arguments (int, char **);
+int validate_arguments (void);
+void print_help (void);
+void print_usage (void);
+
+        int
+main (int argc, char **argv)
+{
+        int result = STATE_OK;
+        char *message;
+        char *data;
+        char temp_buffer[MAX_INPUT_BUFFER];
+        double ups_utility_deviation = 0.0;
+        int res;
+
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+
+        ups_status = strdup ("N/A");
+        data = strdup ("");
+        message = strdup ("");
+
+        if (process_arguments (argc, argv) != OK)
+                usage ("Invalid command arguments supplied\n");
+
+        /* initialize alarm signal handling */
+        signal (SIGALRM, socket_timeout_alarm_handler);
+
+        /* set socket timeout */
+        alarm (socket_timeout);
+
+        /* get the ups status if possible */
+        if (determine_status () != OK)
+                return STATE_CRITICAL;
+        if (supported_options & UPS_STATUS) {
+
+                ups_status = strdup ("");
+                result = STATE_OK;
+
+                if (status & UPSSTATUS_OFF) {
+                        asprintf (&ups_status, "Off");
+                        result = STATE_CRITICAL;
+                }
+                else if ((status & (UPSSTATUS_OB | UPSSTATUS_LB)) ==
+                                                 (UPSSTATUS_OB | UPSSTATUS_LB)) {
+                        asprintf (&ups_status, "On Battery, Low Battery");
+                        result = STATE_CRITICAL;
+                }
+                else {
+                        if (status & UPSSTATUS_OL) {
+                                asprintf (&ups_status, "%s%s", ups_status, "Online");
+                        }
+                        if (status & UPSSTATUS_OB) {
+                                asprintf (&ups_status, "%s%s", ups_status, "On Battery");
+                                result = STATE_WARNING;
+                        }
+                        if (status & UPSSTATUS_LB) {
+                                asprintf (&ups_status, "%s%s", ups_status, ", Low Battery");
+                                result = STATE_WARNING;
+                        }
+                        if (status & UPSSTATUS_CAL) {
+                                asprintf (&ups_status, "%s%s", ups_status, ", Calibrating");
+                        }
+                        if (status & UPSSTATUS_RB) {
+                                asprintf (&ups_status, "%s%s", ups_status, ", Replace Battery");
+                                result = STATE_WARNING;
+                        }
+                        if (status & UPSSTATUS_UNKOWN) {
+                                asprintf (&ups_status, "%s%s", ups_status, ", Unknown");
+                        }
+                }
+                asprintf (&message, "%sStatus=%s ", message, ups_status);
+        }
+
+        /* get the ups utility voltage if possible */
+        res=get_ups_variable ("input.voltage", temp_buffer, sizeof (temp_buffer));
+        if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY;
+        else if (res != OK)
+                return STATE_CRITICAL;
+        else {
+                supported_options |= UPS_UTILITY;
+
+                ups_utility_voltage = atof (temp_buffer);
+                asprintf (&message, "%sUtility=%3.1fV ", message, ups_utility_voltage);
+
+                if (ups_utility_voltage > 120.0)
+                        ups_utility_deviation = 120.0 - ups_utility_voltage;
+                else
+                        ups_utility_deviation = ups_utility_voltage - 120.0;
+
+                if (check_variable == UPS_UTILITY) {
+                        if (check_crit==TRUE && ups_utility_deviation>=critical_value) {
+                                result = STATE_CRITICAL;
+                        }
+                        else if (check_warn==TRUE && ups_utility_deviation>=warning_value) {
+                                result = max_state (result, STATE_WARNING);
+                        }
+                        asprintf (&data, "%s",
+                                  perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
+                                            check_warn, (long)(1000*warning_value),
+                                            check_crit, (long)(1000*critical_value),
+                                            TRUE, 0, FALSE, 0));
+                } else {
+                        asprintf (&data, "%s",
+                                  perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
+                                            FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                }
+        }
+
+        /* get the ups battery percent if possible */
+        res=get_ups_variable ("battery.charge", temp_buffer, sizeof (temp_buffer));
+        if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT;
+        else if ( res != OK)
+                return STATE_CRITICAL;
+        else {
+                supported_options |= UPS_BATTPCT;
+                ups_battery_percent = atof (temp_buffer);
+                asprintf (&message, "%sBatt=%3.1f%% ", message, ups_battery_percent);
+
+                if (check_variable == UPS_BATTPCT) {
+                        if (check_crit==TRUE && ups_battery_percent <= critical_value) {
+                                result = STATE_CRITICAL;
+                        }
+                        else if (check_warn==TRUE && ups_battery_percent<=warning_value) {
+                                result = max_state (result, STATE_WARNING);
+                        }
+                        asprintf (&data, "%s %s", data,
+                                  perfdata ("battery", (long)ups_battery_percent, "%",
+                                            check_warn, (long)(1000*warning_value),
+                                            check_crit, (long)(1000*critical_value),
+                                            TRUE, 0, TRUE, 100));
+                } else {
+                        asprintf (&data, "%s %s", data,
+                                  perfdata ("battery", (long)ups_battery_percent, "%",
+                                            FALSE, 0, FALSE, 0, TRUE, 0, TRUE, 100));
+                }
+        }
+
+        /* get the ups load percent if possible */
+        res=get_ups_variable ("ups.load", temp_buffer, sizeof (temp_buffer));
+        if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT;
+        else if ( res != OK)
+                return STATE_CRITICAL;
+        else {
+                supported_options |= UPS_LOADPCT;
+                ups_load_percent = atof (temp_buffer);
+                asprintf (&message, "%sLoad=%3.1f%% ", message, ups_load_percent);
+
+                if (check_variable == UPS_LOADPCT) {
+                        if (check_crit==TRUE && ups_load_percent>=critical_value) {
+                                result = STATE_CRITICAL;
+                        }
+                        else if (check_warn==TRUE && ups_load_percent>=warning_value) {
+                                result = max_state (result, STATE_WARNING);
+                        }
+                        asprintf (&data, "%s %s", data,
+                                  perfdata ("load", (long)ups_load_percent, "%",
+                                            check_warn, (long)(1000*warning_value),
+                                            check_crit, (long)(1000*critical_value),
+                                            TRUE, 0, TRUE, 100));
+                } else {
+                        asprintf (&data, "%s %s", data,
+                                  perfdata ("load", (long)ups_load_percent, "%",
+                                            FALSE, 0, FALSE, 0, TRUE, 0, TRUE, 100));
+                }
+        }
+
+        /* get the ups temperature if possible */
+        res=get_ups_variable ("ups.temperature", temp_buffer, sizeof (temp_buffer));
+        if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP;
+        else if ( res != OK)
+                return STATE_CRITICAL;
+        else {
+                supported_options |= UPS_TEMP;
+                ups_temperature = (atof (temp_buffer) * 1.8) + 32;
+                asprintf (&message, "%sTemp=%3.1fF", message, ups_temperature);
+
+                if (check_variable == UPS_TEMP) {
+                        if (check_crit==TRUE && ups_temperature>=critical_value) {
+                                result = STATE_CRITICAL;
+                        }
+                        else if (check_warn == TRUE && ups_temperature>=warning_value) {
+                                result = max_state (result, STATE_WARNING);
+                        }
+                        asprintf (&data, "%s %s", data,
+                                  perfdata ("temp", (long)ups_temperature, "degF",
+                                            check_warn, (long)(1000*warning_value),
+                                            check_crit, (long)(1000*critical_value),
+                                            TRUE, 0, FALSE, 0));
+                } else {
+                        asprintf (&data, "%s %s", data,
+                                  perfdata ("temp", (long)ups_temperature, "degF",
+                                            FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                }
+        }
+
+        /* if the UPS does not support any options we are looking for, report an error */
+        if (supported_options == UPS_NONE) {
+                result = STATE_CRITICAL;
+                asprintf (&message, "UPS does not support any available options\n");
+        }
+
+        /* reset timeout */
+        alarm (0);
+
+        printf ("UPS %s - %s|%s\n", state_text(result), message, data);
+        return result;
+}
+
+
+
+/* determines what options are supported by the UPS */
+int
+determine_status (void)
+{
+        char recv_buffer[MAX_INPUT_BUFFER];
+        char temp_buffer[MAX_INPUT_BUFFER];
+        char *ptr;
+        int res;
+        
+        res=get_ups_variable ("ups.status", recv_buffer, sizeof (recv_buffer));
+        if (res == NOSUCHVAR) return OK;
+        if (res != STATE_OK) {
+                printf ("Invalid response received from hostn");
+                return ERROR;
+        }
+        
+        supported_options |= UPS_STATUS;
+        
+        strcpy (temp_buffer, recv_buffer);
+        for (ptr = (char *) strtok (temp_buffer, " "); ptr != NULL;
+                         ptr = (char *) strtok (NULL, " ")) {
+                if (!strcmp (ptr, "OFF"))
+                        status |= UPSSTATUS_OFF;
+                else if (!strcmp (ptr, "OL"))
+                        status |= UPSSTATUS_OL;
+                else if (!strcmp (ptr, "OB"))
+                        status |= UPSSTATUS_OB;
+                else if (!strcmp (ptr, "LB"))
+                        status |= UPSSTATUS_LB;
+                else if (!strcmp (ptr, "CAL"))
+                        status |= UPSSTATUS_CAL;
+                else if (!strcmp (ptr, "RB"))
+                        status |= UPSSTATUS_RB;
+                else
+                        status |= UPSSTATUS_UNKOWN;
+        }
+
+        return OK;
+}
+
+
+/* gets a variable value for a specific UPS  */
+int
+get_ups_variable (const char *varname, char *buf, size_t buflen)
+{
+        /*  char command[MAX_INPUT_BUFFER]; */
+        char temp_buffer[MAX_INPUT_BUFFER];
+        char send_buffer[MAX_INPUT_BUFFER];
+        char *ptr;
+        int len;
+
+        *buf=0;
+        
+        /* create the command string to send to the UPS daemon */
+        sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname);
+
+        /* send the command to the daemon and get a response back */
+        if (process_tcp_request
+                        (server_address, server_port, send_buffer, temp_buffer,
+                         sizeof (temp_buffer)) != STATE_OK) {
+                printf ("Invalid response received from host\n");
+                return ERROR;
+        }
+
+        ptr = temp_buffer;
+        len = strlen(ptr);
+        if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
+        if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
+                printf ("Error: no such ups '%s' on that host\n", ups_name);
+                return ERROR;
+        }
+
+        if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) {
+                //printf ("Error: Variable '%s' is not supported\n", varname);
+                return NOSUCHVAR;
+        }
+
+        if (strcmp (ptr, "ERR DATA-STALE") == 0) {
+                printf ("Error: UPS data is stale\n");
+                return ERROR;
+        }
+
+        if (strncmp (ptr, "ERR", 3) == 0) {
+                printf ("Unkown error: %s\n", ptr);
+                return ERROR;
+        }
+
+        ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6;
+        len = strlen(ptr);
+        if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') {
+                printf ("Error: unable to parse variable\n");
+                return ERROR;
+        }
+        strncpy (buf, ptr+1, len - 2);
+        buf[len - 2] = 0;
+
+        return OK;
+}
+
+
+/* Command line: CHECK_UPS -H <host_address> -u ups [-p port] [-v variable] 
+                           [-wv warn_value] [-cv crit_value] [-to to_sec] */
+
+
+/* process command-line arguments */
+int
+process_arguments (int argc, char **argv)
+{
+        int c;
+
+        int option = 0;
+        static struct option longopts[] = {
+                {"hostname", required_argument, 0, 'H'},
+                {"ups", required_argument, 0, 'u'},
+                {"port", required_argument, 0, 'p'},
+                {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},
+                {"timeout", required_argument, 0, 't'},
+                {"variable", required_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {0, 0, 0, 0}
+        };
+
+        if (argc < 2)
+                return ERROR;
+
+        for (c = 1; c < argc; c++) {
+                if (strcmp ("-to", argv[c]) == 0)
+                        strcpy (argv[c], "-t");
+                else if (strcmp ("-wt", argv[c]) == 0)
+                        strcpy (argv[c], "-w");
+                else if (strcmp ("-ct", argv[c]) == 0)
+                        strcpy (argv[c], "-c");
+        }
+
+        while (1) {
+                c = getopt_long (argc, argv, "hVH:u:p:v:c:w:t:", longopts,
+                                                                         &option);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case '?':                                                                       /* help */
+                        usage3 ("Unknown option", optopt);
+                case 'H':                                                                       /* hostname */
+                        if (is_host (optarg)) {
+                                server_address = optarg;
+                        }
+                        else {
+                                usage2 ("Invalid host name", optarg);
+                        }
+                        break;
+                case 'u':                                                                       /* ups name */
+                        ups_name = optarg;
+                        break;
+                case 'p':                                                                       /* port */
+                        if (is_intpos (optarg)) {
+                                server_port = atoi (optarg);
+                        }
+                        else {
+                                usage2 ("Server port must be a positive integer", optarg);
+                        }
+                        break;
+                case 'c':                                                                       /* critical time threshold */
+                        if (is_intnonneg (optarg)) {
+                                critical_value = atoi (optarg);
+                                check_crit = TRUE;
+                        }
+                        else {
+                                usage2 ("Critical time must be a nonnegative integer", optarg);
+                        }
+                        break;
+                case 'w':                                                                       /* warning time threshold */
+                        if (is_intnonneg (optarg)) {
+                                warning_value = atoi (optarg);
+                                check_warn = TRUE;
+                        }
+                        else {
+                                usage2 ("Warning time must be a nonnegative integer", optarg);
+                        }
+                        break;
+                case 'v':                                                                       /* variable */
+                        if (!strcmp (optarg, "LINE"))
+                                check_variable = UPS_UTILITY;
+                        else if (!strcmp (optarg, "TEMP"))
+                                check_variable = UPS_TEMP;
+                        else if (!strcmp (optarg, "BATTPCT"))
+                                check_variable = UPS_BATTPCT;
+                        else if (!strcmp (optarg, "LOADPCT"))
+                                check_variable = UPS_LOADPCT;
+                        else
+                                usage2 ("Unrecognized UPS variable", optarg);
+                        break;
+                case 't':                                                                       /* timeout */
+                        if (is_intnonneg (optarg)) {
+                                socket_timeout = atoi (optarg);
+                        }
+                        else {
+                                usage ("Time interval must be a nonnegative integer\n");
+                        }
+                        break;
+                case 'V':                                                                       /* version */
+                        print_revision (progname, "$Revision: 1.13 $");
+                        exit (STATE_OK);
+                case 'h':                                                                       /* help */
+                        print_help ();
+                        exit (STATE_OK);
+                }
+        }
+
+
+        if (server_address == NULL && argc > optind) {
+                if (is_host (argv[optind]))
+                        server_address = argv[optind++];
+                else
+                        usage ("Invalid host name");
+        }
+
+        if (server_address == NULL)
+                server_address = strdup("127.0.0.1");
+
+        return validate_arguments();
+}
+
+
+
+
+
+int
+validate_arguments (void)
+{
+        if (! ups_name) {
+                printf ("Error : no ups indicated\n");
+                return ERROR;
+        }
+        return OK;
+}
+
+
+
+
+
+
+void
+print_help (void)
+{
+        char *myport;
+        asprintf (&myport, "%d", PORT);
+
+        print_revision (progname, revision);
+
+        printf (_("Copyright (c) 2000 Tom Shields"));
+        printf (_(COPYRIGHT), copyright, email);
+
+        printf (_("This plugin tests the UPS service on the specified host.\n\
+Network UPS Tools from www.exploits.org must be running for this plugin to\n\
+work.\n\n"));
+
+        print_usage ();
+
+        printf (_(UT_HELP_VRSN));
+
+        printf (_(UT_HOST_PORT), 'p', myport);
+
+        printf (_("\
+ -u, --ups=STRING\n\
+    Name of UPS\n"));
+
+        printf (_(UT_WARN_CRIT));
+
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+
+        printf (_(UT_VERBOSE));
+
+        printf (_("\
+This plugin attempts to determine the status of a UPS (Uninterruptible Power\n\
+Supply) on a local or remote host. If the UPS is online or calibrating, the\n\
+plugin will return an OK state. If the battery is on it will return a WARNING\n\
+state.  If the UPS is off or has a low battery the plugin will return a CRITICAL\n\
+state.\n\n"));
+
+        printf (_("\
+You may also specify a variable to check [such as temperature, utility voltage,\n\
+battery load, etc.]  as well as warning and critical thresholds for the value of\n\
+that variable.  If the remote host has multiple UPS that are being monitored you\n\
+will have to use the [ups] option to specify which UPS to check.\n\n"));
+
+        printf (_("Notes:\n\n\
+This plugin requires that the UPSD daemon distributed with Russel Kroll's\n\
+Smart UPS Tools be installed on the remote host.  If you do not have the\n\
+package installed on your system, you can download it from\n\
+http://www.exploits.org/nut\n\n"));
+
+        printf (_(UT_SUPPORT));
+}
+
+
+
+
+void
+print_usage (void)
+{
+        printf (_("\
+Usage: %s -H host -u ups [-p port] [-v variable] [-wv warn_value] [-cv crit_value] [-to to_sec]\n"), progname);
+        printf (_(UT_HLP_VRS), progname, progname);
+}
+
diff --git a/web/attachments/103460-check_ups-NUT2.0.diff b/web/attachments/103460-check_ups-NUT2.0.diff
new file mode 100644
index 0000000..e28c718
--- /dev/null
+++ b/web/attachments/103460-check_ups-NUT2.0.diff
@@ -0,0 +1,588 @@
+diff -ru nagiosplug/AUTHORS nagiosplug_AQ/AUTHORS
+--- nagiosplug/AUTHORS  2004-08-23 23:59:37.000000000 +0200
++++ nagiosplug_AQ/AUTHORS       2004-09-30 10:23:42.000000000 +0200
+@@ -119,3 +119,5 @@
+ Sean Finney
+ Bill Kunkel
+ Paulo Afonso Graner Fessel
++Alain Richard
++Arnaud Quette
+diff -ru nagiosplug/command.cfg.in nagiosplug_AQ/command.cfg.in
+--- nagiosplug/command.cfg.in   2003-06-12 06:46:10.000000000 +0200
++++ nagiosplug_AQ/command.cfg.in        2004-10-01 12:31:15.000000000 +0200
+@@ -91,6 +91,7 @@
+ command[check_procs_zombie]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s Z
+ command[check_procs_httpd]=@libexecdir@/check_procs -w 5:$ARG1$ -c 1:$ARG2$ -C httpd
+ command[check_procs_vsz]=@libexecdir@/check_procs -w 8096 -c 16182 -C httpd --metric VSZ
++command[check_ups]=@libexecdir@/check_ups -H $HOSTADDRESS$ -u $UPS$
+ 
+ # An example of using check_by_ssh as an active service check
+ command[ssh_disk]=@libexecdir@/check_by_ssh -H $HOSTADDRESS$ -C '@libexecdir@/check_disk -w 85% -c 95% -p $ARG1$'
+diff -ru nagiosplug/plugins/check_ups.c nagiosplug_AQ/plugins/check_ups.c
+--- nagiosplug/plugins/check_ups.c      2004-03-14 05:09:19.000000000 +0100
++++ nagiosplug_AQ/plugins/check_ups.c   2004-10-01 11:35:19.000000000 +0200
+@@ -1,26 +1,35 @@
+ /******************************************************************************
+-
+- 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 2 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, write to the Free Software
+- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-
+-******************************************************************************/
++ *
++ * check_ups
++ *
++ * Program: Network UPS Tools plugin for Nagios
++ * License: GPL
++ * Copyright (c) 2000 Tom Shields
++ *               2004 Alain Richard <alain.richard@equation.fr>
++ *               2004 Arnaud Quette <arnaud.quette@mgeups.com>
++ *
++ * 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 2 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, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ ******************************************************************************/
+ 
+ const char *progname = "check_ups";
+-const char *revision = "$Revision: 1.14 $";
+-const char *copyright = "2000-2002";
++const char *revision = "$Revision: 1.20 $";
++const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
++#include <locale.h>
+ #include "common.h"
+ #include "netutils.h"
+ #include "utils.h"
+@@ -38,14 +47,22 @@
+ #define UPS_TEMP     8   /* supports UPS temperature */
+ #define UPS_LOADPCT    16   /* supports load percent */
+ 
+-#define UPSSTATUS_NONE     0
+-#define UPSSTATUS_OFF      1
+-#define UPSSTATUS_OL       2
+-#define UPSSTATUS_OB       4
+-#define UPSSTATUS_LB       8
+-#define UPSSTATUS_CAL     16
+-#define UPSSTATUS_RB      32  /*Replace Battery */
+-#define UPSSTATUS_UNKOWN  64
++#define UPSSTATUS_NONE       0
++#define UPSSTATUS_OFF        1
++#define UPSSTATUS_OL         2
++#define UPSSTATUS_OB         4
++#define UPSSTATUS_LB         8
++#define UPSSTATUS_CAL       16
++#define UPSSTATUS_RB        32  /*Replace Battery */
++#define UPSSTATUS_BYPASS    64
++#define UPSSTATUS_OVER     128
++#define UPSSTATUS_TRIM     256
++#define UPSSTATUS_BOOST    512
++#define UPSSTATUS_CHRG    1024
++#define UPSSTATUS_DISCHRG 2048
++#define UPSSTATUS_UNKOWN  4096
++
++enum { NOSUCHVAR = ERROR-1 };
+ 
+ int server_port = PORT;
+ char *server_address;
+@@ -63,9 +80,9 @@
+ double ups_load_percent = 0.0;
+ double ups_temperature = 0.0;
+ char *ups_status;
++int temp_output_c = 0;
+ 
+ int determine_status (void);
+-int determine_supported_vars (void);
+ int get_ups_variable (const char *, char *, size_t);
+ 
+ int process_arguments (int, char **);
+@@ -73,7 +90,7 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-int
++       int
+ main (int argc, char **argv)
+ {
+        int result = STATE_OK;
+@@ -81,6 +98,7 @@
+        char *data;
+        char temp_buffer[MAX_INPUT_BUFFER];
+        double ups_utility_deviation = 0.0;
++       int res;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -88,6 +106,7 @@
+ 
+        ups_status = strdup ("N/A");
+        data = strdup ("");
++       message = strdup ("");
+ 
+        if (process_arguments (argc, argv) != OK)
+                usage ("Invalid command arguments supplied\n");
+@@ -98,15 +117,11 @@
+        /* set socket timeout */
+        alarm (socket_timeout);
+ 
+-       /* determine what variables the UPS supports */
+-       if (determine_supported_vars () != OK)
+-               return STATE_CRITICAL;
+-
+        /* get the ups status if possible */
++       if (determine_status () != OK)
++               return STATE_CRITICAL;
+        if (supported_options & UPS_STATUS) {
+ 
+-               if (determine_status () != OK)
+-                       return STATE_CRITICAL;
+                ups_status = strdup ("");
+                result = STATE_OK;
+ 
+@@ -138,6 +153,24 @@
+                                asprintf (&ups_status, "%s%s", ups_status, ", Replace Battery");
+                                result = STATE_WARNING;
+                        }
++                       if (status & UPSSTATUS_BYPASS) {
++                               asprintf (&ups_status, "%s%s", ups_status, ", On Bypass");
++                       }
++                       if (status & UPSSTATUS_OVER) {
++                               asprintf (&ups_status, "%s%s", ups_status, ", Overload");
++                       }
++                       if (status & UPSSTATUS_TRIM) {
++                               asprintf (&ups_status, "%s%s", ups_status, ", Trimming");
++                       }
++                       if (status & UPSSTATUS_BOOST) {
++                               asprintf (&ups_status, "%s%s", ups_status, ", Boosting");
++                       }
++                       if (status & UPSSTATUS_CHRG) {
++                               asprintf (&ups_status, "%s%s", ups_status, ", Charging");
++                       }
++                       if (status & UPSSTATUS_DISCHRG) {
++                               asprintf (&ups_status, "%s%s", ups_status, ", Discharging");
++                       }
+                        if (status & UPSSTATUS_UNKOWN) {
+                                asprintf (&ups_status, "%s%s", ups_status, ", Unknown");
+                        }
+@@ -146,10 +179,12 @@
+        }
+ 
+        /* get the ups utility voltage if possible */
+-       if (supported_options & UPS_UTILITY) {
+-
+-               if (get_ups_variable ("UTILITY", temp_buffer, sizeof (temp_buffer)) != OK)
+-                       return STATE_CRITICAL;
++       res=get_ups_variable ("input.voltage", temp_buffer, sizeof (temp_buffer));
++       if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY;
++       else if (res != OK)
++               return STATE_CRITICAL;
++       else {
++               supported_options |= UPS_UTILITY;
+ 
+                ups_utility_voltage = atof (temp_buffer);
+                asprintf (&message, "%sUtility=%3.1fV ", message, ups_utility_voltage);
+@@ -167,23 +202,24 @@
+                                result = max_state (result, STATE_WARNING);
+                        }
+                        asprintf (&data, "%s",
+-                                 fperfdata ("voltage", ups_utility_voltage, "V",
+-                                           check_warn, warning_value,
+-                                           check_crit, critical_value,
++                                 perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
++                                           check_warn, (long)(1000*warning_value),
++                                           check_crit, (long)(1000*critical_value),
+                                            TRUE, 0, FALSE, 0));
+                } else {
+                        asprintf (&data, "%s",
+-                                 fperfdata ("voltage", ups_utility_voltage, "V",
++                                 perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
+                                            FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                }
+        }
+ 
+        /* get the ups battery percent if possible */
+-       if (supported_options & UPS_BATTPCT) {
+-
+-               if (get_ups_variable ("BATTPCT", temp_buffer, sizeof (temp_buffer)) != OK)
+-                       return STATE_CRITICAL;
+-
++       res=get_ups_variable ("battery.charge", temp_buffer, sizeof (temp_buffer));
++       if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT;
++       else if ( res != OK)
++               return STATE_CRITICAL;
++       else {
++               supported_options |= UPS_BATTPCT;
+                ups_battery_percent = atof (temp_buffer);
+                asprintf (&message, "%sBatt=%3.1f%% ", message, ups_battery_percent);
+ 
+@@ -207,11 +243,12 @@
+        }
+ 
+        /* get the ups load percent if possible */
+-       if (supported_options & UPS_LOADPCT) {
+-
+-               if (get_ups_variable ("LOADPCT", temp_buffer, sizeof (temp_buffer)) != OK)
+-                       return STATE_CRITICAL;
+-
++       res=get_ups_variable ("ups.load", temp_buffer, sizeof (temp_buffer));
++       if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT;
++       else if ( res != OK)
++               return STATE_CRITICAL;
++       else {
++               supported_options |= UPS_LOADPCT;
+                ups_load_percent = atof (temp_buffer);
+                asprintf (&message, "%sLoad=%3.1f%% ", message, ups_load_percent);
+ 
+@@ -235,13 +272,20 @@
+        }
+ 
+        /* get the ups temperature if possible */
+-       if (supported_options & UPS_TEMP) {
+-
+-               if (get_ups_variable ("UPSTEMP", temp_buffer, sizeof (temp_buffer)) != OK)
+-                       return STATE_CRITICAL;
+-
+-               ups_temperature = (atof (temp_buffer) * 1.8) + 32;
+-               asprintf (&message, "%sTemp=%3.1fF", message, ups_temperature);
++       res=get_ups_variable ("ups.temperature", temp_buffer, sizeof (temp_buffer));
++       if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP;
++       else if ( res != OK)
++               return STATE_CRITICAL;
++       else {
++               supported_options |= UPS_TEMP;
++               if (temp_output_c) {
++                 ups_temperature = atof (temp_buffer);
++                 asprintf (&message, "%sTemp=%3.1fC", message, ups_temperature);
++               }
++               else {
++                 ups_temperature = (atof (temp_buffer) * 1.8) + 32;
++                 asprintf (&message, "%sTemp=%3.1fF", message, ups_temperature);
++               }
+ 
+                if (check_variable == UPS_TEMP) {
+                        if (check_crit==TRUE && ups_temperature>=critical_value) {
+@@ -284,15 +328,17 @@
+        char recv_buffer[MAX_INPUT_BUFFER];
+        char temp_buffer[MAX_INPUT_BUFFER];
+        char *ptr;
+-
+-       if (get_ups_variable ("STATUS", recv_buffer, sizeof (recv_buffer)) !=
+-                       STATE_OK) {
++       int res;
++       
++       res=get_ups_variable ("ups.status", recv_buffer, sizeof (recv_buffer));
++       if (res == NOSUCHVAR) return OK;
++       if (res != STATE_OK) {
+                printf ("Invalid response received from hostn");
+                return ERROR;
+        }
+-
+-       recv_buffer[strlen (recv_buffer) - 1] = 0;
+-
++       
++       supported_options |= UPS_STATUS;
++       
+        strcpy (temp_buffer, recv_buffer);
+        for (ptr = (char *) strtok (temp_buffer, " "); ptr != NULL;
+                         ptr = (char *) strtok (NULL, " ")) {
+@@ -308,6 +354,18 @@
+                        status |= UPSSTATUS_CAL;
+                else if (!strcmp (ptr, "RB"))
+                        status |= UPSSTATUS_RB;
++               else if (!strcmp (ptr, "BYPASS"))
++                       status |= UPSSTATUS_BYPASS;
++               else if (!strcmp (ptr, "OVER"))
++                       status |= UPSSTATUS_OVER;
++               else if (!strcmp (ptr, "TRIM"))
++                       status |= UPSSTATUS_TRIM;
++               else if (!strcmp (ptr, "BOOST"))
++                       status |= UPSSTATUS_BOOST;
++               else if (!strcmp (ptr, "CHRG"))
++                       status |= UPSSTATUS_CHRG;
++               else if (!strcmp (ptr, "DISCHRG"))
++                       status |= UPSSTATUS_DISCHRG;
+                else
+                        status |= UPSSTATUS_UNKOWN;
+        }
+@@ -316,55 +374,6 @@
+ }
+ 
+ 
+-/* determines what options are supported by the UPS */
+-int
+-determine_supported_vars (void)
+-{
+-       char send_buffer[MAX_INPUT_BUFFER];
+-       char recv_buffer[MAX_INPUT_BUFFER];
+-       char temp_buffer[MAX_INPUT_BUFFER];
+-       char *ptr;
+-
+-
+-       /* get the list of variables that this UPS supports */
+-       if (ups_name)
+-               sprintf (send_buffer, "LISTVARS %s\r\n", ups_name);
+-       else
+-               sprintf (send_buffer, "LISTVARS\r\n");
+-       if (process_tcp_request
+-                       (server_address, server_port, send_buffer, recv_buffer,
+-                        sizeof (recv_buffer)) != STATE_OK) {
+-               printf ("Invalid response received from host\n");
+-               return ERROR;
+-       }
+-
+-       recv_buffer[strlen (recv_buffer) - 1] = 0;
+-
+-       if (ups_name)
+-               ptr = recv_buffer + 5 + strlen (ups_name) + 2;
+-       else
+-               ptr = recv_buffer + 5;
+-
+-       strcpy (temp_buffer, recv_buffer);
+-
+-       for (ptr = (char *) strtok (temp_buffer, " "); ptr != NULL;
+-                        ptr = (char *) strtok (NULL, " ")) {
+-               if (!strcmp (ptr, "UTILITY"))
+-                       supported_options |= UPS_UTILITY;
+-               else if (!strcmp (ptr, "BATTPCT"))
+-                       supported_options |= UPS_BATTPCT;
+-               else if (!strcmp (ptr, "LOADPCT"))
+-                       supported_options |= UPS_LOADPCT;
+-               else if (!strcmp (ptr, "STATUS"))
+-                       supported_options |= UPS_STATUS;
+-               else if (!strcmp (ptr, "UPSTEMP"))
+-                       supported_options |= UPS_TEMP;
+-       }
+-
+-       return OK;
+-}
+-
+-
+ /* gets a variable value for a specific UPS  */
+ int
+ get_ups_variable (const char *varname, char *buf, size_t buflen)
+@@ -373,12 +382,12 @@
+        char temp_buffer[MAX_INPUT_BUFFER];
+        char send_buffer[MAX_INPUT_BUFFER];
+        char *ptr;
++       int len;
+ 
++       *buf=0;
++       
+        /* create the command string to send to the UPS daemon */
+-       if (ups_name)
+-               sprintf (send_buffer, "REQ %s@%s\n", varname, ups_name);
+-       else
+-               sprintf (send_buffer, "REQ %s\n", varname);
++       sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname);
+ 
+        /* send the command to the daemon and get a response back */
+        if (process_tcp_request
+@@ -388,40 +397,43 @@
+                return ERROR;
+        }
+ 
+-       if (ups_name)
+-               ptr = temp_buffer + strlen (varname) + 5 + strlen (ups_name) + 1;
+-       else
+-               ptr = temp_buffer + strlen (varname) + 5;
+-
+-       if (!strcmp (ptr, "NOT-SUPPORTED")) {
+-               printf ("Error: Variable '%s' is not supported\n", varname);
++       ptr = temp_buffer;
++       len = strlen(ptr);
++       if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
++       if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
++               printf ("Error: no such ups '%s' on that host\n", ups_name);
+                return ERROR;
+        }
+ 
+-       if (!strcmp (ptr, "DATA-STALE")) {
++       if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) {
++               //printf ("Error: Variable '%s' is not supported\n", varname);
++               return NOSUCHVAR;
++       }
++
++       if (strcmp (ptr, "ERR DATA-STALE") == 0) {
+                printf ("Error: UPS data is stale\n");
+                return ERROR;
+        }
+ 
+-       if (!strcmp (ptr, "UNKNOWN-UPS")) {
+-               if (ups_name)
+-                       printf ("Error: UPS '%s' is unknown\n", ups_name);
+-               else
+-                       printf ("Error: UPS is unknown\n");
++       if (strncmp (ptr, "ERR", 3) == 0) {
++               printf ("Unkown error: %s\n", ptr);
+                return ERROR;
+        }
+ 
+-       strncpy (buf, ptr, buflen - 1);
+-       buf[buflen - 1] = 0;
++       ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6;
++       len = strlen(ptr);
++       if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') {
++               printf ("Error: unable to parse variable\n");
++               return ERROR;
++       }
++       strncpy (buf, ptr+1, len - 2);
++       buf[len - 2] = 0;
+ 
+        return OK;
+ }
+ 
+ 
+-
+-
+-
+-/* Command line: CHECK_UPS <host_address> [-u ups] [-p port] [-v variable] 
++/* Command line: CHECK_UPS -H <host_address> -u ups [-p port] [-v variable] 
+                           [-wv warn_value] [-cv crit_value] [-to to_sec] */
+ 
+ 
+@@ -439,6 +451,7 @@
+                {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},
+                {"timeout", required_argument, 0, 't'},
++               {"temperature", no_argument, 0, 'T'},
+                {"variable", required_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+@@ -458,7 +471,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVH:u:p:v:c:w:t:", longopts,
++               c = getopt_long (argc, argv, "hVTH:u:p:v:c:w:t:", longopts,
+                                                                         &option);
+ 
+                if (c == -1 || c == EOF)
+@@ -475,6 +488,9 @@
+                                usage2 ("Invalid host name", optarg);
+                        }
+                        break;
++               case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Farenheit) */ 
++                       temp_output_c = 1;
++                       break;
+                case 'u':                                                                       /* ups name */
+                        ups_name = optarg;
+                        break;
+@@ -525,7 +541,7 @@
+                        }
+                        break;
+                case 'V':                                                                       /* version */
+-                       print_revision (progname, "$Revision: 1.14 $");
++                       print_revision (progname, revision);
+                        exit (STATE_OK);
+                case 'h':                                                                       /* help */
+                        print_help ();
+@@ -548,20 +564,17 @@
+ }
+ 
+ 
+-
+-
+-
+ int
+ validate_arguments (void)
+ {
+-       return OK;
++       if (! ups_name) {
++                printf ("Error : no ups indicated\n");
++                return ERROR;
++       }
++       return OK;
+ }
+ 
+ 
+-
+-
+-
+-
+ void
+ print_help (void)
+ {
+@@ -571,11 +584,13 @@
+        print_revision (progname, revision);
+ 
+        printf (_("Copyright (c) 2000 Tom Shields"));
++       printf (_("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n"));
++       printf (_("Copyright (c) 2004 Arnaud Quette <arnaud.quette@mgeups.com>\n"));
+        printf (_(COPYRIGHT), copyright, email);
+ 
+        printf (_("This plugin tests the UPS service on the specified host.\n\
+-Network UPS Tools from www.exploits.org must be running for this plugin to\n\
+-work.\n\n"));
++Network UPS Tools from www.networkupstools.org must be running for this \n\
++plugin to work.\n\n"));
+ 
+        print_usage ();
+ 
+@@ -587,6 +602,9 @@
+  -u, --ups=STRING\n\
+     Name of UPS\n"));
+ 
++       printf (_("-T, --temperature\n\
++                 Output of temperatures in Celsius\n"));
++
+        printf (_(UT_WARN_CRIT));
+ 
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+@@ -607,10 +625,10 @@
+ will have to use the [ups] option to specify which UPS to check.\n\n"));
+ 
+        printf (_("Notes:\n\n\
+-This plugin requires that the UPSD daemon distributed with Russel Kroll's\n\
+-Smart UPS Tools be installed on the remote host.  If you do not have the\n\
++This plugin requires that the UPSD daemon distributed with the NUT - Network\n\
++UPS Tools to be installed on the remote host.  If you do not have the\n\
+ package installed on your system, you can download it from\n\
+-http://www.exploits.org/nut\n\n"));
++http://www.networkupstools.org\n\n"));
+ 
+        printf (_(UT_SUPPORT));
+ }
+@@ -622,7 +640,7 @@
+ print_usage (void)
+ {
+        printf (_("\
+-Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n\
+-    [-t timeout] [-v]\n"), progname);
++Usage: %s -H host -u ups [-p port] [-v variable] [-wv warn_value] [-cv crit_value] [-to to_sec] [-T]\n"), progname);
+        printf (_(UT_HLP_VRS), progname, progname);
+ }
++
+diff -ru nagiosplug/REQUIREMENTS nagiosplug_AQ/REQUIREMENTS
+--- nagiosplug/REQUIREMENTS     2004-04-29 13:12:20.000000000 +0200
++++ nagiosplug_AQ/REQUIREMENTS  2004-10-01 12:42:55.000000000 +0200
+@@ -65,6 +65,9 @@
+        - Requires NSClient to run on the NT server to monitor
+          http://nsclient.ready2run.nl/
+
++check_ups:
++       - Requires Network UPS Tools (>= 1.4) to run on the server to monitor
++         http://www.networkupstools.org/
+
+ OS Specific Issues
+ ------------------
diff --git a/web/attachments/104058-check_tcp.c.patch b/web/attachments/104058-check_tcp.c.patch
new file mode 100644
index 0000000..d9c435e
--- /dev/null
+++ b/web/attachments/104058-check_tcp.c.patch
@@ -0,0 +1,272 @@
+*** check_tcp.c Tue Jun 10 00:56:47 2003
+--- /usr/local/projects/nagios-plugins-1.3.1/plugins//check_tcp.c       Wed Sep 29 15:14:33 2004
+***************
+*** 50,62 ****
+--- 50,67 ----
+  #include <openssl/ssl.h>
+  #include <openssl/err.h>
+  #endif
+  
+  #ifdef HAVE_SSL
++ int check_cert = FALSE;
++ int days_till_exp;
++ char *randbuff = "";
+  SSL_CTX *ctx;
+  SSL *ssl;
++ X509 *server_cert;
+  int connect_SSL (void);
++ int check_certificate (X509 **);
+  #endif
+  
+  enum {
+        TCP_PROTOCOL = 1,
+        UDP_PROTOCOL = 2,
+***************
+*** 74,83 ****
+--- 79,89 ----
+  char *EXPECT = NULL;
+  char *QUIT = NULL;
+  int PROTOCOL = 0;
+  int PORT = 0;
+  
++ char timestamp[17] = "";
+  int server_port = 0;
+  char *server_address = NULL;
+  char *server_send = NULL;
+  char *server_quit = NULL;
+  char **server_expect = NULL;
+***************
+*** 193,202 ****
+--- 199,224 ----
+                asprintf (&server_expect[server_expect_count - 1], "201");
+                asprintf (&QUIT, "QUIT\r\n");
+                PROTOCOL = TCP_PROTOCOL;
+                PORT = 119;
+        }
++ #ifdef HAVE_SSL
++       else if (strstr (argv[0], "check_nntps")) {
++               asprintf (&progname, "check_nntps");
++               asprintf (&SERVICE, "NNTPS");
++               SEND = NULL;
++               EXPECT = NULL;
++               server_expect = realloc (server_expect, ++server_expect_count);
++               asprintf (&server_expect[server_expect_count - 1], "200");
++               server_expect = realloc (server_expect, ++server_expect_count);
++               asprintf (&server_expect[server_expect_count - 1], "201");
++               asprintf (&QUIT, "QUIT\r\n");
++               PROTOCOL = TCP_PROTOCOL;
++               use_ssl=TRUE;
++               PORT = 563;
++       }
++ #endif        
+        else {
+                usage ("ERROR: Generic check_tcp called with unknown service\n");
+        }
+  
+        asprintf (&server_address, "127.0.0.1");
+***************
+*** 220,230 ****
+        alarm (socket_timeout);
+  
+        /* try to connect to the host at the given port number */
+        gettimeofday (&tv, NULL);
+  #ifdef HAVE_SSL
+!       if (use_ssl)
+                result = connect_SSL ();
+        else
+  #endif
+                {
+                        if (PROTOCOL == UDP_PROTOCOL)
+--- 242,270 ----
+        alarm (socket_timeout);
+  
+        /* try to connect to the host at the given port number */
+        gettimeofday (&tv, NULL);
+  #ifdef HAVE_SSL
+!       if (use_ssl && check_cert == TRUE) {
+!         if (connect_SSL () != OK)
+!           terminate (STATE_CRITICAL,
+!                      "TCP CRITICAL - Could not make SSL connection\n");
+!         if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
+!           result = check_certificate (&server_cert);
+!           X509_free(server_cert);
+!         }
+!         else {
+!           printf("ERROR: Cannot retrieve server certificate.\n");
+!           result = STATE_CRITICAL;
+!         }
+!         SSL_shutdown (ssl);
+!         SSL_free (ssl);
+!         SSL_CTX_free (ctx);
+!         close (sd);
+!         return result;
+!       }
+!       else if (use_ssl)
+                result = connect_SSL ();
+        else
+  #endif
+                {
+                        if (PROTOCOL == UDP_PROTOCOL)
+***************
+*** 354,363 ****
+--- 394,404 ----
+                {"quit", required_argument, 0, 'q'},
+                {"delay", required_argument, 0, 'd'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
++               {"certificate", required_argument, 0, 'C'},
+                {0, 0, 0, 0}
+        };
+  #endif
+  
+        if (argc < 2)
+***************
+*** 421,434 ****
+--- 462,477 ----
+                        if (!is_intnonneg (optarg))
+                                usage ("Warning threshold must be a nonnegative integer\n");
+                        warning_time = strtod (optarg, NULL);
+                        check_warning_time = TRUE;
+                        break;
++                       /*
+                case 'C':
+                        crit_codes = realloc (crit_codes, ++crit_codes_count);
+                        crit_codes[crit_codes_count - 1] = optarg;
+                        break;
++                       */
+                case 'W':
+                        warn_codes = realloc (warn_codes, ++warn_codes_count);
+                        warn_codes[warn_codes_count - 1] = optarg;
+                        break;
+                case 't':                 /* timeout */
+***************
+*** 470,479 ****
+--- 513,533 ----
+                        terminate (STATE_UNKNOWN,
+                                "SSL support not available. Install OpenSSL and recompile.");
+  #endif
+                        use_ssl = TRUE;
+                        break;
++                 case 'C': /* Check SSL cert validity */
++ #ifdef HAVE_SSL
++                 if (!is_intnonneg (optarg))
++                   usage2 ("invalid certificate expiration period", optarg);
++                 days_till_exp = atoi (optarg);
++                 check_cert = TRUE;
++ #else
++                 terminate (STATE_UNKNOWN,
++                            "SSL support not available.  Install OpenSSL and recompile.");
++ #endif
++                 break;
+                }
+        }
+  
+        if (server_address == NULL)
+                usage ("You must provide a server address\n");
+***************
+*** 532,541 ****
+--- 586,600 ----
+                 "    Seconds before connection times out (default: %d)\n"
+                 " -v, --verbose"
+                 "    Show details for command-line debugging (do not use with nagios server)\n"
+                 " -h, --help\n"
+                 "    Print detailed help screen\n"
++ #ifdef HAVE_SSL
++                " -C, --certificate=INTEGER\n"
++                "Minimum number of days a certificate has to be valid.\n"
++                "(when this option is used the banner is not checked.)\n"
++ #endif
+                 " -V, --version\n"
+                 "    Print version information\n", DEFAULT_SOCKET_TIMEOUT);
+  }
+  
+  /*
+***************
+*** 593,603 ****
+--- 652,736 ----
+  
+    return STATE_CRITICAL;
+  }
+  #endif
+  
++ #ifdef HAVE_SSL
++ int
++ check_certificate (X509 ** certificate)
++ {
++   ASN1_STRING *tm;
++   int offset;
++   struct tm stamp;
++   int days_left;
+  
++ 
++   /* Retrieve timestamp of certificate */
++   tm = X509_get_notAfter (*certificate);
++ 
++   /* Generate tm structure to process timestamp */
++   if (tm->type == V_ASN1_UTCTIME) {
++     if (tm->length < 10) {
++       printf ("ERROR: Wrong time format in certificate.\n");
++       return STATE_CRITICAL;
++     }
++     else {
++       stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
++       if (stamp.tm_year < 50)
++       stamp.tm_year += 100;
++       offset = 0;
++     }
++   }
++   else {
++     if (tm->length < 12) {
++       printf ("ERROR: Wrong time format in certificate.\n");
++       return STATE_CRITICAL;
++     }
++     else {
++                         stamp.tm_year =
++                         (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
++                         (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
++                         stamp.tm_year -= 1900;
++                         offset = 2;
++     }
++   }
++         stamp.tm_mon =
++         (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
++         stamp.tm_mday =
++         (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
++         stamp.tm_hour =
++         (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
++         stamp.tm_min =
++         (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
++         stamp.tm_sec = 0;
++         stamp.tm_isdst = -1;
++ 
++         days_left = (mktime (&stamp) - time (NULL)) / 86400;
++         snprintf
++         (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
++          stamp.tm_mon + 1,
++          stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
++ 
++         if (days_left > 0 && days_left <= days_till_exp) {
++         printf ("Certificate expires in %d day(s) (%s).\n", days_left, timestamp);
++         return STATE_WARNING;
++         }
++         if (days_left < 0) {
++         printf ("Certificate expired on %s.\n", timestamp);
++         return STATE_CRITICAL;
++         }
++ 
++         if (days_left == 0) {
++         printf ("Certificate expires today (%s).\n", timestamp);
++         return STATE_WARNING;
++         }
++ 
++         printf ("Certificate will expire on %s.\n", timestamp);
++ 
++         return STATE_OK;
++ }
++ #endif
+  
+  int
+  my_recv (void)
+  {
+        int i;
diff --git a/web/attachments/104059-check_smtp.c.patch b/web/attachments/104059-check_smtp.c.patch
new file mode 100644
index 0000000..4977bcc
--- /dev/null
+++ b/web/attachments/104059-check_smtp.c.patch
@@ -0,0 +1,491 @@
+*** check_smtp.c        Fri Mar  7 02:15:40 2003
+--- /usr/local/projects/nagios-plugins-1.3.1/plugins//check_smtp.c      Wed Sep 29 15:14:33 2004
+***************
+*** 37,46 ****
+--- 37,64 ----
+  #include "config.h"
+  #include "common.h"
+  #include "netutils.h"
+  #include "utils.h"
+  
++ #ifdef HAVE_SSL
++ #include <openssl/ssl.h>
++ #include <openssl/x509.h>
++ #include <openssl/err.h>
++ #include <openssl/rand.h>
++ #endif
++ 
++ #ifdef HAVE_SSL
++ int check_cert = FALSE;
++ int days_till_exp;
++ SSL_CTX *ctx;
++ SSL *ssl;
++ X509 *server_cert;
++ int connect_SSL (void);
++ int check_certificate (X509 **);
++ #endif
++ 
++ 
+  const char *progname = "check_smtp";
+  
+  #define SMTP_PORT     25
+  #define SMTP_EXPECT     "220"
+  #define SMTP_HELO "HELO "
+***************
+*** 57,66 ****
+--- 75,85 ----
+   */
+    
+  #define SMTP_DUMMYCMD  "MAIL "
+  #define SMTP_USE_DUMMYCMD 1
+  #define SMTP_QUIT     "QUIT\r\n"
++ #define SMTP_STARTTLS   "STARTTLS\r\n"
+  
+  int process_arguments (int, char **);
+  int validate_arguments (void);
+  void print_help (void);
+  void print_usage (void);
+***************
+*** 72,88 ****
+  int warning_time = 0;
+  int check_warning_time = FALSE;
+  int critical_time = 0;
+  int check_critical_time = FALSE;
+  int verbose = FALSE;
+  
+  int
+  main (int argc, char **argv)
+  {
+!       int sd;
+        int result = STATE_UNKNOWN;
+-       char buffer[MAX_INPUT_BUFFER] = "";
+        char *from_str = NULL;
+        char *helocmd = NULL;
+  
+        if (process_arguments (argc, argv) != OK)
+                usage ("Invalid command arguments supplied\n");
+--- 91,116 ----
+  int warning_time = 0;
+  int check_warning_time = FALSE;
+  int critical_time = 0;
+  int check_critical_time = FALSE;
+  int verbose = FALSE;
++ int use_ssl = FALSE;
++ int sd;
++ char timestamp[17] = "";
++ //char *buffer = "";
++ char buffer[MAX_INPUT_BUFFER] = "";
++ enum {
++   TCP_PROTOCOL = 1,
++   UDP_PROTOCOL = 2,
++         MAXBUF = 1024
++ };
+  
+  int
+  main (int argc, char **argv)
+  {
+! 
+        int result = STATE_UNKNOWN;
+        char *from_str = NULL;
+        char *helocmd = NULL;
+  
+        if (process_arguments (argc, argv) != OK)
+                usage ("Invalid command arguments supplied\n");
+***************
+*** 114,130 ****
+        /* we connected, so close connection before exiting */
+        if (result == STATE_OK) {
+  
+                /* watch for the SMTP connection string and */
+                /* return a WARNING status if we couldn't read any data */
+!               if (recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0) == -1) {
+!                       printf ("recv() failed\n");
+                        result = STATE_WARNING;
+                }
+                else {
+                        /* strip the buffer of carriage returns */
+!                       strip (buffer);
+                        /* make sure we find the response we are looking for */
+                        if (!strstr (buffer, server_expect)) {
+                                if (server_port == SMTP_PORT)
+                                        printf ("Invalid SMTP response received from host\n");
+                                else
+--- 142,158 ----
+        /* we connected, so close connection before exiting */
+        if (result == STATE_OK) {
+  
+                /* watch for the SMTP connection string and */
+                /* return a WARNING status if we couldn't read any data */
+!               if (recv(sd, buffer, MAX_INPUT_BUFFER-1, 0) == -1) {
+!                       printf ("my_recv() failed\n");
+                        result = STATE_WARNING;
+                }
+                else {
+                        /* strip the buffer of carriage returns */
+!                       strip (buffer);
+                        /* make sure we find the response we are looking for */
+                        if (!strstr (buffer, server_expect)) {
+                                if (server_port == SMTP_PORT)
+                                        printf ("Invalid SMTP response received from host\n");
+                                else
+***************
+*** 132,162 ****
+                                                                        server_port);
+                                result = STATE_WARNING;
+                        }
+                }
+  
+                /* send the HELO command */
+                send(sd, helocmd, strlen(helocmd), 0);
+  
+                /* allow for response to helo command to reach us */
+!               recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+!                               
+  #ifdef SMTP_USE_DUMMYCMD
+                send(sd, from_str, strlen(from_str), 0);
+  
+                /* allow for response to DUMMYCMD to reach us */
+!               recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+  
+                if (verbose == TRUE) 
+                        printf("DUMMYCMD: %s\n%s\n",from_str,buffer);
+  #endif /* SMTP_USE_DUMMYCMD */
+! 
+                /* tell the server we're done */
+                send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+  
+                /* finally close the connection */
+!               close (sd);
+        }
+  
+        /* reset the alarm */
+        alarm (0);
+  
+--- 160,228 ----
+                                                                        server_port);
+                                result = STATE_WARNING;
+                        }
+                }
+  
++ #ifdef HAVE_SSL
++               if(use_ssl) {
++               /* send the STARTTLS command */
++                 send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);           
++ 
++                 recv(sd, buffer, MAX_INPUT_BUFFER-1, 0); // wait for it
++                 if(connect_STARTTLS() != OK) {
++                   printf ("ERROR: Cannot create SSL context.\n");
++                   return STATE_CRITICAL;
++                 }
++                 if ( check_cert ) {
++                   if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
++                     result = check_certificate (&server_cert);
++                     X509_free(server_cert);
++                   } 
++                   else {
++                     printf("ERROR: Cannot retrieve server certificate.\n");
++                     result = STATE_CRITICAL;
++                   }
++                   my_close ();
++                   return result;
++                 }
++               }
++ #endif
++ 
+                /* send the HELO command */
++ #ifdef HAVE_SSL
++                 if (use_ssl)
++                 SSL_write(ssl, helocmd, strlen (helocmd));
++                 else
++ #endif
+                send(sd, helocmd, strlen(helocmd), 0);
+  
+                /* allow for response to helo command to reach us */
+!               my_recv();
+! #if defined(SMTP_USE_DUMMYCMD) && defined(HAVE_SSL)
+!               if (use_ssl)
+!                 SSL_write(ssl,from_str, strlen(from_str));
+!               else
+! #endif
+  #ifdef SMTP_USE_DUMMYCMD
+                send(sd, from_str, strlen(from_str), 0);
+  
+                /* allow for response to DUMMYCMD to reach us */
+!               my_recv();
+  
+                if (verbose == TRUE) 
+                        printf("DUMMYCMD: %s\n%s\n",from_str,buffer);
+  #endif /* SMTP_USE_DUMMYCMD */
+! #ifdef HAVE_SSL
+!               if (use_ssl)
+!                 SSL_write(ssl,SMTP_QUIT,strlen (SMTP_QUIT));
+!               else
+! #endif
+                /* tell the server we're done */
+                send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+  
+                /* finally close the connection */
+!               my_close ();
+        }
+  
+        /* reset the alarm */
+        alarm (0);
+  
+***************
+*** 197,206 ****
+--- 263,274 ----
+                {"port", required_argument, 0, 'p'},
+                {"from", required_argument, 0, 'f'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
++               {"starttls",no_argument,0,'S'},
++               {"certificate",required_argument,0,'C'},
+                {0, 0, 0, 0}
+        };
+  #endif
+  
+        if (argc < 2)
+***************
+*** 216,229 ****
+        }
+  
+        while (1) {
+  #ifdef HAVE_GETOPT_H
+                c =
+!                       getopt_long (argc, argv, "+hVvt:p:f:e:c:w:H:", long_options,
+                                                                         &option_index);
+  #else
+!               c = getopt (argc, argv, "+?hVvt:p:f:e:c:w:H:");
+  #endif
+                if (c == -1 || c == EOF)
+                        break;
+  
+                switch (c) {
+--- 284,297 ----
+        }
+  
+        while (1) {
+  #ifdef HAVE_GETOPT_H
+                c =
+!                       getopt_long (argc, argv, "+hVvt:p:f:e:c:w:H:SC:", long_options,
+                                                                         &option_index);
+  #else
+!               c = getopt (argc, argv, "+?hVvt:p:f:e:c:w:H:SC:");
+  #endif
+                if (c == -1 || c == EOF)
+                        break;
+  
+                switch (c) {
+***************
+*** 276,285 ****
+--- 344,369 ----
+                        }
+                        else {
+                                usage ("Time interval must be a nonnegative integer\n");
+                        }
+                        break;
++               case 'S':
++                /* starttls */
++                       use_ssl = TRUE;
++                       break;
++                 case 'C': /* Check SSL cert validity */
++ #ifdef HAVE_SSL
++                 if (!is_intnonneg (optarg))
++                   usage2 ("invalid certificate expiration period", optarg);
++                   days_till_exp = atoi (optarg);
++                   check_cert = TRUE;
++                 use_ssl = TRUE;
++ #else
++                   terminate (STATE_UNKNOWN,
++                              "SSL support not available.  Install OpenSSL and recompile.");
++ #endif
++                 break;
+                case 'V':                                                                       /* version */
+                        print_revision (progname, "$Revision: 1.9.2.2 $");
+                        exit (STATE_OK);
+                case 'h':                                                                       /* help */
+                        print_help ();
+***************
+*** 344,353 ****
+--- 428,443 ----
+                 "   Seconds necessary to result in a warning status\n"
+                 " -c, --critical=INTEGER\n"
+                 "   Seconds necessary to result in a critical status\n"
+                 " -t, --timeout=INTEGER\n"
+                 "   Seconds before connection attempt times out (default: %d)\n"
++ #ifdef HAVE_SSL
++                " -S, --starttls\n"
++                "   Use starttls for connection\n"
++                " -C, --certificate\n"
++                "   Check certificate\n"
++ #endif                
+                 " -v, --verbose\n"
+                 "   Print extra information (command-line use only)\n"
+                 " -h, --help\n"
+                 "   Print detailed help screen\n"
+                 " -V, --version\n"
+***************
+*** 365,370 ****
+--- 455,615 ----
+  {
+        printf
+                ("Usage: %s -H host [-e expect] [-p port] [-f from addr] [-w warn] [-c crit] [-t timeout] [-v]\n"
+                 "       %s --help\n"
+                 "       %s --version\n", progname, progname, progname);
++ }
++ 
++ #ifdef HAVE_SSL
++ int
++ connect_STARTTLS (void)
++ {
++   SSL_METHOD *meth;
++ 
++   /* Initialize SSL context */
++   SSLeay_add_ssl_algorithms ();
++   meth = SSLv2_client_method ();
++   SSL_load_error_strings ();
++   if ((ctx = SSL_CTX_new (meth)) == NULL)
++     {
++       printf ("ERROR: Cannot create SSL context.\n");
++       return STATE_CRITICAL;
++     }
++       /* Do the SSL handshake */
++       if ((ssl = SSL_new (ctx)) != NULL)
++       {
++         SSL_set_fd (ssl, sd);
++         /* original version checked for -1
++            I look for success instead (1) */
++         if (SSL_connect (ssl) == 1)
++           return OK;
++         ERR_print_errors_fp (stderr);
++       }
++       else
++       {
++         printf ("ERROR: Cannot initiate SSL handshake.\n");
++       }
++       /* this causes a seg fault
++        not sure why, being sloppy 
++        and commenting it out */
++       //      SSL_free (ssl);
++     
++ 
++   SSL_CTX_free (ctx);
++   my_close ();
++ 
++   return STATE_CRITICAL;
++ }
++ #endif
++ 
++ #ifdef HAVE_SSL
++ int
++ check_certificate (X509 ** certificate)
++ {
++   ASN1_STRING *tm;
++   int offset;
++   struct tm stamp;
++   int days_left;
++ 
++ 
++   /* Retrieve timestamp of certificate */
++   tm = X509_get_notAfter (*certificate);
++ 
++   /* Generate tm structure to process timestamp */
++   if (tm->type == V_ASN1_UTCTIME) {
++     if (tm->length < 10) {
++       printf ("ERROR: Wrong time format in certificate.\n");
++       return STATE_CRITICAL;
++     }
++     else {
++       stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
++       if (stamp.tm_year < 50)
++         stamp.tm_year += 100;
++       offset = 0;
++     }
++   }
++   else {
++     if (tm->length < 12) {
++       printf ("ERROR: Wrong time format in certificate.\n");
++       return STATE_CRITICAL;
++     }
++     else {
++                         stamp.tm_year =
++                           (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
++                           (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
++                         stamp.tm_year -= 1900;
++                         offset = 2;
++     }
++   }
++         stamp.tm_mon =
++           (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
++         stamp.tm_mday =
++           (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
++         stamp.tm_hour =
++           (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
++         stamp.tm_min =
++           (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
++         stamp.tm_sec = 0;
++         stamp.tm_isdst = -1;
++ 
++         days_left = (mktime (&stamp) - time (NULL)) / 86400;
++         snprintf
++           (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
++            stamp.tm_mon + 1,
++            stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
++ 
++         if (days_left > 0 && days_left <= days_till_exp) {
++           printf ("Certificate expires in %d day(s) (%s).\n", days_left, timestamp);
++           return STATE_WARNING;
++         }
++         if (days_left < 0) {
++           printf ("Certificate expired on %s.\n", timestamp);
++           return STATE_CRITICAL;
++         }
++ 
++         if (days_left == 0) {
++           printf ("Certificate expires today (%s).\n", timestamp);
++           return STATE_WARNING;
++         }
++ 
++         printf ("Certificate will expire on %s.\n", timestamp);
++ 
++         return STATE_OK;
++ }
++ #endif
++ 
++ int
++ my_recv (void)
++ {
++   int i;
++ 
++ #ifdef HAVE_SSL
++   if (use_ssl) {
++     i = SSL_read (ssl, buffer, MAXBUF - 1);
++   }
++   else {
++ #endif
++     i = read (sd, buffer, MAXBUF - 1);
++ #ifdef HAVE_SSL
++   }
++ #endif
++ 
++   return i;
++ }
++ 
++ int
++ my_close (void)
++ {
++ #ifdef HAVE_SSL
++   if (use_ssl == TRUE) {
++     SSL_shutdown (ssl);
++     SSL_free (ssl);
++     SSL_CTX_free (ctx);
++     return 0;
++   }
++   else {
++ #endif
++     return close (sd);
++ #ifdef HAVE_SSL
++   }
++ #endif
+  }
diff --git a/web/attachments/105911-check_tcp.c.patch b/web/attachments/105911-check_tcp.c.patch
new file mode 100644
index 0000000..d080c65
--- /dev/null
+++ b/web/attachments/105911-check_tcp.c.patch
@@ -0,0 +1,22 @@
+--- check_tcp.c.orig    Thu Sep 16 13:03:28 2004
++++ check_tcp.c Wed Oct 20 12:52:06 2004
+@@ -553,8 +553,9 @@
+ 
+   /* Initialize SSL context */
+   SSLeay_add_ssl_algorithms ();
+-  meth = SSLv2_client_method ();
++  meth = SSLv23_client_method ();
+   SSL_load_error_strings ();
++  OpenSSL_add_all_algorithms();
+   if ((ctx = SSL_CTX_new (meth)) == NULL)
+     {
+       printf ("ERROR: Cannot create SSL context.\n");
+@@ -577,7 +578,7 @@
+       if ((ssl = SSL_new (ctx)) != NULL)
+       {
+         SSL_set_fd (ssl, sd);
+-        if (SSL_connect (ssl) != -1)
++        if (SSL_connect(ssl) == 1)
+           return OK;
+         ERR_print_errors_fp (stderr);
+       }
diff --git a/web/attachments/106626-check_nwstat.c.patch b/web/attachments/106626-check_nwstat.c.patch
new file mode 100644
index 0000000..28ac31d
--- /dev/null
+++ b/web/attachments/106626-check_nwstat.c.patch
@@ -0,0 +1,18 @@
+--- check_nwstat.c.orig Tue Oct 26 15:38:55 2004
++++ check_nwstat.c      Tue Oct 26 15:40:36 2004
+@@ -178,13 +178,13 @@
+                if(result!=STATE_OK)
+                        return result;
+                if(!strcmp(recv_buffer,"-1\n"))
+-                       asprintf(&netware_version,"");
++                       netware_version = strdup("");
+                else {
+                        recv_buffer[strlen(recv_buffer)-1]=0;
+                        asprintf(&netware_version,"NetWare %s: ",recv_buffer);
+                }
+        } else
+-               asprintf(&netware_version,"");
++               netware_version = strdup("");
+ 
+ 
+ 
diff --git a/web/attachments/106646-check_nwstat.c.patch b/web/attachments/106646-check_nwstat.c.patch
new file mode 100644
index 0000000..28ac31d
--- /dev/null
+++ b/web/attachments/106646-check_nwstat.c.patch
@@ -0,0 +1,18 @@
+--- check_nwstat.c.orig Tue Oct 26 15:38:55 2004
++++ check_nwstat.c      Tue Oct 26 15:40:36 2004
+@@ -178,13 +178,13 @@
+                if(result!=STATE_OK)
+                        return result;
+                if(!strcmp(recv_buffer,"-1\n"))
+-                       asprintf(&netware_version,"");
++                       netware_version = strdup("");
+                else {
+                        recv_buffer[strlen(recv_buffer)-1]=0;
+                        asprintf(&netware_version,"NetWare %s: ",recv_buffer);
+                }
+        } else
+-               asprintf(&netware_version,"");
++               netware_version = strdup("");
+ 
+ 
+ 
diff --git a/web/attachments/106647-check_tcp.c.patch b/web/attachments/106647-check_tcp.c.patch
new file mode 100644
index 0000000..d080c65
--- /dev/null
+++ b/web/attachments/106647-check_tcp.c.patch
@@ -0,0 +1,22 @@
+--- check_tcp.c.orig    Thu Sep 16 13:03:28 2004
++++ check_tcp.c Wed Oct 20 12:52:06 2004
+@@ -553,8 +553,9 @@
+ 
+   /* Initialize SSL context */
+   SSLeay_add_ssl_algorithms ();
+-  meth = SSLv2_client_method ();
++  meth = SSLv23_client_method ();
+   SSL_load_error_strings ();
++  OpenSSL_add_all_algorithms();
+   if ((ctx = SSL_CTX_new (meth)) == NULL)
+     {
+       printf ("ERROR: Cannot create SSL context.\n");
+@@ -577,7 +578,7 @@
+       if ((ssl = SSL_new (ctx)) != NULL)
+       {
+         SSL_set_fd (ssl, sd);
+-        if (SSL_connect (ssl) != -1)
++        if (SSL_connect(ssl) == 1)
+           return OK;
+         ERR_print_errors_fp (stderr);
+       }
diff --git a/web/attachments/109117-check_dns.c.patch b/web/attachments/109117-check_dns.c.patch
new file mode 100644
index 0000000..9546cd6
--- /dev/null
+++ b/web/attachments/109117-check_dns.c.patch
@@ -0,0 +1,64 @@
+--- check_dns.c.old     2004-11-17 13:18:35.000000000 -0700
++++ check_dns.c 2004-11-17 12:53:21.000000000 -0700
+@@ -38,6 +38,7 @@
+ #define ADDRESS_LENGTH 256
+ char query_address[ADDRESS_LENGTH] = "";
+ char dns_server[ADDRESS_LENGTH] = "";
++int dns_server_port = 53;
+ char ptr_server[ADDRESS_LENGTH] = "";
+ int verbose = FALSE;
+ char expected_address[ADDRESS_LENGTH] = "";
+@@ -76,7 +77,7 @@
+        }
+ 
+        /* get the command to run */
+-       asprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND, query_address, dns_server);
++       asprintf (&command_line, "%s %s %s -port=%d", NSLOOKUP_COMMAND, query_address, dns_server, dns_server_port);
+ 
+        alarm (timeout_interval);
+        gettimeofday (&tv, NULL);
+@@ -275,6 +276,7 @@
+                {"timeout", required_argument, 0, 't'},
+                {"hostname", required_argument, 0, 'H'},
+                {"server", required_argument, 0, 's'},
++               {"port", required_argument, 0, 'p'},
+                {"reverse-server", required_argument, 0, 'r'},
+                {"expected-address", required_argument, 0, 'a'},
+                {"expect-authority", no_argument, 0, 'A'},
+@@ -289,7 +291,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVvAt:H:s:r:a:", long_opts, &opt_index);
++               c = getopt_long (argc, argv, "hVvAt:H:p:s:r:a:", long_opts, &opt_index);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -316,6 +318,9 @@
+                                die (STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        strcpy (query_address, optarg);
+                        break;
++               case 'p': /* hostname */
++                       dns_server_port = atoi(optarg);
++                       break;
+                case 's': /* server name */
+                        /* TODO: this is_host check is probably unnecessary. */
+                        /* Better to confirm nslookup response matches */
+@@ -403,6 +408,8 @@
+    The name or address you want to query\n\
+ -s, --server=HOST\n\
+    Optional DNS server you want to use for the lookup\n\
++-p, --port=HOST\n\
++   Optional DNS server port, defaults to 53\n\
+ -a, --expected-address=IP-ADDRESS\n\
+    Optional IP address you expect the DNS server to return\n\
+ -A, --expect-authority\n\
+@@ -426,7 +433,7 @@
+ print_usage (void)
+ {
+        printf (_("\
+-Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout]\n\
++Usage: %s -H host [-s server] [-p port] [-a expected-address] [-A] [-t timeout]\n\
+        %s --help\n\
+        %s --version\n"), progname, progname, progname);
+ }
diff --git a/web/attachments/110840-check_snmp_disk_monitor.pl.patch b/web/attachments/110840-check_snmp_disk_monitor.pl.patch
new file mode 100644
index 0000000..b617909
--- /dev/null
+++ b/web/attachments/110840-check_snmp_disk_monitor.pl.patch
@@ -0,0 +1,13 @@
+--- check_snmp_disk_monitor.pl.orig     2004-12-01 16:20:14.502241047 +0300
++++ check_snmp_disk_monitor.pl  2004-12-01 16:20:34.524424531 +0300
+@@ -37,8 +37,8 @@
+         'H:s'   => \$opt_host,          'hostname:s'  => \$opt_host,
+         'p:i'   => \$opt_port,          'port:i'      => \$opt_port,
+         'C:s'   => \$opt_community,     'community:s' => \$opt_community,
+-        'c:i'   => \$opt_crit,          'critical:i'  => \$opt_crit,
+-        'w:i'   => \$opt_warn,          'warning:i'   => \$opt_warn,
++        'c:i'   => \$opt_critical,      'critical:i'  => \$opt_critical,
++        'w:i'   => \$opt_warning,       'warning:i'   => \$opt_warning,
+         't:i'   => \$TIMEOUT,           'timeout:i'   => \$TIMEOUT,    
+         'm:s'   => \$opt_mountpoint,    'mountpoint:s'=> \$opt_mountpoint
+     );
diff --git a/web/attachments/111261-nagiosplug-prototypes_-Wall-cleanup.diff b/web/attachments/111261-nagiosplug-prototypes_-Wall-cleanup.diff
new file mode 100644
index 0000000..43b3e43
--- /dev/null
+++ b/web/attachments/111261-nagiosplug-prototypes_-Wall-cleanup.diff
@@ -0,0 +1,1311 @@
+diff -urN ../nagiosplug.orig/plugins/Makefile.in plugins/Makefile.in
+--- ../nagiosplug.orig/plugins/Makefile.in      1970-01-01 01:00:00.000000000 +0100
++++ plugins/Makefile.in 2004-12-04 16:20:36.000000000 +0100
+@@ -0,0 +1,945 @@
++# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++SOURCES = check_by_ssh.c check_dig.c check_disk.c check_dns.c check_dummy.c check_fping.c check_game.c check_hpjd.c check_http.c check_icmp.c check_ide-smart.c check_ldap.c check_load.c check_mrtg.c check_mrtgtraf.c check_mysql.c check_nagios.c check_nt.c check_nwstat.c check_overcr.c check_pgsql.c check_ping.c check_procs.c check_radius.c check_real.c check_smtp.c check_snmp.c check_ssh.c check_swap.c check_tcp.c check_time.c check_udp.c check_ups.c check_users.c negate.c urlize.c
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++libexec_PROGRAMS = check_disk$(EXEEXT) check_dummy$(EXEEXT) \
++       check_http$(EXEEXT) check_load$(EXEEXT) check_mrtg$(EXEEXT) \
++       check_mrtgtraf$(EXEEXT) check_nwstat$(EXEEXT) \
++       check_overcr$(EXEEXT) check_ping$(EXEEXT) check_real$(EXEEXT) \
++       check_smtp$(EXEEXT) check_ssh$(EXEEXT) check_tcp$(EXEEXT) \
++       check_time$(EXEEXT) check_udp$(EXEEXT) check_ups$(EXEEXT) \
++       check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) \
++       check_icmp$(EXEEXT) @EXTRAS@
++EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \
++       check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \
++       check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \
++       check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \
++       check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \
++       check_ide-smart$(EXEEXT) check_procs$(EXEEXT)
++subdir = plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/lib/codeset.m4 \
++       $(top_srcdir)/lib/error.m4 $(top_srcdir)/lib/fstypename.m4 \
++       $(top_srcdir)/lib/fsusage.m4 $(top_srcdir)/lib/gettext.m4 \
++       $(top_srcdir)/lib/glibc21.m4 $(top_srcdir)/lib/iconv.m4 \
++       $(top_srcdir)/lib/intdiv0.m4 $(top_srcdir)/lib/inttypes-pri.m4 \
++       $(top_srcdir)/lib/inttypes.m4 $(top_srcdir)/lib/inttypes_h.m4 \
++       $(top_srcdir)/lib/lcmessage.m4 $(top_srcdir)/lib/lib-ld.m4 \
++       $(top_srcdir)/lib/lib-link.m4 $(top_srcdir)/lib/lib-prefix.m4 \
++       $(top_srcdir)/lib/ls-mntd-fs.m4 $(top_srcdir)/lib/onceonly.m4 \
++       $(top_srcdir)/lib/progtest.m4 $(top_srcdir)/lib/stdint_h.m4 \
++       $(top_srcdir)/lib/uintmax_t.m4 $(top_srcdir)/lib/ulonglong.m4 \
++       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++       $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__installdirs = "$(DESTDIR)$(libexecdir)"
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(libexec_PROGRAMS)
++check_by_ssh_SOURCES = check_by_ssh.c
++check_by_ssh_OBJECTS = check_by_ssh.$(OBJEXT)
++am__DEPENDENCIES_1 = utils.o ../lib/libnagiosplug.a
++am__DEPENDENCIES_2 =
++am__DEPENDENCIES_3 = netutils.o $(am__DEPENDENCIES_1) \
++       $(am__DEPENDENCIES_2)
++am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2)
++check_dig_SOURCES = check_dig.c
++check_dig_OBJECTS = check_dig.$(OBJEXT)
++check_disk_SOURCES = check_disk.c
++check_disk_OBJECTS = check_disk.$(OBJEXT)
++check_dns_SOURCES = check_dns.c
++check_dns_OBJECTS = check_dns.$(OBJEXT)
++check_dummy_SOURCES = check_dummy.c
++check_dummy_OBJECTS = check_dummy.$(OBJEXT)
++check_fping_SOURCES = check_fping.c
++check_fping_OBJECTS = check_fping.$(OBJEXT)
++check_game_SOURCES = check_game.c
++check_game_OBJECTS = check_game.$(OBJEXT)
++check_hpjd_SOURCES = check_hpjd.c
++check_hpjd_OBJECTS = check_hpjd.$(OBJEXT)
++check_http_SOURCES = check_http.c
++check_http_OBJECTS = check_http.$(OBJEXT)
++check_icmp_SOURCES = check_icmp.c
++check_icmp_OBJECTS = check_icmp.$(OBJEXT)
++check_icmp_LDADD = $(LDADD)
++check_ide_smart_SOURCES = check_ide-smart.c
++check_ide_smart_OBJECTS = check_ide-smart.$(OBJEXT)
++check_ide_smart_LDADD = $(LDADD)
++check_ldap_SOURCES = check_ldap.c
++check_ldap_OBJECTS = check_ldap.$(OBJEXT)
++check_load_SOURCES = check_load.c
++check_load_OBJECTS = check_load.$(OBJEXT)
++check_mrtg_SOURCES = check_mrtg.c
++check_mrtg_OBJECTS = check_mrtg.$(OBJEXT)
++check_mrtgtraf_SOURCES = check_mrtgtraf.c
++check_mrtgtraf_OBJECTS = check_mrtgtraf.$(OBJEXT)
++check_mysql_SOURCES = check_mysql.c
++check_mysql_OBJECTS = check_mysql.$(OBJEXT)
++check_nagios_SOURCES = check_nagios.c
++check_nagios_OBJECTS = check_nagios.$(OBJEXT)
++check_nt_SOURCES = check_nt.c
++check_nt_OBJECTS = check_nt.$(OBJEXT)
++check_nwstat_SOURCES = check_nwstat.c
++check_nwstat_OBJECTS = check_nwstat.$(OBJEXT)
++check_overcr_SOURCES = check_overcr.c
++check_overcr_OBJECTS = check_overcr.$(OBJEXT)
++check_pgsql_SOURCES = check_pgsql.c
++check_pgsql_OBJECTS = check_pgsql.$(OBJEXT)
++check_ping_SOURCES = check_ping.c
++check_ping_OBJECTS = check_ping.$(OBJEXT)
++check_procs_SOURCES = check_procs.c
++check_procs_OBJECTS = check_procs.$(OBJEXT)
++check_radius_SOURCES = check_radius.c
++check_radius_OBJECTS = check_radius.$(OBJEXT)
++check_real_SOURCES = check_real.c
++check_real_OBJECTS = check_real.$(OBJEXT)
++check_smtp_SOURCES = check_smtp.c
++check_smtp_OBJECTS = check_smtp.$(OBJEXT)
++check_snmp_SOURCES = check_snmp.c
++check_snmp_OBJECTS = check_snmp.$(OBJEXT)
++check_ssh_SOURCES = check_ssh.c
++check_ssh_OBJECTS = check_ssh.$(OBJEXT)
++check_swap_SOURCES = check_swap.c
++check_swap_OBJECTS = check_swap.$(OBJEXT)
++check_tcp_SOURCES = check_tcp.c
++check_tcp_OBJECTS = check_tcp.$(OBJEXT)
++check_time_SOURCES = check_time.c
++check_time_OBJECTS = check_time.$(OBJEXT)
++check_udp_SOURCES = check_udp.c
++check_udp_OBJECTS = check_udp.$(OBJEXT)
++check_ups_SOURCES = check_ups.c
++check_ups_OBJECTS = check_ups.$(OBJEXT)
++check_users_SOURCES = check_users.c
++check_users_OBJECTS = check_users.$(OBJEXT)
++negate_SOURCES = negate.c
++negate_OBJECTS = negate.$(OBJEXT)
++urlize_SOURCES = urlize.c
++urlize_OBJECTS = urlize.$(OBJEXT)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = check_by_ssh.c check_dig.c check_disk.c check_dns.c \
++       check_dummy.c check_fping.c check_game.c check_hpjd.c \
++       check_http.c check_icmp.c check_ide-smart.c check_ldap.c \
++       check_load.c check_mrtg.c check_mrtgtraf.c check_mysql.c \
++       check_nagios.c check_nt.c check_nwstat.c check_overcr.c \
++       check_pgsql.c check_ping.c check_procs.c check_radius.c \
++       check_real.c check_smtp.c check_snmp.c check_ssh.c \
++       check_swap.c check_tcp.c check_time.c check_udp.c check_ups.c \
++       check_users.c negate.c urlize.c
++DIST_SOURCES = check_by_ssh.c check_dig.c check_disk.c check_dns.c \
++       check_dummy.c check_fping.c check_game.c check_hpjd.c \
++       check_http.c check_icmp.c check_ide-smart.c check_ldap.c \
++       check_load.c check_mrtg.c check_mrtgtraf.c check_mysql.c \
++       check_nagios.c check_nt.c check_nwstat.c check_overcr.c \
++       check_pgsql.c check_ping.c check_procs.c check_radius.c \
++       check_real.c check_smtp.c check_snmp.c check_ssh.c \
++       check_swap.c check_tcp.c check_time.c check_udp.c check_ups.c \
++       check_users.c negate.c urlize.c
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
++INSTALL = @INSTALL@
++ACLOCAL = @ACLOCAL@
++ALLOCA = @ALLOCA@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++BASENAME = @BASENAME@
++BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
++DEPDIR = @DEPDIR@
++DEPLIBS = @DEPLIBS@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++EXTRAS = @EXTRAS@
++EXTRA_NETOBJS = @EXTRA_NETOBJS@
++GENCAT = @GENCAT@
++GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
++GLIBC21 = @GLIBC21@
++GMSGFMT = @GMSGFMT@
++HOSTNAME = @HOSTNAME@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_OPTS = @INSTALL_OPTS@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLBISON = @INTLBISON@
++INTLLIBS = @INTLLIBS@
++INTLOBJS = @INTLOBJS@
++INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
++KMEM_GROUP = @KMEM_GROUP@
++KRBINCLUDE = @KRBINCLUDE@
++LDAPINCLUDE = @LDAPINCLUDE@
++LDAPLIBS = @LDAPLIBS@
++LDFLAGS = @LDFLAGS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBINTL@ @LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
++MYSQLINCLUDE = @MYSQLINCLUDE@
++MYSQLLIBS = @MYSQLLIBS@
++NEED_SETGID = @NEED_SETGID@
++NEED_VA_LIST = @NEED_VA_LIST@
++OBJEXT = @OBJEXT@
++OPENSSL = @OPENSSL@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PATH_TO_DIG = @PATH_TO_DIG@
++PATH_TO_FPING = @PATH_TO_FPING@
++PATH_TO_HOST = @PATH_TO_HOST@
++PATH_TO_LMSTAT = @PATH_TO_LMSTAT@
++PATH_TO_LSPS = @PATH_TO_LSPS@
++PATH_TO_MAILQ = @PATH_TO_MAILQ@
++PATH_TO_NSLOOKUP = @PATH_TO_NSLOOKUP@
++PATH_TO_NTPDATE = @PATH_TO_NTPDATE@
++PATH_TO_NTPDC = @PATH_TO_NTPDC@
++PATH_TO_NTPQ = @PATH_TO_NTPQ@
++PATH_TO_PING = @PATH_TO_PING@
++PATH_TO_PING6 = @PATH_TO_PING6@
++PATH_TO_PS = @PATH_TO_PS@
++PATH_TO_QMAIL_QSTAT = @PATH_TO_QMAIL_QSTAT@
++PATH_TO_QSTAT = @PATH_TO_QSTAT@
++PATH_TO_QUAKESTAT = @PATH_TO_QUAKESTAT@
++PATH_TO_RPCINFO = @PATH_TO_RPCINFO@
++PATH_TO_SMBCLIENT = @PATH_TO_SMBCLIENT@
++PATH_TO_SNMPGET = @PATH_TO_SNMPGET@
++PATH_TO_SNMPGETNEXT = @PATH_TO_SNMPGETNEXT@
++PATH_TO_SSH = @PATH_TO_SSH@
++PATH_TO_SWAP = @PATH_TO_SWAP@
++PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@
++PATH_TO_UPTIME = @PATH_TO_UPTIME@
++PATH_TO_WHO = @PATH_TO_WHO@
++PERL = @PERL@
++PGINCLUDE = @PGINCLUDE@
++PGLIBS = @PGLIBS@
++PKG_ARCH = @PKG_ARCH@
++PLUGIN_TEST = @PLUGIN_TEST@
++POSUB = @POSUB@
++POW_LIB = @POW_LIB@
++PYTHON = @PYTHON@
++RADIUSLIBS = @RADIUSLIBS@
++RANLIB = @RANLIB@
++RELEASE = @RELEASE@
++REV_DATESTAMP = @REV_DATESTAMP@
++REV_TIMESTAMP = @REV_TIMESTAMP@
++SCRIPT_TEST = @SCRIPT_TEST@
++SET_MAKE = @SET_MAKE@
++SH = @SH@
++SHELL = @SHELL@
++SOCKETLIBS = @SOCKETLIBS@
++SSLINCLUDE = @SSLINCLUDE@
++SSLLIBS = @SSLLIBS@
++STRIP = @STRIP@
++SUPPORT = @SUPPORT@
++USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++WARRANTY = @WARRANTY@
++XGETTEXT = @XGETTEXT@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_RANLIB = @ac_ct_RANLIB@
++ac_ct_STRIP = @ac_ct_STRIP@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++check_mysql_LDFLAGS = @check_mysql_LDFLAGS@
++check_tcp_ssl = @check_tcp_ssl@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++with_nagios_group = @with_nagios_group@
++with_nagios_user = @with_nagios_user@
++with_trusted_path = @with_trusted_path@
++INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl \
++@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
++
++localedir = $(datadir)/locale
++check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
++       @check_tcp_ssl@
++
++EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \
++       getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h
++
++PLUGINHDRS = common.h
++BASEOBJS = utils.o ../lib/libnagiosplug.a
++NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
++NETLIBS = $(NETOBJS) $(SOCKETLIBS)
++TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
++TESTS = @PLUGIN_TEST@
++AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
++
++##############################################################################
++# the actual targets
++check_dig_LDADD = $(NETLIBS) popen.o 
++check_disk_LDADD = $(BASEOBJS) popen.o
++check_dns_LDADD = $(NETLIBS) popen.o
++check_dummy_LDADD = $(BASEOBJS)
++check_fping_LDADD = $(NETLIBS) popen.o
++check_game_LDADD = $(BASEOBJS) popen.o
++check_http_LDADD = $(NETLIBS) $(SSLLIBS)
++check_hpjd_LDADD = $(NETLIBS) popen.o
++check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
++check_load_LDADD = $(BASEOBJS) popen.o
++check_mrtg_LDADD = $(BASEOBJS)
++check_mrtgtraf_LDADD = $(BASEOBJS)
++check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
++check_nagios_LDADD = $(BASEOBJS) popen.o
++check_nt_LDADD = $(NETLIBS) 
++check_nwstat_LDADD = $(NETLIBS)
++check_overcr_LDADD = $(NETLIBS)
++check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
++check_ping_LDADD = $(NETLIBS) popen.o
++check_procs_LDADD = $(BASEOBJS) popen.o
++check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
++check_real_LDADD = $(NETLIBS)
++check_snmp_LDADD = $(BASEOBJS) popen.o
++check_smtp_LDADD = $(NETLIBS)
++check_ssh_LDADD = $(NETLIBS)
++check_swap_LDADD = $(BASEOBJS) popen.o
++check_tcp_LDADD = $(NETLIBS) $(SSLLIBS)
++check_time_LDADD = $(NETLIBS)
++check_udp_LDADD = $(NETLIBS)
++check_ups_LDADD = $(NETLIBS)
++check_users_LDADD = $(BASEOBJS) popen.o
++check_by_ssh_LDADD = $(NETLIBS) popen.o
++negate_LDADD = $(BASEOBJS) popen.o
++urlize_LDADD = $(BASEOBJS) popen.o
++check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) popen.o $(DEPLIBS)
++check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS)
++check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) popen.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)
++check_http_DEPENDENCIES = check_http.c $(NETOBJS) $(DEPLIBS)
++check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) popen.o $(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_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
++check_nt_DEPENDENCIES = check_nt.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) popen.o $(DEPLIBS)
++check_smtp_DEPENDENCIES = check_smtp.c $(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 $(NETOBJS) $(DEPLIBS)
++check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
++check_udp_DEPENDENCIES = check_udp.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) popen.o $(DEPLIBS)
++negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS)
++urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
++check_icmp_DEPENDENCIES = check_icmp.c $(DEPLIBS)
++all: all-am
++
++.SUFFIXES:
++.SUFFIXES: .c .o .obj
++$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++       @for dep in $?; do \
++         case '$(am__configure_deps)' in \
++           *$$dep*) \
++             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++               && exit 0; \
++             exit 1;; \
++         esac; \
++       done; \
++       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/Makefile'; \
++       cd $(top_srcdir) && \
++         $(AUTOMAKE) --gnu  plugins/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++       @case '$?' in \
++         *config.status*) \
++           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++         *) \
++           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++       esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure:  $(am__configure_deps)
++       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++install-libexecPROGRAMS: $(libexec_PROGRAMS)
++       @$(NORMAL_INSTALL)
++       test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++       @list='$(libexec_PROGRAMS)'; for p in $$list; do \
++         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++         if test -f $$p \
++         ; then \
++           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++          echo " $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
++          $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++         else :; fi; \
++       done
++
++uninstall-libexecPROGRAMS:
++       @$(NORMAL_UNINSTALL)
++       @list='$(libexec_PROGRAMS)'; for p in $$list; do \
++         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++         echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
++         rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++       done
++
++clean-libexecPROGRAMS:
++       -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
++check_by_ssh$(EXEEXT): $(check_by_ssh_OBJECTS) $(check_by_ssh_DEPENDENCIES) 
++       @rm -f check_by_ssh$(EXEEXT)
++       $(LINK) $(check_by_ssh_LDFLAGS) $(check_by_ssh_OBJECTS) $(check_by_ssh_LDADD) $(LIBS)
++check_dig$(EXEEXT): $(check_dig_OBJECTS) $(check_dig_DEPENDENCIES) 
++       @rm -f check_dig$(EXEEXT)
++       $(LINK) $(check_dig_LDFLAGS) $(check_dig_OBJECTS) $(check_dig_LDADD) $(LIBS)
++check_disk$(EXEEXT): $(check_disk_OBJECTS) $(check_disk_DEPENDENCIES) 
++       @rm -f check_disk$(EXEEXT)
++       $(LINK) $(check_disk_LDFLAGS) $(check_disk_OBJECTS) $(check_disk_LDADD) $(LIBS)
++check_dns$(EXEEXT): $(check_dns_OBJECTS) $(check_dns_DEPENDENCIES) 
++       @rm -f check_dns$(EXEEXT)
++       $(LINK) $(check_dns_LDFLAGS) $(check_dns_OBJECTS) $(check_dns_LDADD) $(LIBS)
++check_dummy$(EXEEXT): $(check_dummy_OBJECTS) $(check_dummy_DEPENDENCIES) 
++       @rm -f check_dummy$(EXEEXT)
++       $(LINK) $(check_dummy_LDFLAGS) $(check_dummy_OBJECTS) $(check_dummy_LDADD) $(LIBS)
++check_fping$(EXEEXT): $(check_fping_OBJECTS) $(check_fping_DEPENDENCIES) 
++       @rm -f check_fping$(EXEEXT)
++       $(LINK) $(check_fping_LDFLAGS) $(check_fping_OBJECTS) $(check_fping_LDADD) $(LIBS)
++check_game$(EXEEXT): $(check_game_OBJECTS) $(check_game_DEPENDENCIES) 
++       @rm -f check_game$(EXEEXT)
++       $(LINK) $(check_game_LDFLAGS) $(check_game_OBJECTS) $(check_game_LDADD) $(LIBS)
++check_hpjd$(EXEEXT): $(check_hpjd_OBJECTS) $(check_hpjd_DEPENDENCIES) 
++       @rm -f check_hpjd$(EXEEXT)
++       $(LINK) $(check_hpjd_LDFLAGS) $(check_hpjd_OBJECTS) $(check_hpjd_LDADD) $(LIBS)
++check_http$(EXEEXT): $(check_http_OBJECTS) $(check_http_DEPENDENCIES) 
++       @rm -f check_http$(EXEEXT)
++       $(LINK) $(check_http_LDFLAGS) $(check_http_OBJECTS) $(check_http_LDADD) $(LIBS)
++check_icmp$(EXEEXT): $(check_icmp_OBJECTS) $(check_icmp_DEPENDENCIES) 
++       @rm -f check_icmp$(EXEEXT)
++       $(LINK) $(check_icmp_LDFLAGS) $(check_icmp_OBJECTS) $(check_icmp_LDADD) $(LIBS)
++check_ide-smart$(EXEEXT): $(check_ide_smart_OBJECTS) $(check_ide_smart_DEPENDENCIES) 
++       @rm -f check_ide-smart$(EXEEXT)
++       $(LINK) $(check_ide_smart_LDFLAGS) $(check_ide_smart_OBJECTS) $(check_ide_smart_LDADD) $(LIBS)
++check_ldap$(EXEEXT): $(check_ldap_OBJECTS) $(check_ldap_DEPENDENCIES) 
++       @rm -f check_ldap$(EXEEXT)
++       $(LINK) $(check_ldap_LDFLAGS) $(check_ldap_OBJECTS) $(check_ldap_LDADD) $(LIBS)
++check_load$(EXEEXT): $(check_load_OBJECTS) $(check_load_DEPENDENCIES) 
++       @rm -f check_load$(EXEEXT)
++       $(LINK) $(check_load_LDFLAGS) $(check_load_OBJECTS) $(check_load_LDADD) $(LIBS)
++check_mrtg$(EXEEXT): $(check_mrtg_OBJECTS) $(check_mrtg_DEPENDENCIES) 
++       @rm -f check_mrtg$(EXEEXT)
++       $(LINK) $(check_mrtg_LDFLAGS) $(check_mrtg_OBJECTS) $(check_mrtg_LDADD) $(LIBS)
++check_mrtgtraf$(EXEEXT): $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_DEPENDENCIES) 
++       @rm -f check_mrtgtraf$(EXEEXT)
++       $(LINK) $(check_mrtgtraf_LDFLAGS) $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_LDADD) $(LIBS)
++check_mysql$(EXEEXT): $(check_mysql_OBJECTS) $(check_mysql_DEPENDENCIES) 
++       @rm -f check_mysql$(EXEEXT)
++       $(LINK) $(check_mysql_LDFLAGS) $(check_mysql_OBJECTS) $(check_mysql_LDADD) $(LIBS)
++check_nagios$(EXEEXT): $(check_nagios_OBJECTS) $(check_nagios_DEPENDENCIES) 
++       @rm -f check_nagios$(EXEEXT)
++       $(LINK) $(check_nagios_LDFLAGS) $(check_nagios_OBJECTS) $(check_nagios_LDADD) $(LIBS)
++check_nt$(EXEEXT): $(check_nt_OBJECTS) $(check_nt_DEPENDENCIES) 
++       @rm -f check_nt$(EXEEXT)
++       $(LINK) $(check_nt_LDFLAGS) $(check_nt_OBJECTS) $(check_nt_LDADD) $(LIBS)
++check_nwstat$(EXEEXT): $(check_nwstat_OBJECTS) $(check_nwstat_DEPENDENCIES) 
++       @rm -f check_nwstat$(EXEEXT)
++       $(LINK) $(check_nwstat_LDFLAGS) $(check_nwstat_OBJECTS) $(check_nwstat_LDADD) $(LIBS)
++check_overcr$(EXEEXT): $(check_overcr_OBJECTS) $(check_overcr_DEPENDENCIES) 
++       @rm -f check_overcr$(EXEEXT)
++       $(LINK) $(check_overcr_LDFLAGS) $(check_overcr_OBJECTS) $(check_overcr_LDADD) $(LIBS)
++check_pgsql$(EXEEXT): $(check_pgsql_OBJECTS) $(check_pgsql_DEPENDENCIES) 
++       @rm -f check_pgsql$(EXEEXT)
++       $(LINK) $(check_pgsql_LDFLAGS) $(check_pgsql_OBJECTS) $(check_pgsql_LDADD) $(LIBS)
++check_ping$(EXEEXT): $(check_ping_OBJECTS) $(check_ping_DEPENDENCIES) 
++       @rm -f check_ping$(EXEEXT)
++       $(LINK) $(check_ping_LDFLAGS) $(check_ping_OBJECTS) $(check_ping_LDADD) $(LIBS)
++check_procs$(EXEEXT): $(check_procs_OBJECTS) $(check_procs_DEPENDENCIES) 
++       @rm -f check_procs$(EXEEXT)
++       $(LINK) $(check_procs_LDFLAGS) $(check_procs_OBJECTS) $(check_procs_LDADD) $(LIBS)
++check_radius$(EXEEXT): $(check_radius_OBJECTS) $(check_radius_DEPENDENCIES) 
++       @rm -f check_radius$(EXEEXT)
++       $(LINK) $(check_radius_LDFLAGS) $(check_radius_OBJECTS) $(check_radius_LDADD) $(LIBS)
++check_real$(EXEEXT): $(check_real_OBJECTS) $(check_real_DEPENDENCIES) 
++       @rm -f check_real$(EXEEXT)
++       $(LINK) $(check_real_LDFLAGS) $(check_real_OBJECTS) $(check_real_LDADD) $(LIBS)
++check_smtp$(EXEEXT): $(check_smtp_OBJECTS) $(check_smtp_DEPENDENCIES) 
++       @rm -f check_smtp$(EXEEXT)
++       $(LINK) $(check_smtp_LDFLAGS) $(check_smtp_OBJECTS) $(check_smtp_LDADD) $(LIBS)
++check_snmp$(EXEEXT): $(check_snmp_OBJECTS) $(check_snmp_DEPENDENCIES) 
++       @rm -f check_snmp$(EXEEXT)
++       $(LINK) $(check_snmp_LDFLAGS) $(check_snmp_OBJECTS) $(check_snmp_LDADD) $(LIBS)
++check_ssh$(EXEEXT): $(check_ssh_OBJECTS) $(check_ssh_DEPENDENCIES) 
++       @rm -f check_ssh$(EXEEXT)
++       $(LINK) $(check_ssh_LDFLAGS) $(check_ssh_OBJECTS) $(check_ssh_LDADD) $(LIBS)
++check_swap$(EXEEXT): $(check_swap_OBJECTS) $(check_swap_DEPENDENCIES) 
++       @rm -f check_swap$(EXEEXT)
++       $(LINK) $(check_swap_LDFLAGS) $(check_swap_OBJECTS) $(check_swap_LDADD) $(LIBS)
++check_tcp$(EXEEXT): $(check_tcp_OBJECTS) $(check_tcp_DEPENDENCIES) 
++       @rm -f check_tcp$(EXEEXT)
++       $(LINK) $(check_tcp_LDFLAGS) $(check_tcp_OBJECTS) $(check_tcp_LDADD) $(LIBS)
++check_time$(EXEEXT): $(check_time_OBJECTS) $(check_time_DEPENDENCIES) 
++       @rm -f check_time$(EXEEXT)
++       $(LINK) $(check_time_LDFLAGS) $(check_time_OBJECTS) $(check_time_LDADD) $(LIBS)
++check_udp$(EXEEXT): $(check_udp_OBJECTS) $(check_udp_DEPENDENCIES) 
++       @rm -f check_udp$(EXEEXT)
++       $(LINK) $(check_udp_LDFLAGS) $(check_udp_OBJECTS) $(check_udp_LDADD) $(LIBS)
++check_ups$(EXEEXT): $(check_ups_OBJECTS) $(check_ups_DEPENDENCIES) 
++       @rm -f check_ups$(EXEEXT)
++       $(LINK) $(check_ups_LDFLAGS) $(check_ups_OBJECTS) $(check_ups_LDADD) $(LIBS)
++check_users$(EXEEXT): $(check_users_OBJECTS) $(check_users_DEPENDENCIES) 
++       @rm -f check_users$(EXEEXT)
++       $(LINK) $(check_users_LDFLAGS) $(check_users_OBJECTS) $(check_users_LDADD) $(LIBS)
++negate$(EXEEXT): $(negate_OBJECTS) $(negate_DEPENDENCIES) 
++       @rm -f negate$(EXEEXT)
++       $(LINK) $(negate_LDFLAGS) $(negate_OBJECTS) $(negate_LDADD) $(LIBS)
++urlize$(EXEEXT): $(urlize_OBJECTS) $(urlize_DEPENDENCIES) 
++       @rm -f urlize$(EXEEXT)
++       $(LINK) $(urlize_LDFLAGS) $(urlize_OBJECTS) $(urlize_LDADD) $(LIBS)
++
++mostlyclean-compile:
++       -rm -f *.$(OBJEXT)
++
++distclean-compile:
++       -rm -f *.tab.c
++
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_by_ssh.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dig.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_disk.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dns.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dummy.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fping.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_game.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_hpjd.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_http.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_icmp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ide-smart.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ldap.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_load.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mrtg.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mrtgtraf.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mysql.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nagios.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nt.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nwstat.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_overcr.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pgsql.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ping.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_procs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_radius.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_real.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_smtp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_snmp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ssh.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_swap.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tcp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_time.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_udp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ups.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_users.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negate.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlize.Po@am__quote@
++
++.c.o:
++@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@  $(COMPILE) -c $<
++
++.c.obj:
++@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
++uninstall-info-am:
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++       unique=`for i in $$list; do \
++           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++         done | \
++         $(AWK) '    { files[$$0] = 1; } \
++              END { for (i in files) print i; }'`; \
++       mkid -fID $$unique
++tags: TAGS
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++               $(TAGS_FILES) $(LISP)
++       tags=; \
++       here=`pwd`; \
++       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++       unique=`for i in $$list; do \
++           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++         done | \
++         $(AWK) '    { files[$$0] = 1; } \
++              END { for (i in files) print i; }'`; \
++       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++         test -n "$$unique" || unique=$$empty_fix; \
++         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++           $$tags $$unique; \
++       fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++               $(TAGS_FILES) $(LISP)
++       tags=; \
++       here=`pwd`; \
++       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++       unique=`for i in $$list; do \
++           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++         done | \
++         $(AWK) '    { files[$$0] = 1; } \
++              END { for (i in files) print i; }'`; \
++       test -z "$(CTAGS_ARGS)$$tags$$unique" \
++         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++            $$tags $$unique
++
++GTAGS:
++       here=`$(am__cd) $(top_builddir) && pwd` \
++         && cd $(top_srcdir) \
++         && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++check-TESTS: $(TESTS)
++       @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++       srcdir=$(srcdir); export srcdir; \
++       list='$(TESTS)'; \
++       if test -n "$$list"; then \
++         for tst in $$list; do \
++           if test -f ./$$tst; then dir=./; \
++           elif test -f $$tst; then dir=; \
++           else dir="$(srcdir)/"; fi; \
++           if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
++             all=`expr $$all + 1`; \
++             case " $(XFAIL_TESTS) " in \
++             *" $$tst "*) \
++               xpass=`expr $$xpass + 1`; \
++               failed=`expr $$failed + 1`; \
++               echo "XPASS: $$tst"; \
++             ;; \
++             *) \
++               echo "PASS: $$tst"; \
++             ;; \
++             esac; \
++           elif test $$? -ne 77; then \
++             all=`expr $$all + 1`; \
++             case " $(XFAIL_TESTS) " in \
++             *" $$tst "*) \
++               xfail=`expr $$xfail + 1`; \
++               echo "XFAIL: $$tst"; \
++             ;; \
++             *) \
++               failed=`expr $$failed + 1`; \
++               echo "FAIL: $$tst"; \
++             ;; \
++             esac; \
++           else \
++             skip=`expr $$skip + 1`; \
++             echo "SKIP: $$tst"; \
++           fi; \
++         done; \
++         if test "$$failed" -eq 0; then \
++           if test "$$xfail" -eq 0; then \
++             banner="All $$all tests passed"; \
++           else \
++             banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++           fi; \
++         else \
++           if test "$$xpass" -eq 0; then \
++             banner="$$failed of $$all tests failed"; \
++           else \
++             banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++           fi; \
++         fi; \
++         dashes="$$banner"; \
++         skipped=""; \
++         if test "$$skip" -ne 0; then \
++           skipped="($$skip tests were not run)"; \
++           test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
++             dashes="$$skipped"; \
++         fi; \
++         report=""; \
++         if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
++           report="Please report to $(PACKAGE_BUGREPORT)"; \
++           test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
++             dashes="$$report"; \
++         fi; \
++         dashes=`echo "$$dashes" | sed s/./=/g`; \
++         echo "$$dashes"; \
++         echo "$$banner"; \
++         test -z "$$skipped" || echo "$$skipped"; \
++         test -z "$$report" || echo "$$report"; \
++         echo "$$dashes"; \
++         test "$$failed" -eq 0; \
++       else :; fi
++
++distdir: $(DISTFILES)
++       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++       list='$(DISTFILES)'; for file in $$list; do \
++         case $$file in \
++           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++         esac; \
++         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++           dir="/$$dir"; \
++           $(mkdir_p) "$(distdir)$$dir"; \
++         else \
++           dir=''; \
++         fi; \
++         if test -d $$d/$$file; then \
++           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++           fi; \
++           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++         else \
++           test -f $(distdir)/$$file \
++           || cp -p $$d/$$file $(distdir)/$$file \
++           || exit 1; \
++         fi; \
++       done
++check-am: all-am
++       $(MAKE) $(AM_MAKEFLAGS) check-TESTS
++check: check-am
++all-am: Makefile $(PROGRAMS) all-local
++installdirs:
++       for dir in "$(DESTDIR)$(libexecdir)"; do \
++         test -z "$$dir" || $(mkdir_p) "$$dir"; \
++       done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++         `test -z '$(STRIP)' || \
++           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++       @echo "This command is intended for maintainers to use"
++       @echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libexecPROGRAMS clean-local \
++       mostlyclean-am
++
++distclean: distclean-am
++       -rm -rf ./$(DEPDIR)
++       -rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++       distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am: install-libexecPROGRAMS
++       @$(NORMAL_INSTALL)
++       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++       -rm -rf ./$(DEPDIR)
++       -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
++       uninstall-local
++
++.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
++       clean clean-generic clean-libexecPROGRAMS clean-local ctags \
++       distclean distclean-compile distclean-generic distclean-tags \
++       distdir dvi dvi-am html html-am info info-am install \
++       install-am install-data install-data-am install-exec \
++       install-exec-am install-exec-hook install-info install-info-am \
++       install-libexecPROGRAMS install-man install-strip installcheck \
++       installcheck-am installdirs maintainer-clean \
++       maintainer-clean-generic mostlyclean mostlyclean-compile \
++       mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
++       uninstall-am uninstall-info-am uninstall-libexecPROGRAMS \
++       uninstall-local
++
++
++test:
++       perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
++
++##############################################################################
++# secondary dependencies
++
++popen.o: popen.c popen.h $(PLUGINHDRS)
++
++utils.o: utils.c utils.h $(PLUGINHDRS)
++
++netutils.o: netutils.c netutils.h $(PLUGINHDRS)
++
++getaddrinfo.o: getaddrinfo.h $(PLUGINHDRS)
++
++gethostbyname.o: gethostbyname.h $(PLUGINHDRS)
++
++all-local: $(check_tcp_programs)
++
++$(check_tcp_programs): check_tcp
++       rm -f $@
++       ln -s check_tcp $@
++
++install-exec-hook:
++       cd $(DESTDIR)$(libexecdir) && \
++       for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done
++
++clean-local:
++       rm -f $(check_tcp_programs)
++
++uninstall-local:
++       cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs)
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -urN ../nagiosplug.orig/plugins/check_http.c plugins/check_http.c
+--- ../nagiosplug.orig/plugins/check_http.c     2004-12-04 00:55:28.000000000 +0100
++++ plugins/check_http.c        2004-12-04 16:57:05.000000000 +0100
+@@ -676,17 +676,17 @@
+        } else if (!document_date || !*document_date) {
+                die (STATE_CRITICAL, _("Document modification date unknown\n"));
+        } else {
+-               time_t sd = parse_time_string (server_date);
+-               time_t dd = parse_time_string (document_date);
++               time_t srv_data = parse_time_string (server_date);
++               time_t doc_data = parse_time_string (document_date);
+ 
+-               if (sd <= 0) {
++               if (srv_data <= 0) {
+                        die (STATE_CRITICAL, _("CRITICAL - Server date \"%100s\" unparsable"), server_date);
+-               } else if (dd <= 0) {
++               } else if (doc_data <= 0) {
+                        die (STATE_CRITICAL, _("CRITICAL - Document date \"%100s\" unparsable"), document_date);
+-               } else if (dd > sd + 30) {
+-                       die (STATE_CRITICAL, _("CRITICAL - Document is %d seconds in the future\n"), dd - sd);
+-               } else if (dd < sd - maximum_age) {
+-               int n = (sd - dd);
++               } else if (doc_data > srv_data + 30) {
++                       die (STATE_CRITICAL, _("CRITICAL - Document is %d seconds in the future\n"), (int)doc_data - (int)srv_data);
++               } else if (doc_data < srv_data - maximum_age) {
++               int n = (srv_data - doc_data);
+                if (n > (60 * 60 * 24 * 2))
+                        die (STATE_CRITICAL,
+                          _("CRITICAL - Last modified %.1f days ago\n"),
+diff -urN ../nagiosplug.orig/plugins/check_icmp.c plugins/check_icmp.c
+--- ../nagiosplug.orig/plugins/check_icmp.c     2004-12-02 09:44:36.000000000 +0100
++++ plugins/check_icmp.c        2004-12-04 17:04:18.000000000 +0100
+@@ -1,6 +1,8 @@
+ /*
+- * check_icmp - A hack of fping2 to work with nagios.
+- *              This way we don't have to use the output parser.
++ * $Id: check_icmp.c,v 1.9 2004/09/24 10:07:23 exon Exp $
++ *
++ * This is a hack of fping2 made to work with nagios.
++ * It's fast and removes the necessity of parsing another programs output.
+  *
+  * VIEWING NOTES:
+  * This file was formatted with tab indents at a tab stop of 4.
+@@ -40,14 +42,8 @@
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>
+ 
+-/* Linux has bizarre ip.h and ip_icmp.h */
+-/* Taken from the fping distro. Thank you. */
+-#if defined( __linux__ )
+-#include "linux.h"
+-#else
+ #include <netinet/ip.h>
+ #include <netinet/ip_icmp.h>
+-#endif /* defined(__linux__) */
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
+@@ -70,9 +66,8 @@
+ extern int optind, opterr;
+ 
+ /*** Constants ***/
+-#define REV_DATE       "2004-09-06"
+ #define EMAIL          "ae@op5.se"
+-#define VERSION                "0.8"
++#define VERSION                "0.8.1"
+ 
+ #ifndef INADDR_NONE
+ # define INADDR_NONE 0xffffffU
+@@ -441,7 +436,7 @@
+                                break;
+ 
+                        case 'v':
+-                               printf("%s: Version %s $Date: 2004/12/02 08:44:36 $\n", prog, VERSION, REV_DATE);
++                               printf("%s: Version %s $Date: 2004/09/24 10:07:23 $\n", prog, VERSION);
+                                printf("%s: comments to %s\n", prog, EMAIL);
+                                exit(STATE_OK);
+ 
+@@ -1275,7 +1270,7 @@
+  * crash on any other errrors
+  ************************************************************/
+ /* TODO: add MSG_DONTWAIT to recvfrom flags (currently 0) */
+-int recvfrom_wto(int sock, char *buf, int len, struct sockaddr *saddr, int timo)
++int recvfrom_wto(int lsock, char *buf, int len, struct sockaddr *saddr, int timo)
+ {
+        int nfound = 0, slen, n;
+        struct timeval to;
+@@ -1289,8 +1284,8 @@
+ 
+        FD_ZERO(&readset);
+        FD_ZERO(&writeset);
+-       FD_SET(sock, &readset);
+-       nfound = select(sock + 1, &readset, &writeset, NULL, &to);
++       FD_SET(lsock, &readset);
++       nfound = select(lsock + 1, &readset, &writeset, NULL, &to);
+        if(nfound < 0) crash("select() in recvfrom_wto");
+ 
+        if(nfound == 0) return -1;                              /* timeout */
+diff -urN ../nagiosplug.orig/plugins/check_nt.c plugins/check_nt.c
+--- ../nagiosplug.orig/plugins/check_nt.c       2004-12-04 00:55:29.000000000 +0100
++++ plugins/check_nt.c  2004-12-04 17:05:20.000000000 +0100
+@@ -86,7 +86,7 @@
+        int return_code = STATE_UNKNOWN;
+        char *send_buffer=NULL;
+        char *output_message=NULL;
+-       char *perfdata=NULL;
++       char *perf_data=NULL;
+        char *temp_string=NULL;
+        char *temp_string_perf=NULL;
+        char *description=NULL,*counter_unit = NULL;
+@@ -103,7 +103,7 @@
+        unsigned long utilization;
+        unsigned long uptime;
+        unsigned long age_in_minutes;
+-       double counter_value;
++       double counter_value = 0.0;
+        int offset=0;
+        int updays=0;
+        int uphours=0;
+@@ -174,15 +174,15 @@
+ 
+                                asprintf(&output_message,_(" %lu%% (%lu min average)"), utilization, lvalue_list[0+offset]);
+                                asprintf(&temp_string,"%s%s",temp_string,output_message);
+-                               asprintf(&perfdata,_(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0+offset], utilization,
++                               asprintf(&perf_data,_(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0+offset], utilization,
+                                  lvalue_list[1+offset], lvalue_list[2+offset]);
+-                               asprintf(&temp_string_perf,"%s%s",temp_string_perf,perfdata);
++                               asprintf(&temp_string_perf,"%s%s",temp_string_perf,perf_data);
+                                offset+=3;      /* move across the array */
+                        }
+       
+                        if (strlen(temp_string)>10) {  /* we had at least one loop */
+                                output_message = strdup (temp_string);
+-                               perfdata = temp_string_perf;
++                               perf_data = temp_string_perf;
+                        } else
+                                output_message = strdup (_("not enough values for -l parameters"));
+                }       
+@@ -231,7 +231,7 @@
+                                        return_code=STATE_OK;   
+ 
+                                output_message = strdup (temp_string);
+-                               perfdata = temp_string_perf;
++                               perf_data = temp_string_perf;
+                        } else {
+                                output_message = strdup (_("Free disk space : Invalid drive "));
+                                return_code=STATE_UNKNOWN;
+@@ -270,7 +270,7 @@
+                asprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"), 
+                  mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space,  
+                  (mem_commitLimit - mem_commitByte) / 1048567, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+-               asprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567,
++               asprintf(&perf_data,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567,
+                  warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567);
+        
+                return_code=STATE_OK;
+@@ -285,11 +285,11 @@
+ 
+ 
+                /* 
+-               CHECK_COUNTER has been modified to provide extensive perfdata information.
++               CHECK_COUNTER has been modified to provide extensive perf_data information.
+                        In order to do this, some modifications have been done to the code
+                        and some constraints have been introduced.
+                        
+-                       1) For the sake of simplicity of the code, perfdata information will only be 
++                       1) For the sake of simplicity of the code, perf_data information will only be 
+                         provided when the "description" field is added. 
+                        
+                        2) If the counter you're going to measure is percent-based, the code will detect
+@@ -426,10 +426,10 @@
+        /* reset timeout */
+        alarm(0);
+ 
+-       if (perfdata==NULL)
++       if (perf_data==NULL)
+                printf("%s\n",output_message);
+        else
+-               printf("%s | %s\n",output_message,perfdata);
++               printf("%s | %s\n",output_message,perf_data);
+        return return_code;
+ }
+ 
+diff -urN ../nagiosplug.orig/plugins/check_nwstat.c plugins/check_nwstat.c
+--- ../nagiosplug.orig/plugins/check_nwstat.c   2004-12-04 00:55:29.000000000 +0100
++++ plugins/check_nwstat.c      2004-12-04 16:57:52.000000000 +0100
+@@ -909,8 +909,7 @@
+ 
+        printf (_("\
+ This plugin attempts to contact the MRTGEXT NLM running on a\n\
+-Novell server to gather the requested system information.\n\n"),
+-               progname);
++Novell server to gather the requested system information.\n\n"));
+ 
+        print_usage();
+ 
+diff -urN ../nagiosplug.orig/plugins/check_smtp.c plugins/check_smtp.c
+--- ../nagiosplug.orig/plugins/check_smtp.c     2004-12-04 00:55:29.000000000 +0100
++++ plugins/check_smtp.c        2004-12-04 16:58:37.000000000 +0100
+@@ -218,11 +218,12 @@
+        microsec = deltime (tv);
+        elapsed_time = (double)microsec / 1.0e6;
+ 
+-       if (result == STATE_OK)
++       if (result == STATE_OK) {
+                if (check_critical_time && elapsed_time > (double) critical_time)
+                        result = STATE_CRITICAL;
+                else if (check_warning_time && elapsed_time > (double) warning_time)
+                        result = STATE_WARNING;
++       }
+ 
+        printf (_("SMTP %s - %.3f sec. response time%s%s|%s\n"),
+                state_text (result), elapsed_time,
+diff -urN ../nagiosplug.orig/plugins/check_ssh.c plugins/check_ssh.c
+--- ../nagiosplug.orig/plugins/check_ssh.c      2004-12-04 00:55:29.000000000 +0100
++++ plugins/check_ssh.c 2004-12-04 16:51:10.000000000 +0100
+@@ -44,7 +44,7 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-int ssh_connect (char *haddr, int hport, char *remote_version);
++int ssh_connect (char *, int);
+ 
+ 
+ 
+@@ -66,7 +66,7 @@
+        alarm (socket_timeout);
+ 
+        /* ssh_connect exits if error is found */
+-       result = ssh_connect (server_name, port, remote_version);
++       result = ssh_connect (server_name, port);
+ 
+        alarm (0);
+ 
+@@ -197,7 +197,7 @@
+ 
+ 
+ int
+-ssh_connect (char *haddr, int hport, char *remote_version)
++ssh_connect (char *haddr, int hport)
+ {
+        int sd;
+        int result;
+diff -urN ../nagiosplug.orig/plugins/check_swap.c plugins/check_swap.c
+--- ../nagiosplug.orig/plugins/check_swap.c     2004-12-04 01:23:41.000000000 +0100
++++ plugins/check_swap.c        2004-12-04 17:02:41.000000000 +0100
+@@ -56,10 +56,10 @@
+        int result = STATE_UNKNOWN;
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *perf;
+-       int conv_factor = SWAP_CONVERSION;
+ #ifdef HAVE_PROC_MEMINFO
+        FILE *fp;
+ #else
++       int conv_factor = SWAP_CONVERSION;
+ # ifdef HAVE_SWAP
+        char *temp_buffer;
+        char *swap_command;
+diff -urN ../nagiosplug.orig/plugins/utils.h plugins/utils.h
+--- ../nagiosplug.orig/plugins/utils.h  2004-12-03 18:48:53.000000000 +0100
++++ plugins/utils.h     2004-12-04 16:40:13.000000000 +0100
+@@ -16,9 +16,9 @@
+ /* $Id: utils.h,v 1.21 2004/12/03 17:48:53 opensides Exp $ */
+ 
+ void support (void);
+-char *clean_revstring (const char *revstring);
++char *clean_revstring (const char *);
+ void print_revision (const char *, const char *);
+-void die (int result, const char *fmt, ...) __attribute__((noreturn,format(printf, 2, 3)));
++void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)));
+ 
+ /* Handle timeouts */
+ 
+@@ -57,7 +57,7 @@
+ #endif
+ 
+ #ifndef HAVE_GETTIMEOFDAY
+-int gettimeofday(struct timeval *tv, struct timezone *tz);
++int gettimeofday(struct timeval *, struct timezone *);
+ #endif
+ 
+ double delta_time (struct timeval tv);
+@@ -65,46 +65,47 @@
+ 
+ /* Handle strings safely */
+ 
+-void strip (char *buffer);
+-char *strscpy (char *dest, const char *src);
+-char *strnl (char *str);
+-char *strpcpy (char *dest, const char *src, const char *str);
+-char *strpcat (char *dest, const char *src, const char *str);
++void strip (char *);
++char *strscpy (char *, const char *);
++char *strnl (char *);
++char *strpcpy (char *, const char *, const char *);
++char *strpcat (char *, const char *, const char *);
+ 
+ int max_state (int a, int b);
+ 
+-void usage (const char *msg) __attribute__((noreturn));
+-void usage2(const char *msg, const char *arg) __attribute__((noreturn));
+-void usage3(const char *msg, int arg) __attribute__((noreturn));
++void usage (const char *) __attribute__((noreturn));
++void usage2(const char *, const char *) __attribute__((noreturn));
++void usage3(const char *, int) __attribute__((noreturn));
++void usage4(const char *);
+ 
+-const char *state_text (int result);
++const char *state_text (int);
+ 
+ #define max(a,b) (((a)>(b))?(a):(b))
+ #define min(a,b) (((a)<(b))?(a):(b))
+ 
+-char *perfdata (const char *label,
+- long int val,
+- const char *uom,
+- int warnp,
+- long int warn,
+- int critp,
+- long int crit,
+- int minp,
+- long int minv,
+- int maxp,
+- long int maxv);
+-
+-char *fperfdata (const char *label,
+- double val,
+- const char *uom,
+- int warnp,
+- double warn,
+- int critp,
+- double crit,
+- int minp,
+- double minv,
+- int maxp,
+- double maxv);
++char *perfdata (const char *,
++ long int,
++ const char *,
++ int,
++ long int,
++ int,
++ long int,
++ int,
++ long int,
++ int,
++ long int);
++
++char *fperfdata (const char *,
++ double,
++ const char *,
++ int,
++ double,
++ int,
++ double,
++ int,
++ double,
++ int,
++ double);
+ 
+ /* The idea here is that, although not every plugin will use all of these, 
+    most will or should.  Therefore, for consistency, these very common 
diff --git a/web/attachments/111856-check_tcp.c.mismatch.diff b/web/attachments/111856-check_tcp.c.mismatch.diff
new file mode 100644
index 0000000..d3a32c6
--- /dev/null
+++ b/web/attachments/111856-check_tcp.c.mismatch.diff
@@ -0,0 +1,66 @@
+--- check_tcp.c.orig    Thu Dec  9 13:01:37 2004
++++ check_tcp.c Thu Dec  9 16:52:52 2004
+@@ -97,6 +97,7 @@
+ int use_ssl = FALSE;
+ int sd = 0;
+ char *buffer;
++int expect_mismatch_state = STATE_WARNING;
+ 
+ 
+ 
+@@ -333,7 +334,7 @@
+                                if (verbose)
+                                        printf ("%d %d\n", i, (int)server_expect_count);
+                                if (i >= (int)server_expect_count)
+-                                       die (STATE_WARNING, _("Invalid response from host\n"));
++                                       die (expect_mismatch_state, _("Unexpected response from host: %s\n"), status);
+                                if (strstr (status, server_expect[i]))
+                                        break;
+                        }
+@@ -416,6 +417,7 @@
+                {"jail", required_argument, 0, 'j'},
+                {"delay", required_argument, 0, 'd'},
+                {"refuse", required_argument, 0, 'r'},
++               {"mismatch", required_argument, 0, 'M'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"verbose", no_argument, 0, 'v'},
+@@ -548,7 +550,17 @@
+                        else if (!strncmp(optarg,"crit",4))
+                                econn_refuse_state = STATE_CRITICAL;
+                        else
+-                               usage (_("Refuse mut be one of ok, warn, crit\n"));
++                               usage (_("Refuse must be one of ok, warn, crit\n"));
++                       break;
++               case 'M':
++                       if (!strncmp(optarg,"ok",2))
++                               expect_mismatch_state = STATE_OK;
++                       else if (!strncmp(optarg,"warn",4))
++                               expect_mismatch_state = STATE_WARNING;
++                       else if (!strncmp(optarg,"crit",4))
++                               expect_mismatch_state = STATE_CRITICAL;
++                       else
++                               usage (_("Mismatch must be one of ok, warn, crit\n"));
+                        break;
+                case 'd':
+                        if (is_intpos (optarg))
+@@ -764,6 +776,8 @@
+        printf (_("\
+  -r, --refuse=ok|warn|crit\n\
+     Accept tcp refusals with states ok, warn, crit (default: crit)\n\
++ -M, --mismatch=ok|warn|crit\n\
++    Accept expect mismatches with states ok, warn, crit (default: warn)\n\
+  -j, --jail\n\
+     Hide output from TCP socket\n\
+  -m, --maxbytes=INTEGER\n\
+@@ -798,8 +812,8 @@
+ Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
+   [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+   [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+-  [-r <refuse state>] [-v] [-4|-6] [-j] [-D <days to cert expiry>]\n\
+-  [-S <use SSL>]\n"), progname);
++  [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
++  [-D <days to cert expiry>] [-S <use SSL>]\n"), progname);
+        printf ("       %s (-h|--help)\n", progname);
+        printf ("       %s (-V|--version)\n", progname);
+ }
diff --git a/web/attachments/112577-check_smtp.c.patch.cvs.HEAD.20041215 b/web/attachments/112577-check_smtp.c.patch.cvs.HEAD.20041215
new file mode 100644
index 0000000..8dedb8c
--- /dev/null
+++ b/web/attachments/112577-check_smtp.c.patch.cvs.HEAD.20041215
@@ -0,0 +1,504 @@
+*** check_smtp.c.orig   2004-12-15 13:08:34.000000000 -0500
+--- check_smtp.c        2004-12-15 14:35:05.521604150 -0500
+***************
+*** 25,45 ****
+--- 25,77 ----
+  
+  #include "common.h"
+  #include "netutils.h"
+  #include "utils.h"
+  
++ #ifdef HAVE_SSL_H
++ #  include <rsa.h>
++ #  include <crypto.h>
++ #  include <x509.h>
++ #  include <pem.h>
++ #  include <ssl.h>
++ #  include <err.h>
++ #else
++ #  ifdef HAVE_OPENSSL_SSL_H
++ #    include <openssl/rsa.h>
++ #    include <openssl/crypto.h>
++ #    include <openssl/x509.h>
++ #    include <openssl/pem.h>
++ #    include <openssl/ssl.h>
++ #    include <openssl/err.h>
++ #  endif
++ #endif
++ 
++ #ifdef HAVE_SSL
++ 
++ int check_cert = FALSE;
++ int days_till_exp;
++ SSL_CTX *ctx;
++ SSL *ssl;
++ X509 *server_cert;
++ int connect_STARTTLS (void);
++ int check_certificate (X509 **);
++ #endif
++ 
+  enum {
+        SMTP_PORT       = 25
+  };
+  const char *SMTP_EXPECT = "220";
+  const char *SMTP_HELO = "HELO ";
+  const char *SMTP_QUIT = "QUIT\r\n";
++ const char *SMTP_STARTTLS = "STARTTLS\r\n";
+  
+  int process_arguments (int, char **);
+  int validate_arguments (void);
+  void print_help (void);
+  void print_usage (void);
++ int myrecv(void);
++ int my_close(void);
+  
+  #ifdef HAVE_REGEX_H
+  #include <regex.h>
+  char regex_expect[MAX_INPUT_BUFFER] = "";
+  regex_t preg;
+***************
+*** 66,87 ****
+  int warning_time = 0;
+  int check_warning_time = FALSE;
+  int critical_time = 0;
+  int check_critical_time = FALSE;
+  int verbose = 0;
+! 
+! 
+  
+  int
+  main (int argc, char **argv)
+  {
+!       int sd;
+        int n = 0;
+        double elapsed_time;
+        long microsec;
+        int result = STATE_UNKNOWN;
+-       char buffer[MAX_INPUT_BUFFER];
+        char *cmd_str = NULL;
+        char *helocmd = NULL;
+        struct timeval tv;
+  
+        setlocale (LC_ALL, "");
+--- 98,124 ----
+  int warning_time = 0;
+  int check_warning_time = FALSE;
+  int critical_time = 0;
+  int check_critical_time = FALSE;
+  int verbose = 0;
+! int use_ssl = FALSE;
+! int sd;
+! char buffer[MAX_INPUT_BUFFER];
+! enum {
+!   TCP_PROTOCOL = 1,
+!   UDP_PROTOCOL = 2,
+!   MAXBUF = 1024
+! };
+  
+  int
+  main (int argc, char **argv)
+  {
+! 
+        int n = 0;
+        double elapsed_time;
+        long microsec;
+        int result = STATE_UNKNOWN;
+        char *cmd_str = NULL;
+        char *helocmd = NULL;
+        struct timeval tv;
+  
+        setlocale (LC_ALL, "");
+***************
+*** 138,153 ****
+                                        printf (_("Invalid SMTP response received from host on port %d\n"),
+                                                                        server_port);
+                                result = STATE_WARNING;
+                        }
+                }
+! 
+                /* send the HELO command */
+                send(sd, helocmd, strlen(helocmd), 0);
+  
+                /* allow for response to helo command to reach us */
+!               recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+                                
+                /* sendmail will syslog a "NOQUEUE" error if session does not attempt
+                 * to do something useful. This can be prevented by giving a command
+                 * even if syntax is illegal (MAIL requires a FROM:<...> argument)
+                 *
+--- 175,223 ----
+                                        printf (_("Invalid SMTP response received from host on port %d\n"),
+                                                                        server_port);
+                                result = STATE_WARNING;
+                        }
+                }
+! #ifdef HAVE_SSL
+!               if(use_ssl) {
+!                 /* send the STARTTLS command */
+!                 send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
+! 
+!                 recv(sd,buffer, MAX_INPUT_BUFFER-1, 0); // wait for it
+!                 if (!strstr (buffer, server_expect)) {
+!                   printf (_("Server does not support STARTTLS\n"));
+!                   return STATE_UNKNOWN;
+!                 }
+!                 if(connect_STARTTLS() != OK) {
+!                   printf (_("ERROR: Cannot create SSL context.\n"));
+!                   return STATE_CRITICAL;
+!                 }
+!                 if ( check_cert ) {
+!                   if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
+!                     result = check_certificate (&server_cert);
+!                     X509_free(server_cert);
+!                   }
+!                   else {
+!                     printf (_("ERROR: Cannot retrieve server certificate.\n"));
+!                     result = STATE_CRITICAL;
+!                             
+!                   }
+!                   my_close();
+!                   return result;
+!                 }
+!               }
+! #endif
+                /* send the HELO command */
++ #ifdef HAVE_SSL
++               if (use_ssl)
++                 SSL_write(ssl, helocmd, strlen(helocmd));
++               else
++ #endif
+                send(sd, helocmd, strlen(helocmd), 0);
+  
+                /* allow for response to helo command to reach us */
+!               myrecv();
+                                
+                /* sendmail will syslog a "NOQUEUE" error if session does not attempt
+                 * to do something useful. This can be prevented by giving a command
+                 * even if syntax is illegal (MAIL requires a FROM:<...> argument)
+                 *
+***************
+*** 156,175 ****
+                 *
+                 * You can disable sending mail_command with '--nocommand'
+                 * Use the -f option to provide a FROM address
+                 */
+                if (smtp_use_dummycmd) {
+!                       send(sd, cmd_str, strlen(cmd_str), 0);
+!                       recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+!                       if (verbose) 
+!                               printf("%s", buffer);
+                }
+  
+                while (n < ncommands) {
+                        asprintf (&cmd_str, "%s%s", commands[n], "\r\n");
+                        send(sd, cmd_str, strlen(cmd_str), 0);
+!                       recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+                        if (verbose) 
+                                printf("%s", buffer);
+                        strip (buffer);
+                        if (n < nresponses) {
+  #ifdef HAVE_REGEX_H
+--- 226,255 ----
+                 *
+                 * You can disable sending mail_command with '--nocommand'
+                 * Use the -f option to provide a FROM address
+                 */
+                if (smtp_use_dummycmd) {
+! #ifdef HAVE_SSL
+!                 if (use_ssl)
+!                   SSL_write(ssl, cmd_str, strlen(cmd_str));
+!                 else
+! #endif
+!                 send(sd, cmd_str, strlen(cmd_str), 0);
+!                 myrecv();
+!                 if (verbose) 
+!                   printf("%s", buffer);
+                }
+  
+                while (n < ncommands) {
+                        asprintf (&cmd_str, "%s%s", commands[n], "\r\n");
++ #ifdef HAVE_SSL
++                       if (use_ssl)
++                         SSL_write(ssl,cmd_str, strlen(cmd_str));
++                       else
++ #endif
+                        send(sd, cmd_str, strlen(cmd_str), 0);
+!                       myrecv();
+                        if (verbose) 
+                                printf("%s", buffer);
+                        strip (buffer);
+                        if (n < nresponses) {
+  #ifdef HAVE_REGEX_H
+***************
+*** 204,213 ****
+--- 284,298 ----
+                        }
+                        n++;
+                }
+  
+                /* tell the server we're done */
++ #ifdef HAVE_SSL
++               if (use_ssl)
++                 SSL_write(ssl,SMTP_QUIT, strlen (SMTP_QUIT));
++               else
++ #endif
+                send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+  
+                /* finally close the connection */
+                close (sd);
+        }
+***************
+*** 259,268 ****
+--- 344,355 ----
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"help", no_argument, 0, 'h'},
++               {"starttls",no_argument,0,'S'},
++               {"certificate",required_argument,0,'D'},
+                {0, 0, 0, 0}
+        };
+  
+        if (argc < 2)
+                return ERROR;
+***************
+*** 275,285 ****
+                else if (strcmp ("-ct", argv[c]) == 0)
+                        strcpy (argv[c], "-c");
+        }
+  
+        while (1) {
+!               c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:",
+                                 longopts, &option);
+  
+                if (c == -1 || c == EOF)
+                        break;
+  
+--- 362,372 ----
+                else if (strcmp ("-ct", argv[c]) == 0)
+                        strcpy (argv[c], "-c");
+        }
+  
+        while (1) {
+!               c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:",
+                                 longopts, &option);
+  
+                if (c == -1 || c == EOF)
+                        break;
+  
+***************
+*** 352,361 ****
+--- 439,464 ----
+                        }
+                        else {
+                                usage4 (_("Time interval must be a positive integer"));
+                        }
+                        break;
++               case 'S':
++                 /* starttls */
++                       use_ssl = TRUE;
++                       break;
++               case 'D': 
++                 /* Check SSL cert validity */
++ #ifdef HAVE_SSL
++                 if (!is_intnonneg (optarg))
++                   usage2 ("invalid certificate expiration period",optarg);
++                 days_till_exp = atoi (optarg);
++                 check_cert = TRUE;
++ #else
++                 terminate (STATE_UNKNOWN,
++                            "SSL support not available.  Install OpenSSL and recompile.");
++ #endif
++                 break;
+                case '4':
+                        address_family = AF_INET;
+                        break;
+                case '6':
+  #ifdef USE_IPV6
+***************
+*** 443,452 ****
+--- 546,562 ----
+   -R, --command=STRING\n\
+     Expected response to command (may be used repeatedly)\n\
+   -f, --from=STRING\n\
+     FROM-address to include in MAIL command, required by Exchange 2000\n"),
+                SMTP_EXPECT);
++ #ifdef HAVE_SSL
++         printf (_("\
++  -D, --certificate=INTEGER\n\
++     Minimum number of days a certificate has to be valid.\n\
++  -S, --starttls\n\
++     Use STARTTLS for the connection.\n"));
++ #endif
+  
+        printf (_(UT_WARN_CRIT));
+  
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  
+***************
+*** 466,472 ****
+  void
+  print_usage (void)
+  {
+        printf ("\
+  Usage: %s -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
+!                   [-w warn] [-c crit] [-t timeout] [-n] [-v] [-4|-6]\n", progname);
+  }
+--- 576,731 ----
+  void
+  print_usage (void)
+  {
+        printf ("\
+  Usage: %s -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
+!                   [-w warn] [-c crit] [-t timeout] [-S] [-D days] [-n] [-v] [-4|-6]\n", progname);
+! }
+! 
+! #ifdef HAVE_SSL
+! int
+! connect_STARTTLS (void)
+! {
+!   SSL_METHOD *meth;
+! 
+!   /* Initialize SSL context */
+!   SSLeay_add_ssl_algorithms ();
+!   meth = SSLv2_client_method ();
+!   SSL_load_error_strings ();
+!   if ((ctx = SSL_CTX_new (meth)) == NULL)
+!     {
+!       printf(_("ERROR: Cannot create SSL context.\n"));
+!       return STATE_CRITICAL;
+!     }
+!   /* do the SSL handshake */
+!   if ((ssl = SSL_new (ctx)) != NULL)
+!     {
+!       SSL_set_fd (ssl, sd);
+!       /* original version checked for -1
+!        I look for success instead (1) */
+!       if (SSL_connect (ssl) == 1)
+!       return OK;
+!       ERR_print_errors_fp (stderr);
+!     }
+!   else
+!     {
+!       printf (_("ERROR: Cannot initiate SSL handshake.\n"));
+!     }
+!   /* this causes a seg faul
+!      not sure why, being sloppy
+!      and commenting it out */
+!   //  SSL_free (ssl);
+!   SSL_CTX_free(ctx);
+!   my_close();
+!   
+!   return STATE_CRITICAL;
+! }
+! 
+! int
+! check_certificate (X509 ** certificate)
+! {
+!   ASN1_STRING *tm;
+!   int offset;
+!   struct tm stamp;
+!   int days_left;
+! 
+!   /* Retrieve timestamp of certificate */
+!   tm = X509_get_notAfter (*certificate);
+!   
+!   /* Generate tm structure to process timestamp */
+!   if (tm->type == V_ASN1_UTCTIME) {
+!     if (tm->length < 10) {
+!       printf (_("ERROR: Wrong time format in certificate.\n"));
+!       return STATE_CRITICAL;
+!     }
+!     else {
+!       stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
+!       if (stamp.tm_year < 50)
+!       stamp.tm_year += 100;
+!       offset = 0;
+!     }
+!   }
+!   else {
+!     if (tm->length < 12) {
+!       printf (_("ERROR: Wrong time format in certificate.\n"));
+!       return STATE_CRITICAL;
+!     }
+!     else {
+!       stamp.tm_year =
+!       (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
+!       (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
+!       stamp.tm_year -= 1900;
+!       offset = 2;
+!     }
+!   }
+!   stamp.tm_mon =
+!     (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
+!   stamp.tm_mday =
+!     (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
+!   stamp.tm_hour =
+!     (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
+!   stamp.tm_min =
+!     (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
+!   stamp.tm_sec = 0;
+!   stamp.tm_isdst = -1;
+!   
+!   days_left = (mktime (&stamp) - time (NULL)) / 86400;
+!   snprintf
+!     (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
+!      stamp.tm_mon + 1,
+!      stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+!   
+!   if (days_left > 0 && days_left <= days_till_exp) {
+!     printf ("Certificate expires in %d day(s) (%s).\n", days_left, timestamp);
+!     return STATE_WARNING;
+!   }
+!   if (days_left < 0) {
+!     printf ("Certificate expired on %s.\n", timestamp);
+!     return STATE_CRITICAL;
+!   }
+!   
+!   if (days_left == 0) {
+!     printf ("Certificate expires today (%s).\n", timestamp);
+!     return STATE_WARNING;
+!   }
+!   
+!   printf ("Certificate will expire on %s.\n", timestamp);
+!   
+!   return STATE_OK;  
+! }
+! #endif
+! 
+! int
+! myrecv (void)
+! {
+!   int i;
+! 
+! #ifdef HAVE_SSL
+!   if (use_ssl) {
+!     i = SSL_read (ssl, buffer, MAXBUF - 1);
+!   }
+!   else {
+! #endif
+!     i = read (sd, buffer, MAXBUF - 1);
+! #ifdef HAVE_SSL
+!   }
+! #endif
+!   return i;
+! }
+! 
+! int 
+! my_close (void)
+! {
+! #ifdef HAVE_SSL
+!   if (use_ssl == TRUE) {
+!     SSL_shutdown (ssl);
+!     SSL_free (ssl);
+!     SSL_CTX_free (ctx);
+!     return 0;
+!   }
+!   else {
+! #endif
+!     return close(sd);
+! #ifdef HAVE_SSL
+!   }
+! #endif
+  }
diff --git a/web/attachments/112620-check_range.patch b/web/attachments/112620-check_range.patch
new file mode 100644
index 0000000..2ddd8a3
--- /dev/null
+++ b/web/attachments/112620-check_range.patch
@@ -0,0 +1,116 @@
+? plugins-scripts/t/utils.pm.t

+Index: test.pl.in

+===================================================================

+RCS file: /cvsroot/nagiosplug/nagiosplug/test.pl.in,v

+retrieving revision 1.2

+diff -u -w -u -r1.2 test.pl.in

+--- test.pl.in  25 Nov 2004 05:06:24 -0000      1.2

++++ test.pl.in  15 Dec 2004 23:59:46 -0000

+@@ -69,7 +69,7 @@

+        $tstdir = './t' unless ($tstdir);

+        opendir(DIR, $tstdir) || die "can't opendir $tstdir: $!";

+        while ($file = readdir(DIR)) {

+-               push @dots, "$tstdir/$file" if ($file =~ m/^[^\.]+\.t$/);

++               push @dots, "$tstdir/$file" if ($file =~ m/^[^\.]+.*\.t$/);

+        }

+        closedir DIR;

+ }

+Index: plugins-scripts/utils.pm.in

+===================================================================

+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-scripts/utils.pm.in,v

+retrieving revision 1.7

+diff -u -w -u -r1.7 utils.pm.in

+--- plugins-scripts/utils.pm.in 13 Apr 2003 04:25:36 -0000      1.7

++++ plugins-scripts/utils.pm.in 15 Dec 2004 23:59:46 -0000

+@@ -25,13 +25,14 @@

+ 

+ require Exporter;

+ @ISA = qw(Exporter);

+-@EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage);

++@EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage &check_range);

+ 

+ #use strict;

+ #use vars($TIMEOUT %ERRORS);

+ sub print_revision ($$);

+ sub usage;

+ sub support();

++sub check_range($$);

+ sub is_hostname;

+ 

+ ## updated by autoconf

+@@ -80,4 +81,75 @@

+        }

+ }

+ 

++sub check_range ($$)

++{

++  # Takes two parameters.  The first is a metric.  The second is

++  # a range using Nagios plugin range syntax.

++  # No explicit checking is done that the metric or the range consists

++  # of non-numeric values - they will be treated as zero.

++    

++  # Accepts ranges of the following form:

++  #

++  #   min:max (between min and max inclusive)

++  #   min: (equivalent to min:infinity)

++  #   :max (equivalent to 0:max)

++  #   max (equivalent :max which is equivalent to 0:max)

++  #   0 (equivalent to 0:infinity)

++  #

++  # The symbol ~ may be specified as the minimum portion of a range

++  # to represent -infinity.  The range may be prefixed by @ to negate

++  # the result (so the metric is critical if within the range).

++  # Note that ~:~ is treated as an invalid range

++    

++  my($metric) = shift(@_);

++  my($range) = shift(@_);

++    

++  # Take third and any subsequent parameters and concatenate with spaces

++  # to form the name of the range for use in error messages.

++  my($range_name) = join(' ', @_);

++  $range_name = " for $range_name." if ($range_name);

++

++  # Use strict doesn't let us do string/numeric conversions, so turn

++  # off warnings to get around that problem and the problem of undefined

++  # variables from the regex below.

++  local($^W) = 0;

++    

++  my($range_ok) = 0;

++

++  # Split the range into the optional 'invert range' prefix (@), minimum

++  # bound and upper bound, allowing all the variations.

++  my($invert_range, $lower, $upper) = $range =~ /^(\@)?(?:([^:])*:)?(.*)?$/;

++

++  # The above regex has problems with 0 (which means 0:infinity), so

++  # we have to correct for that (but not for :0, which means 0:0 and is

++  # handled correctly by the regex).

++  ($lower, $upper) = ($upper, $lower) if

++    (($upper eq '0' and not $lower) and $range !~ /:/);

++

++  # Check that upper >= lower, including the case when lower or upper is

++  # ~ (negative infinity).  

++  if ($upper eq '~' or ($lower ne '~' and $upper ne '' and $lower > $upper ))

++  {

++    return -1;

++  }

++

++  # If the lower bound is not ~ (negative infinity) then check that the

++  # metric is greater than or equal to the lower bound.  If the lower bound

++  # is ~ then the metric has to be OK because any metric has to be higher

++  # than negative infinity.

++  if ($lower ne '~')

++  {

++    $range_ok++ if ($metric >= $lower + 0);

++  }

++  else

++  {

++    $range_ok++;

++  }

++

++  $range_ok = 0 if ($upper ne '' and $metric > $upper + 0);

++  $range_ok ^= 1 if ($invert_range);

++    

++  return($range_ok);

++}

++

+ 1;

diff --git a/web/attachments/112621-utils.pm.t b/web/attachments/112621-utils.pm.t
new file mode 100644
index 0000000..630985c
--- /dev/null
+++ b/web/attachments/112621-utils.pm.t
@@ -0,0 +1,141 @@
+#! /usr/bin/perl -w

+BEGIN {use File::Basename; use lib(dirname($0) . "/.."); }

+

+use strict;

+use Test::Simple tests => 80;

+use utils qw(&check_range);

+

+

+my @tests =

+(

+  # Format: [metric, range, name, expected result]

+  # 

+  # 'Expected result' is the result expected from check_range: 0 if

+  # check_range should return 0 (metric is outside of range), 1 if

+  # check_range should return 1 (metric is inside range).  The expected

+  # result can also be -1, indicating that check_range should exit with

+  # plugin error code of 'UNKNOWN' after a usage error (caused by an

+  # invalid range).

+

+  # Check min:max ranges

+  [-1, '2:4', 'Test 1', 0],

+  [0, '2:4', 'Test 2', 0],

+  [1, '2:4', 'Test 3', 0],

+  [2, '2:4', 'Test 4', 1],

+  [3, '2:4', 'Test 5', 1],

+  [4, '2:4', 'Test 6', 1],

+  [5, '2:4', 'Test 7', 0],

+ 

+  # Check max ranges

+  [-1, 2, 'Test 8', 0],

+  [0, 2, 'Test 9', 1],

+  [1, 2, 'Test 10', 1],

+  [2, 2, 'Test 11', 1],

+  [3, 2, 'Test 12', 0],

+ 

+  # Check :max ranges

+  [-1, ':2', 'Test 13', 0],

+  [0, ':2', 'Test 14', 1],

+  [1, ':2', 'Test 15', 1],

+  [2, ':2', 'Test 16', 1],

+  [3, ':2', 'Test 17', 0],

+  [-1, '1:', 'Test 18', 0],

+ 

+  # Check min: ranges

+  [0, '1:', 'Test 19', 0],

+  [1, '1:', 'Test 20', 1],

+  [2, '1:', 'Test 21', 1],

+ 

+  # Check 0

+  [-1, 0, 'Test 22', 0],

+  [0, 0, 'Test 23', 1],

+  [1, 0, 'Test 24', 1],

+ 

+  # Check ~:max ranges

+  [-1, '~:1', 'Test 25', 1],

+  [0, '~:1', 'Test 26', 1],

+  [1, '~:1', 'Test 27', 1],

+  [2, '~:1', 'Test 28', 0],

+ 

+  # Check min:max ranges where min and max are the same, including :0

+  # which should be equivalent to 0:0.

+  [-1, '1:1', 'Test 29', 0],

+  [0, '1:1', 'Test 30', 0],

+  [1, '1:1', 'Test 31', 1],

+  [2, '1:1', 'Test 32', 0],

+  [-1, '0:0', 'Test 33', 0],

+  [0, '0:0', 'Test 34', 1],

+  [1, '0:0', 'Test 35', 0],

+  [-1, ':0', 'Test 36', 0],

+  [0, ':0', 'Test 37', 1],

+  [1, ':0', 'Test 38', 0],

+ 

+  # Check min:max ranges which are invalid

+  [1, '4:2', 'Test 39', -1],

+  [1, '~:~', 'Test 40', -1],

+

+  # Check @min:max ranges

+  [-1, '@2:4', 'Test 1', 1],

+  [0, '@2:4', 'Test 2', 1],

+  [1, '@2:4', 'Test 3', 1],

+  [2, '@2:4', 'Test 4', 0],

+  [3, '@2:4', 'Test 5', 0],

+  [4, '@2:4', 'Test 6', 0],

+  [5, '@2:4', 'Test 7', 1],

+ 

+  # Check @max ranges

+  [-1, '@2', 'Test 8', 1],

+  [0, '@2', 'Test 9', 0],

+  [1, '@2', 'Test 10', 0],

+  [2, '@2', 'Test 11', 0],

+  [3, '@2', 'Test 12', 1],

+ 

+  # Check @:max ranges

+  [-1, '@:2', 'Test 13', 1],

+  [0, '@:2', 'Test 14', 0],

+  [1, '@:2', 'Test 15', 0],

+  [2, '@:2', 'Test 16', 0],

+  [3, '@:2', 'Test 17', 1],

+  [-1, '@1:', 'Test 18', 1],

+ 

+  # Check @min: ranges

+  [0, '@1:', 'Test 19', 1],

+  [1, '@1:', 'Test 20', 0],

+  [2, '@1:', 'Test 21', 0],

+ 

+  # Check @0

+  [-1, '@0', 'Test 22', 1],

+  [0, '@0', 'Test 23', 0],

+  [1, '@0', 'Test 24', 0],

+ 

+  # Check @~:max ranges

+  [-1, '@~:1', 'Test 25', 0],

+  [0, '@~:1', 'Test 26', 0],

+  [1, '@~:1', 'Test 27', 0],

+  [2, '@~:1', 'Test 28', 1],

+ 

+  # Check @min:max ranges where min and max are the same, including @:0

+  # which should be equivalent to @0:0.

+  [-1, '@1:1', 'Test 29', 1],

+  [0, '@1:1', 'Test 30', 1],

+  [1, '@1:1', 'Test 31', 0],

+  [2, '@1:1', 'Test 32', 1],

+  [-1, '@0:0', 'Test 33', 1],

+  [0, '@0:0', 'Test 34', 0],

+  [1, '@0:0', 'Test 35', 1],

+  [-1, '@:0', 'Test 36', 1],

+  [0, '@:0', 'Test 37', 0],

+  [1, '@:0', 'Test 38', 1],

+ 

+  # Check @min:max ranges which are invalid

+  [1, '@4:2', 'Test 39', -1],

+  [1, '@~:~', 'Test 40', -1],

+);

+

+foreach my $test (@tests)

+{

+  ok(check_range($test->[0], $test->[1]) == $test->[3],$test->[2]);

+}

+

+exit;

+

diff --git a/web/attachments/112910-check_mysql_slave b/web/attachments/112910-check_mysql_slave
new file mode 100644
index 0000000..9b1e3c8
--- /dev/null
+++ b/web/attachments/112910-check_mysql_slave
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Check that a mysql-slave is running
+#
+# usage: check_mysql_slave host user password
+#
+# @author peter.romianowski@optivo.net
+# @version 1.0 19.12.2004
+
+IO=`mysql -h$1 -u$2 -p$3 -B -e "SHOW SLAVE STATUS" | cut -f 10 | tr "\n" " "`
+
+if [ "$IO" != "Slave_IO_Running Yes " ] ; then
+        echo "CRITICAL Slave IO-Thread is not running (response was: $IO)"
+        exit 1
+fi
+
+SQL=`mysql -h$1 -u$2 -p$3 -B -e "SHOW SLAVE STATUS" | cut -f 11 | tr "\n" " "`
+
+if [ "$SQL" != "Slave_SQL_Running Yes " ] ; then
+        echo "CRITICAL Slave SQL-Thread is not running (response was: $SQL)"
+        exit 2
+fi
+
+echo "OK Slave IO- and SQL-Thread are running"
+exit 0
\ No newline at end of file
diff --git a/web/attachments/112982-config.log.gz b/web/attachments/112982-config.log.gz
new file mode 100644
index 0000000..d7291df
--- /dev/null
+++ b/web/attachments/112982-config.log.gz
diff --git a/web/attachments/113107-config.log.gz b/web/attachments/113107-config.log.gz
new file mode 100644
index 0000000..e48e30f
--- /dev/null
+++ b/web/attachments/113107-config.log.gz
diff --git a/web/attachments/113111-config.log.gz b/web/attachments/113111-config.log.gz
new file mode 100644
index 0000000..883038a
--- /dev/null
+++ b/web/attachments/113111-config.log.gz
diff --git a/web/attachments/113160-check_http.diff b/web/attachments/113160-check_http.diff
new file mode 100644
index 0000000..c2b1a45
--- /dev/null
+++ b/web/attachments/113160-check_http.diff
@@ -0,0 +1,65 @@
+--- check_http.c.old    2004-12-01 15:57:08.000000000 +0100
++++ check_http.c        2004-12-06 11:56:11.000000000 +0100
+@@ -112,6 +112,7 @@
+ char *http_method;
+ char *http_post_data;
+ char buffer[MAX_INPUT_BUFFER];
++int do_soap = FALSE;
+ 
+ int process_arguments (int, char **);
+ static char *base64 (const char *bin, size_t len);
+@@ -210,6 +211,7 @@
+                {"min", required_argument, 0, 'm'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
++               {"soap", no_argument, 0, 'W'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -230,7 +232,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "Vvh46t:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLSm:", longopts, &option);
++               c = getopt_long (argc, argv, "Vvh46tW:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLSm:", longopts, &option);
+                if (c == -1 || c == EOF)
+                        break;
+ 
+@@ -384,6 +386,9 @@
+                case 'm': /* min_page_length */
+                        min_page_len = atoi (optarg);
+                        break;
++                case 'W': /* use SOAP mode */
++                        do_soap = TRUE;
++                        break;
+                }
+        }
+ 
+@@ -519,9 +524,16 @@
+ 
+        /* either send http POST data */
+        if (http_post_data) {
+-               asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
+-               asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, strlen (http_post_data));
+-               asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
++               if (do_soap) {
++                       asprintf (&buf, "%sSOAPAction:\r\n", buf);
++                       asprintf (&buf, "%sContent-Type: text/xml; charset=utf-8\r\n", buf);
++                       asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, strlen (http_post_data));
++                       asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
++               } else {
++                       asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
++                       asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, strlen (http_post_data));
++                       asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
++               }
+        }
+        else {
+                /* or just a newline so the server knows we're done with the request */
+@@ -1214,6 +1226,6 @@
+   [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+   [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+   [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
+-  [-P string] [-m min_pg_size] [-4|-6]\n"), progname);
++  [-P string] [-m min_pg_size] [-4|-6] [-W]\n"), progname);
+        printf (_(UT_HLP_VRS), progname, progname);
+ }
diff --git a/web/attachments/113191-config.log.nagios-plugins-HEAD-200412210547.gz b/web/attachments/113191-config.log.nagios-plugins-HEAD-200412210547.gz
new file mode 100644
index 0000000..e5f2cd7
--- /dev/null
+++ b/web/attachments/113191-config.log.nagios-plugins-HEAD-200412210547.gz
diff --git a/web/attachments/113337-config.log.nagios-plugins-HEAD-200412221747.gz b/web/attachments/113337-config.log.nagios-plugins-HEAD-200412221747.gz
new file mode 100644
index 0000000..b00c693
--- /dev/null
+++ b/web/attachments/113337-config.log.nagios-plugins-HEAD-200412221747.gz
diff --git a/web/attachments/113402-check_disk.diff b/web/attachments/113402-check_disk.diff
new file mode 100644
index 0000000..5d87ebe
--- /dev/null
+++ b/web/attachments/113402-check_disk.diff
@@ -0,0 +1,11 @@
+31,32d30
+<  *  - patched by Tim Wootton 08032004 to ignore zero size fs, useful for multi
+<  *     disk checks on solaris (tim.wootton@emea.telerate.com)
+111,115d108
+<                       if (total_disk==0){
+<                               if (verbose>0)
+<                                       printf ("ignoring zero size fs %s.", file_system);
+<                               continue;
+<                       }
+277d269
+<                       printf ("patched with 0 size fs patch by Tim Wootton 08032004");
diff --git a/web/attachments/113590-config.log.nagios-plugins-HEAD-200412231747.gz b/web/attachments/113590-config.log.nagios-plugins-HEAD-200412231747.gz
new file mode 100644
index 0000000..1626bad
--- /dev/null
+++ b/web/attachments/113590-config.log.nagios-plugins-HEAD-200412231747.gz
diff --git a/web/attachments/114200-hpux swapinfo.txt b/web/attachments/114200-hpux swapinfo.txt
new file mode 100644
index 0000000..1f4a47e
--- /dev/null
+++ b/web/attachments/114200-hpux swapinfo.txt
@@ -0,0 +1,6 @@
+d40:/# swapinfo -dfM
+             Kb      Kb      Kb   PCT  START/      Kb
+TYPE      AVAIL    USED    FREE  USED   LIMIT RESERVE  PRI  NAME
+dev     1572864       0 1572864    0%       0       -    1  /dev/vg00/lvol2
+dev     17776640       0 17776640    0%       0       -    1  /dev/vgswap/lvol1
+memory  2185432 1637604  547828   75%
diff --git a/web/attachments/114314-check_dhcp.c.patch.1.4-beta1 b/web/attachments/114314-check_dhcp.c.patch.1.4-beta1
new file mode 100644
index 0000000..9556f39
--- /dev/null
+++ b/web/attachments/114314-check_dhcp.c.patch.1.4-beta1
@@ -0,0 +1,27 @@
+*** check_dhcp.c.orig   Mon Jan  3 13:27:56 2005
+--- check_dhcp.c        Mon Jan  3 13:40:28 2005
+***************
+*** 60,70 ****
+  
+  #include <netinet/if_ether.h>
+  #include <sys/sysctl.h>
+  #include <net/if_dl.h>
+  
+! #elif defined(__sun__) || defined(__solaris__) || defined(__hpux__)
+  
+  #define INSAP 22 
+  #define OUTSAP 24 
+  
+  #include <signal.h>
+--- 60,70 ----
+  
+  #include <netinet/if_ether.h>
+  #include <sys/sysctl.h>
+  #include <net/if_dl.h>
+  
+! #elif defined(__sun) || defined(__solaris__) || defined(__hpux__)
+  
+  #define INSAP 22 
+  #define OUTSAP 24 
+  
+  #include <signal.h>
diff --git a/web/attachments/115229-check_tcp.c.diff b/web/attachments/115229-check_tcp.c.diff
new file mode 100644
index 0000000..bd40d79
--- /dev/null
+++ b/web/attachments/115229-check_tcp.c.diff
@@ -0,0 +1,102 @@
+--- check_tcp.c.orig    Thu Jan  6 12:20:54 2005
++++ check_tcp.c Thu Jan  6 12:31:24 2005
+@@ -63,6 +63,11 @@
+        MAXBUF = 1024
+ };
+ 
++enum {
++       CRLF = 1,
++       LF   = 2
++};
++
+ int process_arguments (int, char **);
+ int my_recv (void);
+ void print_help (void);
+@@ -100,6 +105,7 @@
+ int sd = 0;
+ char *buffer;
+ int expect_mismatch_state = STATE_WARNING;
++int lineterm = CRLF;
+ int exact_matching = TRUE;
+ 
+ int
+@@ -312,7 +318,9 @@
+                while ((i = my_recv ()) > 0) {
+                        buffer[i] = '\0';
+                        asprintf (&status, "%s%s", status, buffer);
+-                       if (buffer[i-2] == '\r' && buffer[i-1] == '\n')
++                       if (buffer[i-2] == '\r' && buffer[i-1] == '\n' && lineterm == CRLF)
++                               break;
++                       if (buffer[i-1] == '\n' && lineterm == LF)
+                                break;
+                        if (maxbytes>0 && strlen(status) >= (unsigned)maxbytes)
+                                break;
+@@ -421,6 +429,7 @@
+                {"delay", required_argument, 0, 'd'},
+                {"refuse", required_argument, 0, 'r'},
+                {"mismatch", required_argument, 0, 'M'},
++               {"lineterm", required_argument, 0, 'l'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"verbose", no_argument, 0, 'v'},
+@@ -454,7 +463,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
++               c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:l:",
+                                 longopts, &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+@@ -566,13 +575,31 @@
+                        else
+                                usage4 (_("Mismatch must be one of ok, warn, crit"));
+                        break;
++               case 'l':
++                       if (is_intpos (optarg)) {
++                               int num = atoi(optarg);
++
++                               switch (num) {
++                                       case 1:
++                                               lineterm = CRLF;
++                                               break;
++                                       case 2:
++                                               lineterm = LF;
++                                               break;
++                                       default:
++                                               usage4 (_("Line termination must be 1 (CRLF) or 2 (LF)"));
++                                       break;
++                               }
++                       } else
++                               usage4 (_("Line termination must be a positive integer"));
++                       break;
+                case 'd':
+                        if (is_intpos (optarg))
+                                delay = atoi (optarg);
+                        else
+                                usage4 (_("Delay must be a positive integer"));
+                        break;
+-                 case 'D': /* Check SSL cert validity - days 'til certificate expiration */
++               case 'D': /* Check SSL cert validity - days 'til certificate expiration */
+ #ifdef HAVE_SSL
+                        if (!is_intnonneg (optarg))
+                                usage2 ("invalid certificate expiration period", optarg);
+@@ -784,6 +811,8 @@
+     Accept tcp refusals with states ok, warn, crit (default: crit)\n\
+  -M, --mismatch=ok|warn|crit\n\
+     Accept expected string mismatches with states ok, warn, crit (default: warn)\n\
++ -l, --lineterm=1|2\r\
++    Line termination expected from remote peer (1 is CRLF; 2 is LF only)\n\
+  -j, --jail\n\
+     Hide output from TCP socket\n\
+  -m, --maxbytes=INTEGER\n\
+@@ -817,6 +846,7 @@
+ Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
+                   [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+                   [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+-                  [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
+-                  [-D <days to cert expiry>] [-S <use SSL>]\n", progname);               
++                  [-r <refuse state>] [-M <mismatch state>] [-l <1|2>] [-v]\n\
++                  [-4|-6] [-j] [-D <days to cert expiry>] [-S <use SSL>]\n",
++               progname);                
+ }
diff --git a/web/attachments/115753-check_disk.patch b/web/attachments/115753-check_disk.patch
new file mode 100644
index 0000000..aafe4dc
--- /dev/null
+++ b/web/attachments/115753-check_disk.patch
@@ -0,0 +1,28 @@
+diff -u check_disk.c-orig check_disk.c

+--- check_disk.c-orig   2005-01-14 10:14:18.650350000 +1100

++++ check_disk.c        2005-01-14 10:19:13.238477000 +1100

+@@ -20,6 +20,7 @@

+  * error.

+  *

+  * Notes:

++ *  - Fixed logic error with -e switch where result not set (DA, 14/1/2005)

+  *  - IRIX support added by Charlie Cook 4-16-1999

+  *  - Modifications by Karl DeBisschop 1999-11-24

+  *     reformat code to 80 char screen width

+@@ -118,6 +119,8 @@

+                        if (strcmp (file_system, "none") == 0)

+                                strncpy (file_system, mntp, MAX_INPUT_BUFFER-1);

+ 

++                       result = max_state (result, disk_result);

++

+                        if (disk_result==STATE_OK && erronly && !verbose)

+                                continue;

+ 

+@@ -125,7 +128,6 @@

+                                asprintf (&output, "%s [%.0f kB (%d%%) free on %s]", output,

+                                          free_disk, 100 - usp, display_mntp ? mntp : file_system);

+ 

+-                       result = max_state (result, disk_result);

+                }

+ 

+                else {

diff --git a/web/attachments/115805-check_sybase-0.2_0.3.diff b/web/attachments/115805-check_sybase-0.2_0.3.diff
new file mode 100644
index 0000000..e3c37de
--- /dev/null
+++ b/web/attachments/115805-check_sybase-0.2_0.3.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-10 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378820419" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378820419" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378820419" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378820419" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378820419');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1102230&group_id=29880&atid=397599&file_id=115805"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/115806-check_sybase-0.2_0.3.diff b/web/attachments/115806-check_sybase-0.2_0.3.diff
new file mode 100644
index 0000000..50c3f54
--- /dev/null
+++ b/web/attachments/115806-check_sybase-0.2_0.3.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-4 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378820419" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378820419" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378820419" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378820419" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378820419');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1102230&group_id=29880&atid=397599&file_id=115806"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/116237-check_snmp.tar.gz b/web/attachments/116237-check_snmp.tar.gz
new file mode 100644
index 0000000..737e8c4
--- /dev/null
+++ b/web/attachments/116237-check_snmp.tar.gz
diff --git a/web/attachments/116575-check_nt.c.patch.1.39 b/web/attachments/116575-check_nt.c.patch.1.39
new file mode 100644
index 0000000..de85bad
--- /dev/null
+++ b/web/attachments/116575-check_nt.c.patch.1.39
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-10 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378820350" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378820350" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378820350" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378820350" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378820350');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1106390&group_id=29880&atid=397599&file_id=116575"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/116576-check_nt.c.patch b/web/attachments/116576-check_nt.c.patch
new file mode 100644
index 0000000..30a4653
--- /dev/null
+++ b/web/attachments/116576-check_nt.c.patch
@@ -0,0 +1,55 @@
+--- plugins/check_nt.c.orig     2005-01-20 17:17:40.000000000 -0500
++++ plugins/check_nt.c  2005-01-20 18:01:43.000000000 -0500
+@@ -43,6 +43,7 @@
+ #define CHECK_MEMUSE   7

+ #define CHECK_COUNTER  8

+ #define CHECK_FILEAGE  9

++#define CHECK_FREEDISKSPACE    10

+ #define MAX_VALUE_LIST 30

+ 

+ #define PORT   1248

+@@ -185,7 +186,7 @@
+                return_code=STATE_OK;

+        }

+ 

+-       else if(vars_to_check==CHECK_USEDDISKSPACE){

++       else if(vars_to_check==CHECK_USEDDISKSPACE || vars_to_check==CHECK_FREEDISKSPACE){

+ 

+                return_code=STATE_UNKNOWN;

+                if (check_value_list==TRUE) {

+@@ -210,9 +211,13 @@
+                                                         free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);

+ 

+ 

+-                                       if(check_critical_value==TRUE && percent_used_space >= critical_value)

++                                       if(check_critical_value==TRUE && (

++                                           (vars_to_check==CHECK_USEDDISKSPACE && percent_used_space >= critical_value) ||

++                                           (vars_to_check==CHECK_FREEDISKSPACE && free_disk_space / 1048576 <= critical_value)))

+                                                return_code=STATE_CRITICAL;

+-                                       else if (check_warning_value==TRUE && percent_used_space >= warning_value)

++                                       else if (check_warning_value==TRUE && (

++                                           (vars_to_check==CHECK_USEDDISKSPACE && percent_used_space >= warning_value) ||

++                                           (vars_to_check==CHECK_FREEDISKSPACE && free_disk_space / 1048576 <= warning_value)))

+                                                return_code=STATE_WARNING;

+                                        else

+                                                return_code=STATE_OK;

+@@ -477,6 +482,8 @@
+                                        vars_to_check=CHECK_COUNTER;

+                                else if(!strcmp(optarg,"FILEAGE"))

+                                        vars_to_check=CHECK_FILEAGE;

++                               else if(!strcmp(optarg,"FREEDISKSPACE"))

++                                       vars_to_check=CHECK_FREEDISKSPACE;

+                                else

+                                        return ERROR;

+                                break;

+@@ -541,7 +548,9 @@
+                 "        Thresholds are percentage and up to 10 requests can be done in one shot. ie: -l 60,90,95,120,90,95\n"

+                 "      UPTIME = Get the uptime of the machine. No specific parameters. No warning or critical threshold\n"

+                 "      USEDDISKSPACE = Size and percentage of disk use. Request a -l parameter containing the drive letter only.\n"

+-                "                      Warning and critical thresholds can be specified with -w and -c.\n"

++                "                      Warning and critical thresholds can be specified (in percentage used) with -w and -c.\n"

++                "      FREEDISKSPACE = Size and percentage of disk use. Request a -l parameter containing the drive letter only.\n"

++                "                      Warning and critical thresholds can be specified (in megabytes free) with -w and -c.\n"

+                 "      MEMUSE = Memory use. Warning and critical thresholds can be specified with -w and -c.\n"

+                 "      SERVICESTATE = Check the state of one or several services. Request a -l parameters with the following syntax:\n"

+                 "        -l <service1>,<service2>,<service3>,... You can specify -d SHOWALL in case you want to see working services\n"

diff --git a/web/attachments/116577-check_nt.c.patch b/web/attachments/116577-check_nt.c.patch
new file mode 100644
index 0000000..0d2daba
--- /dev/null
+++ b/web/attachments/116577-check_nt.c.patch
@@ -0,0 +1,65 @@
+--- plugins/check_nt.c.orig     2005-01-20 17:27:47.000000000 -0500
++++ plugins/check_nt.c  2005-01-20 18:01:41.000000000 -0500
+@@ -49,7 +49,8 @@
+        CHECK_PROCSTATE,
+        CHECK_MEMUSE,
+        CHECK_COUNTER,
+-       CHECK_FILEAGE
++       CHECK_FILEAGE,
++       CHECK_FREEDISKSPACE
+ };
+ 
+ enum {
+@@ -201,6 +202,7 @@
+                break;
+ 
+        case CHECK_USEDDISKSPACE:
++       case CHECK_FREEDISKSPACE:
+ 
+                if (value_list==NULL)
+                        output_message = strdup (_("missing -l parameters"));
+@@ -212,8 +214,8 @@
+                        free_disk_space=atof(strtok(recv_buffer,"&"));
+                        total_disk_space=atof(strtok(NULL,"&"));
+                        percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+-                       warning_used_space = ((float)warning_value / 100) * total_disk_space;
+-                       critical_used_space = ((float)critical_value / 100) * total_disk_space;
++                       warning_used_space = (vars_to_check==CHECK_FREEDISKSPACE)?(float)warning_value:((float)warning_value / 100) * total_disk_space;
++                       critical_used_space = (vars_to_check==CHECK_FREEDISKSPACE)?(float)critical_value:((float)critical_value / 100) * total_disk_space;
+ 
+                        if (free_disk_space>=0) {
+                                asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
+@@ -223,9 +225,9 @@
+                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
+ 
+-                               if(check_critical_value==TRUE && percent_used_space >= critical_value)
++                               if(check_critical_value==TRUE && free_disk_space <= critical_used_space)
+                                        return_code=STATE_CRITICAL;
+-                               else if (check_warning_value==TRUE && percent_used_space >= warning_value)
++                               else if (check_warning_value==TRUE && free_disk_space <= warning_used_space)
+                                        return_code=STATE_WARNING;      
+                                else
+                                        return_code=STATE_OK;   
+@@ -527,6 +529,8 @@
+                                        vars_to_check=CHECK_COUNTER;
+                                else if(!strcmp(optarg,"FILEAGE"))
+                                        vars_to_check=CHECK_FILEAGE;
++                               else if(!strcmp(optarg,"FREEDISKSPACE"))
++                                       vars_to_check=CHECK_FREEDISKSPACE;
+                                else
+                                        return ERROR;
+                                break;
+@@ -656,7 +660,11 @@
+   printf (_("\
+    USEDDISKSPACE = Size and percentage of disk use.\n\
+      Request a -l parameter containing the drive letter only.\n\
+-     Warning and critical thresholds can be specified with -w and -c.\n"));
++     Thresholds can be specified (in precentage used) with -w and -c.\n"));
++  printf (_("\
++   FREEDISKSPACE = Size and percentage of disk use.\n\
++     Request a -l parameter containing the drive letter only.\n\
++     Thresholds can be specified (in megabytes free) with -w and -c.\n"));
+   printf (_("\
+    MEMUSE = Memory use.\n\
+      Warning and critical thresholds can be specified with -w and -c.\n"));
diff --git a/web/attachments/116583-check_snmp.c b/web/attachments/116583-check_snmp.c
new file mode 100644
index 0000000..e2695e1
--- /dev/null
+++ b/web/attachments/116583-check_snmp.c
@@ -0,0 +1,963 @@
+/******************************************************************************
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id: check_snmp.c,v 1.52 2004/12/30 00:41:39 opensides Exp $
+ 
+******************************************************************************/
+
+const char *progname = "check_snmp";
+const char *revision = "$Revision: 1.52 $";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include "common.h"
+#include "utils.h"
+#include "popen.h"
+
+#define DEFAULT_COMMUNITY "public"
+#define DEFAULT_PORT "161"
+#define DEFAULT_MIBLIST "ALL"
+#define DEFAULT_PROTOCOL "1"
+#define DEFAULT_TIMEOUT 1
+#define DEFAULT_RETRIES 5
+#define DEFAULT_AUTH_PROTOCOL "MD5"
+#define DEFAULT_DELIMITER "="
+#define DEFAULT_OUTPUT_DELIMITER " "
+
+#define mark(a) ((a)!=0?"*":"")
+
+#define CHECK_UNDEF 0
+#define CRIT_PRESENT 1
+#define CRIT_STRING 2
+#define CRIT_REGEX 4
+#define CRIT_GT 8
+#define CRIT_LT 16
+#define CRIT_GE 32
+#define CRIT_LE 64
+#define CRIT_EQ 128
+#define CRIT_NE 256
+#define CRIT_RANGE 512
+#define WARN_PRESENT 1024
+#define WARN_STRING 2048
+#define WARN_REGEX 4096
+#define WARN_GT 8192
+#define WARN_LT 16384
+#define WARN_GE 32768
+#define WARN_LE 65536
+#define WARN_EQ 131072
+#define WARN_NE 262144
+#define WARN_RANGE 524288
+
+#define MAX_OIDS 8
+#define MAX_DELIM_LENGTH 8
+
+int process_arguments (int, char **);
+int validate_arguments (void);
+char *clarify_message (char *);
+int check_num (int);
+int lu_getll (unsigned long *, char *);
+int lu_getul (unsigned long *, char *);
+char *thisarg (char *str);
+char *nextarg (char *str);
+void print_usage (void);
+void print_help (void);
+
+#ifdef HAVE_REGEX_H
+#include <regex.h>
+char regex_expect[MAX_INPUT_BUFFER] = "";
+regex_t preg;
+regmatch_t pmatch[10];
+char timestamp[10] = "";
+char errbuf[MAX_INPUT_BUFFER];
+int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+int eflags = 0;
+int errcode, excode;
+#endif
+
+char *server_address = NULL;
+char *community = NULL;
+char *authpriv = NULL;
+char *proto = NULL;
+char *seclevel = NULL;
+char *secname = NULL;
+char *authproto = NULL;
+char *authpasswd = NULL;
+char *privpasswd = NULL;
+char *oid;
+char *label;
+char *units;
+char *port;
+char string_value[MAX_INPUT_BUFFER] = "";
+char **labels = NULL;
+char **unitv = NULL;
+size_t nlabels = 0;
+size_t labels_size = 8;
+size_t nunits = 0;
+size_t unitv_size = 8;
+int verbose = FALSE;
+unsigned long lower_warn_lim[MAX_OIDS];
+unsigned long upper_warn_lim[MAX_OIDS];
+unsigned long lower_crit_lim[MAX_OIDS];
+unsigned long upper_crit_lim[MAX_OIDS];
+unsigned long response_value[MAX_OIDS];
+int check_warning_value = FALSE;
+int check_critical_value = FALSE;
+int retries = 0;
+unsigned long eval_method[MAX_OIDS];
+char *delimiter;
+char *output_delim;
+char *miblist;
+
+int
+main (int argc, char **argv)
+{
+        int i = 0;
+        int iresult = STATE_UNKNOWN;
+        int found = 0;
+        int result = STATE_DEPENDENT;
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *command_line = NULL;
+        char *response = NULL;
+        char *outbuff;
+        char *output;
+        char *ptr = NULL;
+        char *p2 = NULL;
+        char *show = NULL;
+
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+
+        labels = malloc (labels_size);
+        unitv = malloc (unitv_size);
+        for (i = 0; i < MAX_OIDS; i++)
+                eval_method[i] = CHECK_UNDEF;
+        i = 0;
+
+        oid = strdup ("");
+        label = strdup ("SNMP");
+        units = strdup ("");
+        port = strdup (DEFAULT_PORT);
+        outbuff = strdup ("");
+        output = strdup ("");
+        delimiter = strdup (DEFAULT_DELIMITER);
+        output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
+        miblist = strdup (DEFAULT_MIBLIST);
+        timeout_interval = DEFAULT_TIMEOUT;
+        retries = DEFAULT_RETRIES;
+
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+
+        /* create the command line to execute */
+        asprintf (&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+                  PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+                  authpriv, server_address, port, oid);
+        if (verbose)
+                printf ("%s\n", command_line);
+
+        /* run the command */
+        child_process = spopen (command_line);
+        if (child_process == NULL) {
+                printf (_("Could not open pipe: %s\n"), command_line);
+                exit (STATE_UNKNOWN);
+        }
+
+        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        if (child_stderr == NULL) {
+                printf (_("Could not open stderr for %s\n"), command_line);
+        }
+
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+                asprintf (&output, "%s%s", output, input_buffer);
+
+        if (verbose)
+                printf ("%s\n", output);
+
+        ptr = output;
+
+        while (ptr) {
+
+                ptr = strstr (ptr, delimiter);
+                if (ptr == NULL)
+                        break;
+
+                ptr += strlen (delimiter);
+                ptr += strspn (ptr, " ");
+
+                found++;
+
+                if (ptr[0] == '"') {
+                        ptr++;
+                        response = strpcpy (response, ptr, "\"");
+                        ptr = strpbrk (ptr, "\"");
+                        ptr += strspn (ptr, "\"\n");
+                }
+                else {
+                        response = strpcpy (response, ptr, "\n");
+                        ptr = strpbrk (ptr, "\n");
+                        ptr += strspn (ptr, "\n");
+                        while
+                                (strstr (ptr, delimiter) &&
+                                 strstr (ptr, "\n") && strstr (ptr, "\n") < strstr (ptr, delimiter)) {
+                                response = strpcat (response, ptr, "\n");
+                                ptr = strpbrk (ptr, "\n");
+                        }
+                        if (ptr && strstr (ptr, delimiter) == NULL) {
+                                asprintf (&response, "%s%s", response, ptr);
+                                ptr = NULL;
+                        }
+                }
+
+                /* We strip out the datatype indicator for PHBs */
+                if (strstr (response, "Gauge: "))
+                        show = strstr (response, "Gauge: ") + 7;
+                else if (strstr (response, "Gauge32: "))
+                        show = strstr (response, "Gauge32: ") + 9;
+                else if (strstr (response, "Counter32: "))
+                        show = strstr (response, "Counter32: ") + 11;
+                else if (strstr (response, "INTEGER: "))
+                        show = strstr (response, "INTEGER: ") + 9;
+                else if (strstr (response, "STRING: "))
+                        show = strstr (response, "STRING: ") + 8;
+                else
+                        show = response;
+                p2 = show;
+
+                iresult = STATE_DEPENDENT;
+
+                /* Process this block for integer comparisons */
+                if (eval_method[i] & CRIT_GT ||
+                    eval_method[i] & CRIT_LT ||
+                    eval_method[i] & CRIT_GE ||
+                    eval_method[i] & CRIT_LE ||
+                    eval_method[i] & CRIT_EQ ||
+                    eval_method[i] & CRIT_NE ||
+                    eval_method[i] & WARN_GT ||
+                    eval_method[i] & WARN_LT ||
+                    eval_method[i] & WARN_GE ||
+                    eval_method[i] & WARN_LE ||
+                    eval_method[i] & WARN_EQ ||
+                    eval_method[i] & WARN_NE) {
+                        p2 = strpbrk (p2, "0123456789");
+                        if (p2 == NULL) 
+                                die (STATE_UNKNOWN,_("No valid data returned"));
+                        response_value[i] = strtoul (p2, NULL, 10);
+                        iresult = check_num (i);
+                        asprintf (&show, "%lu", response_value[i]);
+                }
+
+                /* Process this block for string matching */
+                else if (eval_method[i] & CRIT_STRING) {
+                        if (strcmp (show, string_value))
+                                iresult = STATE_CRITICAL;
+                        else
+                                iresult = STATE_OK;
+                }
+
+                /* Process this block for regex matching */
+                else if (eval_method[i] & CRIT_REGEX) {
+#ifdef HAVE_REGEX_H
+                        excode = regexec (&preg, response, 10, pmatch, eflags);
+                        if (excode == 0) {
+                                iresult = STATE_OK;
+                        }
+                        else if (excode != REG_NOMATCH) {
+                                regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf (_("Execute Error: %s\n"), errbuf);
+                                exit (STATE_CRITICAL);
+                        }
+                        else {
+                                iresult = STATE_CRITICAL;
+                        }
+#else
+                        printf (_("Call for regex which was not a compiled option"));
+                        exit (STATE_UNKNOWN);
+#endif
+                }
+
+                /* Process this block for existence-nonexistence checks */
+                else {
+                        if (eval_method[i] & CRIT_PRESENT)
+                                iresult = STATE_CRITICAL;
+                        else if (eval_method[i] & WARN_PRESENT)
+                                iresult = STATE_WARNING;
+                        else if (response && iresult == STATE_DEPENDENT) 
+                                iresult = STATE_OK;
+                }
+
+                /* Result is the worst outcome of all the OIDs tested */
+                result = max_state (result, iresult);
+
+                /* Prepend a label for this OID if there is one */
+                if (nlabels > (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
+                        asprintf (&outbuff, "%s%s%s %s%s%s", outbuff,
+                                  (i == 0) ? " " : output_delim,
+                                  labels[i], mark (iresult), show, mark (iresult));
+                else
+                        asprintf (&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim,
+                                  mark (iresult), show, mark (iresult));
+
+                /* Append a unit string for this OID if there is one */
+                if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
+                        asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
+
+                i++;
+
+        }                                                                                                                       /* end while (ptr) */
+
+        if (found == 0)
+                die (STATE_UNKNOWN,
+                     _("%s problem - No data received from host\nCMD: %s\n"),
+                     label,
+                     command_line);
+
+        /* WARNING if output found on stderr */
+        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+                result = max_state (result, STATE_WARNING);
+
+        /* close stderr */
+        (void) fclose (child_stderr);
+
+        /* close the pipe */
+        if (spclose (child_process))
+                result = max_state (result, STATE_WARNING);
+
+/*      if (nunits == 1 || i == 1) */
+/*              printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */
+/*      else */
+        printf ("%s %s -%s\n", label, state_text (result), outbuff);
+
+        return result;
+}
+
+
+
+/* process command-line arguments */
+int
+process_arguments (int argc, char **argv)
+{
+        char *ptr;
+        int c = 1;
+        int j = 0, jj = 0, ii = 0;
+
+        int option = 0;
+        static struct option longopts[] = {
+                STD_LONG_OPTS,
+                {"community", required_argument, 0, 'C'},
+                {"oid", required_argument, 0, 'o'},
+                {"object", required_argument, 0, 'o'},
+                {"delimiter", required_argument, 0, 'd'},
+                {"output-delimiter", required_argument, 0, 'D'},
+                {"string", required_argument, 0, 's'},
+                {"timeout", required_argument, 0, 't'},
+                {"regex", required_argument, 0, 'r'},
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
+                {"label", required_argument, 0, 'l'},
+                {"units", required_argument, 0, 'u'},
+                {"port", required_argument, 0, 'p'},
+                {"retries", required_argument, 0, 'e'},
+                {"miblist", required_argument, 0, 'm'},
+                {"protocol", required_argument, 0, 'P'},
+                {"seclevel", required_argument, 0, 'L'},
+                {"secname", required_argument, 0, 'U'},
+                {"authproto", required_argument, 0, 'a'},
+                {"authpasswd", required_argument, 0, 'A'},
+                {"privpasswd", required_argument, 0, 'X'},
+                {0, 0, 0, 0}
+        };
+
+        if (argc < 2)
+                return ERROR;
+
+        /* reverse compatibility for very old non-POSIX usage forms */
+        for (c = 1; c < argc; c++) {
+                if (strcmp ("-to", argv[c]) == 0)
+                        strcpy (argv[c], "-t");
+                if (strcmp ("-wv", argv[c]) == 0)
+                        strcpy (argv[c], "-w");
+                if (strcmp ("-cv", argv[c]) == 0)
+                        strcpy (argv[c], "-c");
+        }
+
+        while (1) {
+                c = getopt_long (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:L:U:a:A:X:",
+                                                                         longopts, &option);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case '?':       /* usage */
+                        usage2 (_("Unknown argument"), optarg);
+                case 'h':       /* help */
+                        print_help ();
+                        exit (STATE_OK); 
+                case 'V':       /* version */
+                        print_revision (progname, revision);
+                        exit (STATE_OK);
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
+
+        /* Connection info */
+                case 'C':                                                                       /* group or community */
+                        community = optarg;
+                        break;
+                case 'H':                                                                       /* Host or server */
+                        server_address = optarg;
+                        break;
+                case 'p':       /* TCP port number */
+                        port = optarg;
+                        break;
+                case 'm':      /* List of MIBS  */
+                        miblist = optarg;
+                        break;
+                case 'P':     /* SNMP protocol version */
+                        proto = optarg;
+                        break;
+                case 'L':     /* security level */
+                        seclevel = optarg;
+                        break;
+                case 'U':     /* security username */
+                        secname = optarg;
+                        break;
+                case 'a':     /* auth protocol */
+                        authproto = optarg;
+                        break;
+                case 'A':     /* auth passwd */
+                        authpasswd = optarg;
+                        break;
+                case 'X':     /* priv passwd */
+                        privpasswd = optarg;
+                        break;
+                case 't':       /* timeout period */
+                        if (!is_integer (optarg))
+                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                        else
+                                timeout_interval = atoi (optarg);
+                        break;
+
+        /* Test parameters */
+                case 'c':                                                                       /* critical time threshold */
+                        if (strspn (optarg, "0123456789:,") < strlen (optarg))
+                                usage2 (_("Invalid critical threshold: %s\n"), optarg);
+                        for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) {
+                                if (lu_getll (&lower_crit_lim[jj], ptr) == 1)
+                                        eval_method[jj] |= CRIT_LT;
+                                if (lu_getul (&upper_crit_lim[jj], ptr) == 1)
+                                        eval_method[jj] |= CRIT_GT;
+                                (ptr = index (ptr, ',')) ? ptr++ : ptr;
+                        }
+                        break;
+                case 'w':                                                                       /* warning time threshold */
+                        if (strspn (optarg, "0123456789:,") < strlen (optarg))
+                                usage2 (_("Invalid warning threshold: %s\n"), optarg);
+                        for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) {
+                                if (lu_getll (&lower_warn_lim[ii], ptr) == 1)
+                                        eval_method[ii] |= WARN_LT;
+                                if (lu_getul (&upper_warn_lim[ii], ptr) == 1)
+                                        eval_method[ii] |= WARN_GT;
+                                (ptr = index (ptr, ',')) ? ptr++ : ptr;
+                        }
+                        break;
+                case 'e': /* PRELIMINARY - may change */
+                case 'E': /* PRELIMINARY - may change */
+                        if (!is_integer (optarg))
+                                usage2 (_("Retries interval must be a positive integer"), optarg);
+                        else
+                                retries = atoi(optarg);
+                        break;
+                case 'o':                                                                       /* object identifier */
+                        for (ptr = optarg; (ptr = index (ptr, ',')); ptr++)
+                                ptr[0] = ' '; /* relpace comma with space */
+                        for (ptr = optarg; (ptr = index (ptr, ' ')); ptr++)
+                                j++; /* count OIDs */
+                        asprintf (&oid, "%s %s", (oid?oid:""), optarg);
+                        if (c == 'E' || c == 'e') {
+                                jj++;
+                                ii++;
+                        }
+                        if (c == 'E') 
+                                eval_method[j+1] |= WARN_PRESENT;
+                        else if (c == 'e')
+                                eval_method[j+1] |= CRIT_PRESENT;
+                        break;
+                case 's':                                                                       /* string or substring */
+                        strncpy (string_value, optarg, sizeof (string_value) - 1);
+                        string_value[sizeof (string_value) - 1] = 0;
+                        eval_method[jj++] = CRIT_STRING;
+                        ii++;
+                        break;
+                case 'R':                                                                       /* regex */
+#ifdef HAVE_REGEX_H
+                        cflags = REG_ICASE;
+#endif
+                case 'r':                                                                       /* regex */
+#ifdef HAVE_REGEX_H
+                        cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+                        strncpy (regex_expect, optarg, sizeof (regex_expect) - 1);
+                        regex_expect[sizeof (regex_expect) - 1] = 0;
+                        errcode = regcomp (&preg, regex_expect, cflags);
+                        if (errcode != 0) {
+                                regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf (_("Could Not Compile Regular Expression"));
+                                return ERROR;
+                        }
+                        eval_method[jj++] = CRIT_REGEX;
+                        ii++;
+#else
+                        printf (_("call for regex which was not a compiled option"));
+                        exit (STATE_UNKNOWN);
+#endif
+                        break;
+
+        /* Format */
+                case 'd':                                                                       /* delimiter */
+                        delimiter = strscpy (delimiter, optarg);
+                        break;
+                case 'D':                                                                       /* output-delimiter */
+                        output_delim = strscpy (output_delim, optarg);
+                        break;
+                case 'l':                                                                       /* label */
+                        label = optarg;
+                        nlabels++;
+                        if (nlabels >= labels_size) {
+                                labels_size += 8;
+                                labels = realloc (labels, labels_size);
+                                if (labels == NULL)
+                                        die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), nlabels);
+                        }
+                        labels[nlabels - 1] = optarg;
+                        ptr = thisarg (optarg);
+                        labels[nlabels - 1] = ptr;
+                        if (strstr (ptr, "'") == ptr)
+                                labels[nlabels - 1] = ptr + 1;
+                        while (ptr && (ptr = nextarg (ptr))) {
+                                if (nlabels >= labels_size) {
+                                        labels_size += 8;
+                                        labels = realloc (labels, labels_size);
+                                        if (labels == NULL)
+                                                die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
+                                }
+                                labels++;
+                                ptr = thisarg (ptr);
+                                if (strstr (ptr, "'") == ptr)
+                                        labels[nlabels - 1] = ptr + 1;
+                                else
+                                        labels[nlabels - 1] = ptr;
+                        }
+                        break;
+                case 'u':                                                                       /* units */
+                        units = optarg;
+                        nunits++;
+                        if (nunits >= unitv_size) {
+                                unitv_size += 8;
+                                unitv = realloc (unitv, unitv_size);
+                                if (unitv == NULL)
+                                        die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), nunits);
+                        }
+                        unitv[nunits - 1] = optarg;
+                        ptr = thisarg (optarg);
+                        unitv[nunits - 1] = ptr;
+                        if (strstr (ptr, "'") == ptr)
+                                unitv[nunits - 1] = ptr + 1;
+                        while (ptr && (ptr = nextarg (ptr))) {
+                                if (nunits >= unitv_size) {
+                                        unitv_size += 8;
+                                        unitv = realloc (unitv, unitv_size);
+                                        if (units == NULL)
+                                                die (STATE_UNKNOWN, _("Could not realloc() units\n"));
+                                }
+                                nunits++;
+                                ptr = thisarg (ptr);
+                                if (strstr (ptr, "'") == ptr)
+                                        unitv[nunits - 1] = ptr + 1;
+                                else
+                                        unitv[nunits - 1] = ptr;
+                        }
+                        break;
+
+                }
+        }
+
+        if (server_address == NULL)
+                server_address = argv[optind];
+
+        if (community == NULL)
+                community = strdup (DEFAULT_COMMUNITY);
+
+        return validate_arguments ();
+}
+
+
+/******************************************************************************
+
+@@-
+<sect3>
+<title>validate_arguments</title>
+
+<para>&PROTO_validate_arguments;</para>
+
+<para>Given a database name, this function returns TRUE if the string
+is a valid PostgreSQL database name, and returns false if it is
+not.</para>
+
+<para>Valid PostgreSQL database names are less than &NAMEDATALEN;
+characters long and consist of letters, numbers, and underscores. The
+first character cannot be a number, however.</para>
+
+</sect3>
+-@@
+******************************************************************************/
+
+
+
+int
+validate_arguments ()
+{
+
+        /* Need better checks to verify seclevel and authproto choices */
+        
+        if (seclevel == NULL) 
+                asprintf (&seclevel, "noAuthNoPriv");
+
+
+        if (authproto == NULL ) 
+                asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
+        
+         
+        
+        if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) {        /* default protocol version */
+                asprintf(&proto, DEFAULT_PROTOCOL);
+                asprintf(&authpriv, "%s%s", "-c ", community);
+        }
+        else if ( strcmp (proto, "3") == 0 ) {                 /* snmpv3 args */
+                asprintf(&proto, "%s", "3");
+                
+                if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) {
+                        asprintf(&authpriv, "%s", "-l noAuthNoPriv" );
+                }
+                else if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+                        if ( secname == NULL || authpasswd == NULL) {
+                                printf (_("Missing secname (%s) or authpassword (%s) ! \n"),secname, authpasswd );
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+                        }
+                        asprintf(&authpriv, "-l authNoPriv -a %s -u %s -A %s ", authproto, secname, authpasswd);
+                }
+                else if ( strcmp(seclevel, "authPriv") == 0 ) {
+                        if ( secname == NULL || authpasswd == NULL || privpasswd == NULL ) {
+                                printf (_("Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"),secname, authpasswd,privpasswd );
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+                        }
+                        asprintf(&authpriv, "-l authPriv -a %s -u %s -A %s -x DES -X %s ", authproto, secname, authpasswd, privpasswd);
+                }
+                
+        }
+        else {
+                usage2 (_("Invalid SNMP version"), proto);
+        }
+                        
+        return OK;
+}
+
+
+
+char *
+clarify_message (char *msg)
+{
+        int i = 0;
+        int foo;
+        char tmpmsg_c[MAX_INPUT_BUFFER];
+        char *tmpmsg = (char *) &tmpmsg_c;
+        tmpmsg = strcpy (tmpmsg, msg);
+        if (!strncmp (tmpmsg, " Hex:", 5)) {
+                tmpmsg = strtok (tmpmsg, ":");
+                while ((tmpmsg = strtok (NULL, " "))) {
+                        foo = strtol (tmpmsg, NULL, 16);
+                        /* Translate chars that are not the same value in the printers
+                         * character set.
+                         */
+                        switch (foo) {
+                        case 208:
+                                {
+                                        foo = 197;
+                                        break;
+                                }
+                        case 216:
+                                {
+                                        foo = 196;
+                                        break;
+                                }
+                        }
+                        msg[i] = foo;
+                        i++;
+                }
+                msg[i] = 0;
+        }
+        return (msg);
+}
+
+
+
+int
+check_num (int i)
+{
+        int result;
+        result = STATE_OK;
+        if (eval_method[i] & WARN_GT && eval_method[i] & WARN_LT &&
+                        lower_warn_lim[i] > upper_warn_lim[i]) {
+                if (response_value[i] <= lower_warn_lim[i] &&
+                                response_value[i] >= upper_warn_lim[i]) {
+                        result = STATE_WARNING;
+                }
+        }
+        else if
+                ((eval_method[i] & WARN_GT && response_value[i] > upper_warn_lim[i]) ||
+                 (eval_method[i] & WARN_GE && response_value[i] >= upper_warn_lim[i]) ||
+                 (eval_method[i] & WARN_LT && response_value[i] < lower_warn_lim[i]) ||
+                 (eval_method[i] & WARN_LE && response_value[i] <= lower_warn_lim[i]) ||
+                 (eval_method[i] & WARN_EQ && response_value[i] == upper_warn_lim[i]) ||
+                 (eval_method[i] & WARN_NE && response_value[i] != upper_warn_lim[i])) {
+                result = STATE_WARNING;
+        }
+
+        if (eval_method[i] & CRIT_GT && eval_method[i] & CRIT_LT &&
+                        lower_crit_lim[i] > upper_crit_lim[i]) {
+                if (response_value[i] <= lower_crit_lim[i] &&
+                                response_value[i] >= upper_crit_lim[i]) {
+                        result = STATE_CRITICAL;
+                }
+        }
+        else if
+                ((eval_method[i] & CRIT_GT && response_value[i] > upper_crit_lim[i]) ||
+                 (eval_method[i] & CRIT_GE && response_value[i] >= upper_crit_lim[i]) ||
+                 (eval_method[i] & CRIT_LT && response_value[i] < lower_crit_lim[i]) ||
+                 (eval_method[i] & CRIT_LE && response_value[i] <= lower_crit_lim[i]) ||
+                 (eval_method[i] & CRIT_EQ && response_value[i] == upper_crit_lim[i]) ||
+                 (eval_method[i] & CRIT_NE && response_value[i] != upper_crit_lim[i])) {
+                result = STATE_CRITICAL;
+        }
+
+        return result;
+}
+
+
+
+int
+lu_getll (unsigned long *ll, char *str)
+{
+        char tmp[100];
+        if (strchr (str, ':') == NULL)
+                return 0;
+        if (strchr (str, ',') != NULL && (strchr (str, ',') < strchr (str, ':')))
+                return 0;
+        if (sscanf (str, "%lu%[:]", ll, tmp) == 2)
+                return 1;
+        return 0;
+}
+
+
+
+int
+lu_getul (unsigned long *ul, char *str)
+{
+        char tmp[100];
+        if (sscanf (str, "%lu%[^,]", ul, tmp) == 1)
+                return 1;
+        if (sscanf (str, ":%lu%[^,]", ul, tmp) == 1)
+                return 1;
+        if (sscanf (str, "%*u:%lu%[^,]", ul, tmp) == 1)
+                return 1;
+        return 0;
+}
+
+
+
+/* trim leading whitespace
+         if there is a leading quote, make sure it balances */
+
+char *
+thisarg (char *str)
+{
+        str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+        if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+                if (strlen (str) == 1 || !strstr (str + 1, "'"))
+                        die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
+        }
+        return str;
+}
+
+
+
+/* if there's a leading quote, advance to the trailing quote
+         set the trailing quote to '\x0'
+         if the string continues, advance beyond the comma */
+
+char *
+nextarg (char *str)
+{
+        if (strstr (str, "'") == str) {
+                str[0] = 0;
+                if (strlen (str) > 1) {
+                        str = strstr (str + 1, "'");
+                        return (++str);
+                }
+                else {
+                        return NULL;
+                }
+        }
+        if (strstr (str, ",") == str) {
+                str[0] = 0;
+                if (strlen (str) > 1) {
+                        return (++str);
+                }
+                else {
+                        return NULL;
+                }
+        }
+        if ((str = strstr (str, ",")) && strlen (str) > 1) {
+                str[0] = 0;
+                return (++str);
+        }
+        return NULL;
+}
+
+
+
+void
+print_help (void)
+{
+        print_revision (progname, revision);
+
+        printf (COPYRIGHT, copyright, email);
+
+        printf (_("\
+Check status of remote machines and obtain sustem information via SNMP\n\n"));
+
+        print_usage ();
+
+        printf (_(UT_HELP_VRSN));
+
+        printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT);
+
+        /* SNMP and Authentication Protocol */
+        printf (_("\
+ -P, --protocol=[1|3]\n\
+    SNMP protocol version\n\
+ -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n\
+    SNMPv3 securityLevel\n\
+ -a, --authproto=[MD5|SHA]\n\
+    SNMPv3 auth proto\n"));
+
+        /* Authentication Tokens*/
+        printf (_("\
+ -C, --community=STRING\n\
+    Optional community string for SNMP communication\n\
+    (default is \"%s\")\n\
+ -U, --secname=USERNAME\n\
+    SNMPv3 username\n\
+ -A, --authpassword=PASSWORD\n\
+    SNMPv3 authentication password\n\
+ -X, --privpasswd=PASSWORD\n\
+    SNMPv3 crypt passwd (DES)\n"), DEFAULT_COMMUNITY);
+
+        /* OID Stuff */
+        printf (_("\
+ -o, --oid=OID(s)\n\
+    Object identifier(s) whose value you wish to query\n\
+ -m, --miblist=STRING\n\
+    List of MIBS to be loaded (default = ALL)\n -d, --delimiter=STRING\n\
+    Delimiter to use when parsing returned data. Default is \"%s\"\n\
+    Any data on the right hand side of the delimiter is considered\n\
+    to be the data that should be used in the evaluation.\n"), DEFAULT_DELIMITER);
+
+        /* Tests Against Integers */
+        printf (_("\
+ -w, --warning=INTEGER_RANGE(s)\n\
+    Range(s) which will not result in a WARNING status\n\
+ -c, --critical=INTEGER_RANGE(s)\n\
+    Range(s) which will not result in a CRITICAL status\n"));
+
+        /* Tests Against Strings */
+        printf (_("\
+ -s, --string=STRING\n\
+    Return OK state (for that OID) if STRING is an exact match\n\
+ -r, --ereg=REGEX\n\
+    Return OK state (for that OID) if extended regular expression REGEX matches\n\
+ -R, --eregi=REGEX\n\
+    Return OK state (for that OID) if case-insensitive extended REGEX matches\n\
+ -l, --label=STRING\n\
+    Prefix label for output from plugin (default -s 'SNMP')\n"));
+
+        /* Output Formatting */
+        printf (_("\
+ -u, --units=STRING\n\
+    Units label(s) for output data (e.g., 'sec.').\n\
+ -D, --output-delimiter=STRING\n\
+    Separates output on multiple OID requests\n"));
+
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+
+        printf (_(UT_VERBOSE));
+
+        printf (_("\n\
+- This plugin uses the 'snmpget' command included with the NET-SNMP package.\n\
+  If you don't have the package installed, you will need to download it from\n\
+  http://net-snmp.sourceforge.net before you can use this plugin.\n"));
+
+        printf (_("\
+- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with\n\
+  internal spaces must be quoted) [max 8 OIDs]\n"));
+
+        printf (_("\
+- Ranges are inclusive and are indicated with colons. When specified as\n\
+  'min:max' a STATE_OK will be returned if the result is within the indicated\n\
+  range or is equal to the upper or lower bound. A non-OK state will be\n\
+  returned if the result is outside the specified range.\n"));
+
+        printf (_("\
+- If specified in the order 'max:min' a non-OK state will be returned if the\n\
+  result is within the (inclusive) range.\n"));
+
+        printf (_("\
+- Upper or lower bounds may be omitted to skip checking the respective limit.\n\
+- Bare integers are interpreted as upper limits.\n\
+- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'\n\
+- Note that only one string and one regex may be checked at present\n\
+- All evaluation methods other than PR, STR, and SUBSTR expect that the value\n\
+  returned from the SNMP query is an unsigned integer.\n"));
+
+        printf (_(UT_SUPPORT));
+}
+
+
+
+void
+print_usage (void)
+{
+        printf ("\
+Usage: %s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n\
+                  [-C community] [-s string] [-r regex] [-R regexi]\n\
+                  [-t timeout] [-e retries]\n\
+                  [-l label] [-u units] [-p port-number] [-d delimiter]\n\
+                  [-D output-delimiter] [-m miblist] [-P snmp version]\n\
+                  [-L seclevel] [-U secname] [-a authproto] [-A authpasswd]\n\
+                  [-X privpasswd]\n", progname);
+}
diff --git a/web/attachments/116587-diffs.txt b/web/attachments/116587-diffs.txt
new file mode 100644
index 0000000..f685d0d
--- /dev/null
+++ b/web/attachments/116587-diffs.txt
@@ -0,0 +1,32 @@
+34c34

+< -H <ip_address> -o <OID> [-n] [-w warn_range] [-c crit_range] \n\

+---

+> -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n\

+46,47d45

+<  -n\n\

+<     Use snmpgetnext instead of snmpget\n\

+199d196

+< int usesnmpgetnext = FALSE;

+239,244c236

+<       if (usesnmpgetnext == TRUE)  {

+<           asprintf (&command_line, "%s -t 1 -r %d -m %s -v %s %s %s:%s %s",

+<                 PATH_TO_SNMPGETNEXT, timeout_interval - 1, miblist, proto,

+<                 authpriv, server_address, port, oid);

+<       } else {

+<           asprintf (&command_line, "%s -t 1 -r %d -m %s -v %s %s %s:%s %s",

+---

+>       asprintf (&command_line, "%s -t 1 -r %d -m %s -v %s %s %s:%s %s",

+247d238

+<       }

+477c468

+<                       getopt_long (argc, argv, "nhvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:m:P:L:U:a:A:X:",

+---

+>                       getopt_long (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:m:P:L:U:a:A:X:",

+480c471

+<               c = getopt (argc, argv, "nhvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:m:P:L:U:a:A:X:");

+---

+>               c = getopt (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:m:P:L:U:a:A:X:");

+498,500d488

+<               case 'n': /* usesnmpgetnext */

+<                       usesnmpgetnext = TRUE;

+<                       break;

diff --git a/web/attachments/116649-check_procs_perfdata.diff b/web/attachments/116649-check_procs_perfdata.diff
new file mode 100644
index 0000000..94bcddf
--- /dev/null
+++ b/web/attachments/116649-check_procs_perfdata.diff
@@ -0,0 +1,49 @@
+--- nagios-plugins-HEAD-200501200547/plugins/check_procs.c      2004-12-29 22:41:39.000000000 -0200
++++ check_procs.c       2005-01-20 14:37:19.000000000 -0200
+@@ -54,6 +54,9 @@
+ #define ELAPSED 512
+ /* Different metrics */
+ char *metric_name;
++char *perf_procs;
++char *perf_metric;
++
+ enum metric {
+        METRIC_PROCS,
+        METRIC_VSZ,
+@@ -290,6 +293,36 @@
+        } 
+        printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs);
+        
++       perf_procs = NULL;
++       perf_metric = NULL;
++               
++       if (metric == METRIC_PROCS) {
++               perf_procs = strscpy(perf_procs,perfdata("Processes", procs, "",
++                               (wmax > 0), wmax , (cmax > 0), cmax ,
++                               0, 0, 0, 0));
++       } else {
++                       perf_metric = strscpy(perf_metric, "Processes: Normal ");
++                       perf_metric = strcat(perf_metric, metric_name);
++                       perf_procs = strscpy(perf_procs, perfdata(perf_metric, procs, "",
++                                               0, 0, 0, 0, 
++                                               0, 0, 0, 0));
++                       perf_metric = strscpy(perf_metric, "Processes: Warning ");
++                       perf_metric = strcat(perf_metric, metric_name);
++                       perf_procs = strcat(perf_procs, " ");
++                       perf_procs = strcat(perf_procs, perfdata(perf_metric, warn, "",
++                                               0, 0, 0, 0,
++                                               0, 0, 0, 0));
++                       perf_metric = strscpy(perf_metric, "Processes: Critical ");
++                       perf_metric = strcat(perf_metric, metric_name);
++                       perf_procs = strcat(perf_procs, " ");
++                       perf_procs = strcat(perf_procs, perfdata(perf_metric, crit, "",
++                                               0, 0, 0, 0,
++                                               1, 0, 0, 0));
++       }
++                                                                       
++       printf (" | %s", perf_procs);   
++       
++       
+        if (strcmp(fmt,"") != 0) {
+                printf (_(" with %s"), fmt);
+        }
diff --git a/web/attachments/116760-nagiosplug-check_nt.diff b/web/attachments/116760-nagiosplug-check_nt.diff
new file mode 100644
index 0000000..0d1a578
--- /dev/null
+++ b/web/attachments/116760-nagiosplug-check_nt.diff
@@ -0,0 +1,76 @@
+--- check_nt.c  2005-01-22 05:16:38.000000000 -0500
++++ check_nt.c.1.4snapshot      2005-01-22 03:26:29.000000000 -0500
+@@ -32,7 +32,7 @@
+ 

+ const char *progname = "check_nt";

+ const char *revision = "$Revision: 1.39 $";

+-const char *copyright = "2003-2005";

++const char *copyright = "2003-2004";

+ const char *email = "nagiosplug-devel@lists.sourceforge.net";

+ 

+ #include "common.h"

+@@ -392,7 +392,7 @@
+        case CHECK_FILEAGE:

+ 

+                if (value_list==NULL)

+-                       output_message = strdup (_("No file specified"));

++                       output_message = strdup (_("No counter specified"));

+                else {

+                        preparelist(value_list);                /* replace , between services with & to send the request */

+                        asprintf(&send_buffer,"%s&9&%s", req_password,value_list);

+@@ -573,7 +573,7 @@
+                die (result, _("could not fetch information from server\n"));

+                

+        if (!strncmp(recv_buffer,"ERROR",5))

+-               die (STATE_UNKNOWN, "Client - %s\n",recv_buffer); /*changed from NSClient to be inclsive of NC_Net*/

++               die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer);

+ }

+ 

+ int strtoularray(unsigned long *array, char *string, const char *delim) {

+@@ -614,7 +614,7 @@
+        printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");

+        printf (COPYRIGHT, copyright, email);

+        

+-       printf (_("This plugin collects data from the NSClient or NC_Net service running on a\n\

++       printf (_("This plugin collects data from the NSClient service running on a\n\

+ Windows NT/2000/XP/2003 server.\n\n"));

+ 

+        print_usage();

+@@ -665,32 +665,24 @@
+      Request a -l parameters with the following syntax:\n\

+      -l <service1>,<service2>,<service3>,...\n\

+      You can specify -d SHOWALL in case you want to see working services\n\

+-     in the returned string.\n"));

++                in the returned string.\n"));

+   printf (_("\

+    PROCSTATE = Check if one or several process are running.\n\

+      Same syntax as SERVICESTATE.\n"));

+   printf (_("\

+    COUNTER = Check any performance counter of Windows NT/2000.\n\

+      Request a -l parameters with the following syntax:\n\

+-     -l \"\\\\<performance object>\\\\counter\",\"<description>\n\

++                -l \"\\\\<performance object>\\\\counter\",\"<description>\n\

+      The <description> parameter is optional and \n\

+      is given to a printf output command which requires a float parameter.\n\

+      If <description> does not include \"%%\", it is used as a label.\n\

+      Some examples:\n\

+        \"Paging file usage is %%.2f %%%%\"\n\

+        \"%%.f %%%% paging file used.\"\n"));

+-  printf (_("\

+-   FILEAGE = Checks how old a file is .\n\

+-     Request a -l parameters with the following syntax:\n\

+-     -l \"<File path>\\\\<File Name>\"

+-     Warning and critical thresholds can be specified with -w and -c.\n"));

+-  

+   printf (_("Notes:\n\

+-  - The NSClient service should be running on the server to get any information\n\

+-    (http://nsclient.ready2run.nl).\n\

+-    or NC_Net should be running.  DO not run both at the same time.\n\

+-    (http://www.shatterit.com/NC_Net).\n\

+-  - Critical thresholds should be lower than warning thresholds\n"));

++ - The NSClient service should be running on the server to get any information\n\

++   (http://nsclient.ready2run.nl).\n\

++ - Critical thresholds should be lower than warning thresholds\n"));

+ }

+ 

+ 

diff --git a/web/attachments/116765-nagiosplug-check_nt.diff b/web/attachments/116765-nagiosplug-check_nt.diff
new file mode 100644
index 0000000..9aaef28
--- /dev/null
+++ b/web/attachments/116765-nagiosplug-check_nt.diff
@@ -0,0 +1,56 @@
+--- check_nt.c  2005-01-22 07:01:52.000000000 -0500
++++ check_nt.c.1.4snapshot      2005-01-22 03:26:29.000000000 -0500
+@@ -49,8 +49,7 @@
+        CHECK_PROCSTATE,

+        CHECK_MEMUSE,

+        CHECK_COUNTER,

+-       CHECK_FILEAGE,

+-       CHECK_INSTANCES 

++       CHECK_FILEAGE

+ };

+ 

+ enum {

+@@ -421,19 +420,6 @@
+                }

+                break;

+ 

+-       case CHECK_INSTANCES:

+-

+-               if (value_list==NULL)

+-                       output_message = strdup (_("No Perfomance counter Category specified"));

+-               else {

+-                       preparelist(value_list);                /* replace , between services with & to send the request */

+-                       asprintf(&send_buffer,"%s&10&%s", req_password,value_list);

+-                       fetch_data (server_address, server_port, send_buffer);

+-                       asprintf (&output_message, "%s", recv_buffer);

+-                       return_code = STATE_OK;

+-               }

+-               break;

+-

+        case CHECK_NONE:

+        default:

+                usage4 (_("Please specify a variable to check"));

+@@ -541,8 +527,6 @@
+                                        vars_to_check=CHECK_COUNTER;

+                                else if(!strcmp(optarg,"FILEAGE"))

+                                        vars_to_check=CHECK_FILEAGE;

+-                               else if(!strcmp(optarg,"INSTANCES"))

+-                                       vars_to_check=CHECK_INSTANCES;

+                                else

+                                        return ERROR;

+                                break;

+@@ -695,14 +679,6 @@
+      Some examples:\n\

+        \"Paging file usage is %%.2f %%%%\"\n\

+        \"%%.f %%%% paging file used.\"\n"));

+-  printf (_("\

+-   CHECK_INSTANCES = Check any performance counter Category for availible instances.\n\

+-     Request a -l parameters with the following syntax:\n\

+-        -l <Perfomance Counter Category>,<Perfomance Counter Category>,...\n\

+-     Does not use -w or -c, \n\

+-     returns a list of Instances for each Category in the list of categories.\n\

+-     example: \n\

+-     -l \"Memory,Process,Print Queue\"\n"));

+   printf (_("Notes:\n\

+  - The NSClient service should be running on the server to get any information\n\

+    (http://nsclient.ready2run.nl).\n\

diff --git a/web/attachments/116832-check_dig_tabspatch.diff b/web/attachments/116832-check_dig_tabspatch.diff
new file mode 100644
index 0000000..552c6b9
--- /dev/null
+++ b/web/attachments/116832-check_dig_tabspatch.diff
@@ -0,0 +1,38 @@
+Index: check_dig.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
+retrieving revision 1.39
+diff -c -r1.39 check_dig.c
+*** check_dig.c 25 Dec 2004 23:17:38 -0000      1.39
+--- check_dig.c 23 Jan 2005 05:00:19 -0000
+***************
+*** 124,129 ****
+--- 124,133 ----
+                                        result = STATE_OK;
+                                }
+  
++                               /* rmo: 050122 - Translate output TAB -> SPACE */
++                               char *t = output;
++                               while ((t = index(t, '\t')) != NULL) {*t = ' ';}
++ 
+                        } while (!strstr (input_buffer, ";; "));
+  
+                        if (result == STATE_UNKNOWN) {
+***************
+*** 334,340 ****
+  
+          printf (_("\
+   -a, --expected_address=STRING\n\
+!    an address expected to be in the asnwer section.\n\
+     if not set, uses whatever was in -l\n"));
+  
+        printf (_(UT_WARN_CRIT));
+--- 338,344 ----
+  
+          printf (_("\
+   -a, --expected_address=STRING\n\
+!    an address expected to be in the answer section.\n\
+     if not set, uses whatever was in -l\n"));
+  
+        printf (_(UT_WARN_CRIT));
+
diff --git a/web/attachments/116909-nagiosplug-check_nt.diff b/web/attachments/116909-nagiosplug-check_nt.diff
new file mode 100644
index 0000000..c9426b8
--- /dev/null
+++ b/web/attachments/116909-nagiosplug-check_nt.diff
@@ -0,0 +1,83 @@
+--- check_nt.c  2005-01-24 03:18:40.000000000 -0500
++++ check_nt.c.1.4snapshot      2005-01-22 03:26:29.000000000 -0500
+@@ -49,8 +49,7 @@
+        CHECK_PROCSTATE,

+        CHECK_MEMUSE,

+        CHECK_COUNTER,

+-       CHECK_FILEAGE,

+-       CHECK_EVENTLOG 

++       CHECK_FILEAGE

+ };

+ 

+ enum {

+@@ -421,18 +420,6 @@
+                }

+                break;

+ 

+-       case CHECK_EVENTLOG:

+-               if (value_list==NULL)

+-                       asprintf(&send_buffer,"%s&11", req_password);

+-               else {

+-                       asprintf(&send_buffer,"%s&11&%s", req_password,value_list);

+-               }

+-               fetch_data (server_address, server_port, send_buffer);

+-               return_code=atoi(strtok(recv_buffer,"&"));

+-               temp_string=strtok(NULL,"&");

+-               output_message = strdup (temp_string);

+-               break;

+-

+        case CHECK_NONE:

+        default:

+                usage4 (_("Please specify a variable to check"));

+@@ -540,8 +527,6 @@
+                                        vars_to_check=CHECK_COUNTER;

+                                else if(!strcmp(optarg,"FILEAGE"))

+                                        vars_to_check=CHECK_FILEAGE;

+-                               else if(!strcmp(optarg,"EVENTLOG"))

+-                                       vars_to_check=CHECK_EVENTLOG;

+                                else

+                                        return ERROR;

+                                break;

+@@ -694,42 +679,6 @@
+      Some examples:\n\

+        \"Paging file usage is %%.2f %%%%\"\n\

+        \"%%.f %%%% paging file used.\"\n"));

+-  printf (_("\

+-   EVENTLOG = Check any Event Log in Windows for any entry.\n\

+-     Request a -l parameters with the following syntax:\n\

+-     -l \"<Event Log>,<Event Type>,<minutes range>,\n\

+-         <Source Filter list>,<Message Filter List>,<Event ID Filter List>\"\n\

+-     <Event Log> - any, System, Application, Security \n\

+-         or any other non-standard Event Log. 'any' will check all logs.\n\

+-     <Event Type> - any, Information, Warning, Error,\n\

+-         or other non-standard Event Type. 'any' will check all Types.\n\

+-     <minutes range> - Maximum age in minutes of event entries to check.\n\

+-         Use 0 to check all event Entries in log.\n\

+-     <Source Filter List> Use 0 to diable the Source Filter.\n\

+-         Otherwise enter a comma seperated list \n\

+-         with the first element being the number of items in the list.\n\

+-         Use a negitive number to Exclude matching entries.\n\

+-         Use a positive number to Include only matching entries.\n\

+-     <Message Filter List> Use 0 to diable the Message Filter.\n\

+-         (Message Filter accepts Regular Expressions) \n\

+-         Otherwise enter a comma seperated list \n\

+-         with the first element being the number of items in the list.\n\

+-         Use a negitive number to Exclude matching entries.\n\

+-         Use a Positive number to Include only matching entries.\n\

+-     <Event ID Filter List> Use 0 to diable the Event ID Filter.\n\

+-         Otherwise enter a comma seperated list with the first element\n\

+-         being the number of items in the list.\n\

+-         Use a negitive sign to Exclude matching entries.\n\

+-         Use a positive number to Include only matching entries.\n\

+-     Examples:\n\

+-         The Following examples will list all events in the System Event Log\n\

+-         that have a source of eventlog and have the word start or stop\n\

+-         withing the event message.\n\

+-         -l \"System,any,0,1,eventlog,2,start,stop,0\"\n\

+-         -l \"System,any,0,1,eventlog,1,(start|stop),0\"\n\

+-        \n"));

+-

+-

+   printf (_("Notes:\n\

+  - The NSClient service should be running on the server to get any information\n\

+    (http://nsclient.ready2run.nl).\n\

diff --git a/web/attachments/117424-check_log.sh.patch b/web/attachments/117424-check_log.sh.patch
new file mode 100644
index 0000000..6d6fdb8
--- /dev/null
+++ b/web/attachments/117424-check_log.sh.patch
@@ -0,0 +1,13 @@
+--- check_log.sh        2002-10-28 13:05:07.000000000 +0000
++++ check_log.sh.new    2005-01-27 18:51:26.000000000 +0000
+@@ -164,8 +164,8 @@
+ 
+ # If the source log file doesn't exist, exit
+ 
+-if [ ! -e $logfile ]; then
+-    $ECHO "Log check error: Log file $logfile does not exist!\n"
++if [ ! -r $logfile ]; then
++    $ECHO "Log check error: Log file $logfile does not exist or you do not have read permission!\n"
+     exit $STATE_UNKNOWN
+ fi
+ 
diff --git a/web/attachments/117526-cel.diff b/web/attachments/117526-cel.diff
new file mode 100644
index 0000000..f205f63
--- /dev/null
+++ b/web/attachments/117526-cel.diff
@@ -0,0 +1,71 @@
+*** /tools/nagios/libexec/check_email_loop.pl.orig      Fri Jan 28 08:08:29 2005
+--- /tools/nagios/libexec/check_email_loop.pl   Fri Jan 28 08:38:01 2005
+***************
+*** 42,51 ****
+  my $state = "UNKNOWN";
+  my ($sender,$receiver, $pophost, $popuser, $poppasswd, $smtphost);
+  my ($poptimeout,$smtptimeout,$pinginterval)=(60,60,5);
+! my ($lostwarn, $lostcrit,$pendwarn, $pendcrit);
+  
+  # Internal Vars
+  my ($pop,$msgcount,@msglines,$statinfo,@messageids,$newestid);
+  my ($matchcount,$statfile) = (0,"check_email_loop.stat");
+  
+  # Subs declaration
+--- 42,52 ----
+  my $state = "UNKNOWN";
+  my ($sender,$receiver, $pophost, $popuser, $poppasswd, $smtphost);
+  my ($poptimeout,$smtptimeout,$pinginterval)=(60,60,5);
+! my ($lostwarn, $lostcrit,$pendwarn, $pendcrit, $debug);
+  
+  # Internal Vars
+  my ($pop,$msgcount,@msglines,$statinfo,@messageids,$newestid);
++ my(%other_smtp_opts);
+  my ($matchcount,$statfile) = (0,"check_email_loop.stat");
+  
+  # Subs declaration
+***************
+*** 65,70 ****
+--- 66,72 ----
+  my $status = GetOptions(
+                        "from=s",\$sender,
+                        "to=s",\$receiver,
++                         "debug", \$debug,
+                          "pophost=s",\$pophost,
+                          "popuser=s",\$popuser,
+                        "passwd=s",\$poppasswd,
+***************
+*** 101,108 ****
+  my $serial = time();
+  $serial = "ID#" . $serial . "#$$";
+  
+  # sending new ping email
+! my $smtp = Net::SMTP->new($smtphost,Timeout=>$smtptimeout) 
+    || nsexit("SMTP connect timeout ($smtptimeout s)",'CRITICAL');
+  ($smtp->mail($sender) &&
+   $smtp->to($receiver) &&
+--- 103,116 ----
+  my $serial = time();
+  $serial = "ID#" . $serial . "#$$";
+  
++ 
+  # sending new ping email
+! %other_smtp_opts={};
+! if ( $debug == 1  ) {
+!     $other_smtp_opts{'Debug'} = 1;
+! }
+! 
+! my $smtp = Net::SMTP->new($smtphost,Timeout=>$smtptimeout, %other_smtp_opts) 
+    || nsexit("SMTP connect timeout ($smtptimeout s)",'CRITICAL');
+  ($smtp->mail($sender) &&
+   $smtp->to($receiver) &&
+***************
+*** 216,221 ****
+--- 224,230 ----
+    print "   -lostcrit=num      CRITICAL \n";
+    print "   -pendwarn=num      WARNING-state if more than num pending emails\n";
+    print "   -pendcrit=num      CRITICAL \n";
++   print "   -debug             send SMTP tranaction info to stderr\n";
+    print " Options may abbreviated!\n";
+    print " LOST mails are mails, being sent before the last mail arrived back.\n";
+    print " PENDING mails are those, which are not. (supposed to be on the way)\n";
diff --git a/web/attachments/118230-check_http.c.diff b/web/attachments/118230-check_http.c.diff
new file mode 100644
index 0000000..336ea2e
--- /dev/null
+++ b/web/attachments/118230-check_http.c.diff
@@ -0,0 +1,133 @@
+*** nagios-plugins-1.4-beta1/plugins/check_http.c       2004-12-24 03:54:24.000000000 +0900
+--- check_http.c        2005-01-26 15:31:53.374334612 +0900
+***************
+*** 66,71 ****
+--- 66,73 ----
+  X509 *server_cert;
+  int connect_SSL (void);
+  int check_certificate (X509 **);
++ # define VERIFY_CERTIFICATE   10
++ # define CAFILE               11
+  #endif
+  int no_body = FALSE;
+  int maximum_age = -1;
+***************
+*** 111,116 ****
+--- 113,123 ----
+  char *http_opt_headers;
+  int onredirect = STATE_OK;
+  int use_ssl = FALSE;
++ int verify_certificate = FALSE;
++ int use_cafile = FALSE;
++ int CAfile = FALSE;
++ int cert_verify_result;
++ char *trusted_ca_file=NULL;
+  int verbose = FALSE;
+  int sd;
+  int min_page_len = 0;
+***************
+*** 206,211 ****
+--- 213,220 ----
+                {"link", no_argument, 0, 'L'},
+                {"nohtml", no_argument, 0, 'n'},
+                {"ssl", no_argument, 0, 'S'},
++               {"certverify", no_argument, 0, VERIFY_CERTIFICATE},
++               {"CAfile", required_argument, 0, CAFILE},
+                {"verbose", no_argument, 0, 'v'},
+                {"post", required_argument, 0, 'P'},
+                {"IP-address", required_argument, 0, 'I'},
+***************
+*** 315,320 ****
+--- 324,351 ----
+                        usage4 (_("Invalid option - SSL is not available"));
+  #endif
+                        break;
++ #ifdef HAVE_SSL
++               case VERIFY_CERTIFICATE : 
++                       use_ssl = TRUE;
++                       verify_certificate = TRUE;
++                         if (specify_port == FALSE)
++                               server_port = HTTPS_PORT;
++ #else
++                         usage4 (_("Invalid option - SSL is not available"));
++ #endif
++                         break;
++ 
++ #ifdef HAVE_SSL
++                 case CAFILE :
++                         if (!verify_certificate) usage2(_("Verify Certificate option not enabled"),optarg);
++                       use_cafile = TRUE;
++                       trusted_ca_file = strdup (optarg);
++ #else
++                         usage4 (_("Invalid option - SSL is not available"));
++ #endif
++                         break;
++ 
++       
+                case 'f': /* onredirect */
+                        if (!strcmp (optarg, "follow"))
+                                onredirect = STATE_DEPENDENT;
+***************
+*** 732,738 ****
+--- 763,771 ----
+                        die (STATE_CRITICAL, _("Unable to open TCP socket\n"));
+                }
+  
++               SSL_get_peer_cert_chain(ssl); /* We don't really mind if there is no cert chain as only the peer cert is needed */
+                if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
++                       cert_verify_result = SSL_get_verify_result( ssl );
+                        X509_free (server_cert);
+                }
+                else {
+***************
+*** 740,745 ****
+--- 773,785 ----
+                        return STATE_CRITICAL;
+                }
+  
++               if (verify_certificate) {
++                       if (cert_verify_result != X509_V_OK) {
++                               printf ("CRITICAL - Certificate error : %s\n", X509_verify_cert_error_string(cert_verify_result) );
++                               return STATE_CRITICAL;
++                       }
++               }
++ 
+        }
+        else {
+  #endif
+***************
+*** 1191,1196 ****
+--- 1231,1246 ----
+                return STATE_CRITICAL;
+        }
+  
++         if (use_cafile) {
++               SSL_CTX_set_client_CA_list(ctx,SSL_load_client_CA_file(trusted_ca_file));
++               if (!SSL_CTX_load_verify_locations(ctx, trusted_ca_file, NULL)) {
++                      printf (_("CRITICAL - Cannot load CAfile.\n"));
++               }else {
++                      SSL_CTX_set_default_verify_paths(ctx);
++               }
++         }
++ 
++ 
+        /* Initialize alarm signal handling */
+        signal (SIGALRM, socket_timeout_alarm_handler);
+  
+***************
+*** 1477,1482 ****
+--- 1527,1540 ----
+  STATE_OK is returned. When the certificate is still valid, but for less than\n\
+  14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when\n\
+  the certificate is expired.\n"));
++ 
++       printf (_("\n\
++ CHECK CERTIFICATE VALIDITY: check_http www.myhost.com --certverify \n\n\
++ Checks to see the validity of a certificate, will return a critical on any \n\
++ certificate error including self signed, untrusted issuer, decryption errors\n\
++ or certificate revocation.\n\
++ Full list : http://www.openssl.org/docs/apps/verify.html#DIAGNOSTICS\n\n"));
++ 
+  #endif
+  
+        printf (_(UT_SUPPORT));
diff --git a/web/attachments/119194-check_procs.patch b/web/attachments/119194-check_procs.patch
new file mode 100644
index 0000000..3510483
--- /dev/null
+++ b/web/attachments/119194-check_procs.patch
@@ -0,0 +1,34 @@
+*** check_procs.c.orig  Wed Dec 29 16:41:39 2004
+--- check_procs.c       Tue Feb  8 10:42:34 2005
+***************
+*** 187,197 ****
+                                        procppid, procpcpu, procstat, 
+                                        procetime, procprog, procargs);
+  
+!                       /* Ignore self */
+                        if (strcmp (procprog, progname) == 0) {
+                                continue;
+                        }
+  
+                        if ((options & STAT) && (strstr (statopts, procstat)))
+                                resultsum |= STAT;
+                        if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL))
+--- 187,204 ----
+                                        procppid, procpcpu, procstat, 
+                                        procetime, procprog, procargs);
+  
+!                       /* Ignore command line self */
+! 
+                        if (strcmp (procprog, progname) == 0) {
+                                continue;
+                        }
+  
++                       /* Ignore self in process arguments to prevent problems when 
++                          check_procs is called via shell (i.e. check_nrpe) */
++ 
++                       if (strstr (procargs, progname) != NULL) 
++                               continue;
++ 
+                        if ((options & STAT) && (strstr (statopts, procstat)))
+                                resultsum |= STAT;
+                        if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL))
diff --git a/web/attachments/119417-check_ntp-diff b/web/attachments/119417-check_ntp-diff
new file mode 100644
index 0000000..11d424d
--- /dev/null
+++ b/web/attachments/119417-check_ntp-diff
@@ -0,0 +1,68 @@
+10,19c10
+< # $Id: check_ntp.pl,v 1.30 2005/02/09 11:15 mevertse Exp $
+< #
+< # (c) 2005 Merijn Evertse, SARA Computing and Networking Services 
+< # 9-2-2005, 11:15
+< #
+< # Modified the script to accept parameters -4, -6 to choose between the ipv4 and ipv6 protocol.
+< # When no parameter is specified ipv4 is chosen as the default.
+< #
+< # (c) 2004 Matthew Kent 
+< # 19-11-2004, 04:00
+---
+> # $Id: check_ntp.pl,v 1.20 2004/11/19 03:59:43 mattkent Exp $
+73,74c64,65
+< use vars qw($opt_V $opt_h $opt_H $opt_t $opt_w $opt_c $opt_j $opt_k $verbose $PROGNAME $def_jitter $ipv4 $ipv6);
+< use lib utils.pm;
+---
+> use vars qw($opt_V $opt_h $opt_H $opt_t $opt_w $opt_c $opt_j $opt_k $verbose $PROGNAME $def_jitter);
+> use lib utils.pm; 
+97,99c88
+<        "v"   => \$verbose, "verbose"  => \$verbose,
+<        "4"   => \$ipv4, "use-ipv4"    => \$ipv4,
+<        "6"   => \$ipv6, "use-ipv6"    => \$ipv6,
+---
+>        "v" => \$verbose, "verbose"    => \$verbose,
+191,206d179
+< # Determine protocol te be used for ntpdate and ntpq
+< my $ntpdate;
+< my $ntpq;
+< if ($ipv4) {
+<         $ntpdate = $utils::PATH_TO_NTPDATE . " -4";
+<         $ntpq = $utils::PATH_TO_NTPQ . " -4";
+< }
+< elsif ($ipv6) {
+<         $ntpdate = $utils::PATH_TO_NTPDATE . " -6";
+<         $ntpq = $utils::PATH_TO_NTPQ . " -6";
+< }
+< else {
+<         # Use IPv4 as the default value
+<         $ntpdate = $utils::PATH_TO_NTPDATE . " -4";
+<         $ntpq = $utils::PATH_TO_NTPQ . " -4";
+< }
+214c187
+< if (!open (NTPDATE, $ntpdate . " -q $host 2>&1 |")) {
+---
+> if (!open (NTPDATE, "$utils::PATH_TO_NTPDATE -q $host 2>&1 |")) {
+289c262
+<       if ( open(NTPQ, $ntpq . " -np $host 2>&1 |") ) {
+---
+>       if ( open(NTPQ,"$utils::PATH_TO_NTPQ -np $host 2>&1 |") ) {
+439c412
+<       print "Usage: $PROGNAME -H <host> [-46] [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n";
+---
+>       print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n";
+457c430
+<     Clock jitter in milliseconds at which a warning message will be generated.\n      Defaults to $DEFAULT_JITTER_CRIT.
+---
+>     Clock jitter in milliseconds at which a warning message will be generated.\n      Defaults to $DEFAULT_JITTER_CRIT.\n
+460,465c433,434
+<     warning is returned.\n
+< -4 (--use-ipv4)
+<     Use IPv4 connection
+< -6 (--use-ipv6)
+<     Use IPv6 connection
+< \n";  
+---
+>     warning is returned.
+> ";    
diff --git a/web/attachments/119444-nagios-plugins-1.4_mysql41-slave-fix.patch b/web/attachments/119444-nagios-plugins-1.4_mysql41-slave-fix.patch
new file mode 100644
index 0000000..fb4f11e
--- /dev/null
+++ b/web/attachments/119444-nagios-plugins-1.4_mysql41-slave-fix.patch
@@ -0,0 +1,127 @@
+diff -rNu nagios-plugins-1.4/plugins/check_mysql.c nagios-plugins-1.4_mysql41-slave-fix/plugins/check_mysql.c
+--- nagios-plugins-1.4/plugins/check_mysql.c    Sun Dec 26 00:17:44 2004
++++ nagios-plugins-1.4_mysql41-slave-fix/plugins/check_mysql.c  Thu Feb 10 13:27:13 2005
+@@ -12,6 +12,11 @@
+ * Description:
+ *
+ * This plugin is for testing a mysql server.
++*
++******************************************************************************
++* Modified by wouter@widexs.nl:
++* - Changed static column numbers in the slave-check, to dynamic, 
++*   so newer MySQL versions (eg. 4.1.x) are supported as well (09-02-2005)
+ ******************************************************************************/
+ 
+ const char *progname = "check_mysql";
+@@ -49,12 +54,19 @@
+        MYSQL mysql;
+        MYSQL_RES *res;
+        MYSQL_ROW row;
++       MYSQL_FIELD *field;
+        
+        /* should be status */
+        
+        char *result = NULL;
+        char slaveresult[SLAVERESULTSIZE];
+ 
++       int local_mysql_server_version  = 0;
++       int local_mysql_client_version  = 0;
++       int col_slave_err               = 0;
++       int col_slave_run               = 0;
++       int col_slave_sql_run           = 0;
++
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+@@ -107,6 +119,21 @@
+                        die (STATE_CRITICAL, _("slave store_result error: %s\n"), mysql_error (&mysql));
+                }
+ 
++               /* Get client & server version */
++               local_mysql_client_version      = mysql_get_client_version();
++               local_mysql_server_version      = (local_mysql_client_version >= 40000 ? mysql_get_server_version(&mysql) : local_mysql_get_server_version());
++               
++               /* Fetch column names */
++               while((field = mysql_fetch_field(res)))
++               {
++                       if(strcmp (field->name, (local_mysql_server_version >= 40000 ? "Slave_IO_Running" : "Slave_Running")) == 0) {
++                               col_slave_run           = (mysql_field_tell(res) -1);
++                       }
++                       if(strcmp (field->name, "Slave_SQL_Running") == 0) {
++                               col_slave_sql_run       = (mysql_field_tell(res) -1);
++                       }
++               }
++
+                /* fetch the first row */
+                if ( (row = mysql_fetch_row (res)) == NULL) {
+                        mysql_free_result (res);
+@@ -114,27 +141,38 @@
+                        die (STATE_CRITICAL, _("slave fetch row error: %s\n"), mysql_error (&mysql));
+                }
+ 
+-               if (mysql_field_count (&mysql) == 12) {
+-                       /* mysql 3.23.x */
+-                       snprintf (slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[6]);
+-                       if (strcmp (row[6], "Yes") != 0) {
+-                               mysql_free_result (res);
+-                               mysql_close (&mysql);
+-                               die (STATE_CRITICAL, "%s\n", slaveresult);
++               if (local_mysql_server_version >= 40000) {
++                       /* mysql 4.x.x */
++                       if ((col_slave_run > 0) && (col_slave_sql_run > 0)) {
++                               snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s  Slave SQL: %s", row[col_slave_run], row[col_slave_sql_run]);
++                               if (strcmp (row[col_slave_run], "Yes") != 0 || strcmp (row[col_slave_sql_run], "Yes") != 0) {
++                                       col_slave_err   = 1;
++                               }
++                       } else {
++                               snprintf (slaveresult, SLAVERESULTSIZE, "Required Slave columns not found");
++                               col_slave_err   = 1;
+                        }
+-
+                } else {
+-                       /* mysql 4.x.x */
+-                       snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s", row[9], row[10]);
+-                       if (strcmp (row[9], "Yes") != 0 || strcmp (row[10], "Yes") != 0) {
+-                               mysql_free_result (res);
+-                               mysql_close (&mysql);
+-                               die (STATE_CRITICAL, "%s\n", slaveresult);
++                       /* mysql 3.23.x */
++                       if (col_slave_run > 0) {
++                               snprintf (slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[col_slave_run]);
++                               if (strcmp (row[col_slave_run], "Yes") != 0) {
++                                       col_slave_err   = 1;
++                               }
++                       } else {
++                               snprintf (slaveresult, SLAVERESULTSIZE, "Required Slave column not found");
++                               col_slave_err   = 1;
+                        }
+                }
+ 
+                /* free the result */
+                mysql_free_result (res);
++               
++               /* Check for trouble */
++               if(col_slave_err > 0) {
++                       mysql_close (&mysql);
++                       die (STATE_CRITICAL, "%s\n", slaveresult);
++               }
+        }
+ 
+        /* close the connection */
+@@ -150,6 +188,16 @@
+        return STATE_OK;
+ }
+ 
++/* Get version number for server */
++local_mysql_get_server_version(MYSQL *mysql)
++{
++       uint major, minor, version;
++       char *pos= mysql->server_version, *end_pos;
++       major=   (uint) strtoul(pos, &end_pos, 10);   pos=end_pos+1;
++       minor=   (uint) strtoul(pos, &end_pos, 10);   pos=end_pos+1;
++       version= (uint) strtoul(pos, &end_pos, 10);
++       return (ulong) major*10000L+(ulong) (minor*100+version);
++}
+ 
+ /* process command-line arguments */
+ int
diff --git a/web/attachments/119447-check_by_ssh.diff b/web/attachments/119447-check_by_ssh.diff
new file mode 100644
index 0000000..a915d9f
--- /dev/null
+++ b/web/attachments/119447-check_by_ssh.diff
@@ -0,0 +1,49 @@
+--- check_by_ssh.c.orig 2005-02-08 18:17:08.000000000 +0300
++++ check_by_ssh.c      2005-02-08 18:13:37.000000000 +0300
+@@ -191,6 +191,7 @@
+                {"user", required_argument, 0, 'u'},
+                {"logname", required_argument, 0, 'l'},
+                {"command", required_argument, 0, 'C'},
++               {"quiet", required_argument, 0, 'q'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {0, 0, 0, 0}
+@@ -207,10 +208,10 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "Vvh46ft:H:O:p:i:u:l:C:n:s:", long_options,
++                       getopt_long (argc, argv, "Vvhq46ft:H:O:p:i:u:l:C:n:s:", long_options,
+                                                                         &option_index);
+ #else
+-               c = getopt (argc, argv, "Vvh46ft:H:O:p:i:u:l:C:n:s:");
++               c = getopt (argc, argv, "Vvhq46ft:H:O:p:i:u:l:C:n:s:");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -268,6 +269,7 @@
+                case 'i':                                                                       /* identity */
+                        asprintf (&comm, "%s -%c %s", comm, c, optarg);
+                        break;
++               case 'q':                                                                       /* quiet */
+                case '4':                                                                       /* Pass these switches directly to ssh */
+                case '6':                                                               /* -4 for IPv4, -6 for IPv6 */
+                case 'f':                                                                       /* fork to background */
+@@ -364,6 +366,8 @@
+                 "   list of nagios service names, separated by ':' [optional]\n"
+                 "-n, --name=NAME\n"
+                 "   short name of host in nagios configuration [optional]\n"
++                "-q, --quiet\n"
++                "   tell ssh to run in quiet mode\n"
+                 "-4, --use-ipv4\n"
+                 "   tell ssh to use IPv4\n"
+                 "-6, --use-ipv6\n"
+@@ -391,7 +395,7 @@
+ {
+        printf
+                ("Usage:\n"
+-                "check_by_ssh [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
++                "check_by_ssh [-fq46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
+                 "             [-n name] [-s servicelist] [-O outputfile] [-p port]\n"
+                 "check_by_ssh  -V prints version info\n"
+                 "check_by_ssh  -h prints more detailed help\n");
diff --git a/web/attachments/119648-check_disk.c.diff b/web/attachments/119648-check_disk.c.diff
new file mode 100644
index 0000000..1e0e5fc
--- /dev/null
+++ b/web/attachments/119648-check_disk.c.diff
@@ -0,0 +1,15 @@
+--- check_disk.c.orig   2005-02-11 17:37:48.254928480 +0300
++++ check_disk.c        2005-02-11 17:37:44.193545904 +0300
+@@ -118,8 +118,11 @@
+                        if (strcmp (file_system, "none") == 0)
+                                strncpy (file_system, mntp, MAX_INPUT_BUFFER-1);
+ 
+-                       if (disk_result==STATE_OK && erronly && !verbose)
++                       /* FIX: If everything is ok set result */
++                       if (disk_result==STATE_OK && erronly && !verbose) {
++                               result = max_state (result, disk_result);
+                                continue;
++                       }
+ 
+                        if (disk_result!=STATE_OK || verbose>=0) 
+                                asprintf (&output, "%s [%.0f kB (%d%%) free on %s]", output,
diff --git a/web/attachments/121772-nagiosplug-cvs-timeout_status.diff b/web/attachments/121772-nagiosplug-cvs-timeout_status.diff
new file mode 100644
index 0000000..cf1e66a
--- /dev/null
+++ b/web/attachments/121772-nagiosplug-cvs-timeout_status.diff
@@ -0,0 +1,208 @@
+diff -urN ./plugins/check_nt.c ../plugins/plugins/check_nt.c
+--- ./plugins/check_nt.c        2005-01-24 08:29:53.000000000 +0100
++++ ../plugins/plugins/check_nt.c       2005-02-17 12:26:57.000000000 +0100
+@@ -35,6 +35,9 @@
+ const char *copyright = "2003-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
++extern const char *status_strings;
++extern int timeout_status;
++
+ #include "common.h"
+ #include "netutils.h"
+ #include "utils.h"
+@@ -454,6 +457,7 @@
+                {"hostname", required_argument,0,'H'},
+                {"version",  no_argument,      0,'V'},
+                {"help",     no_argument,      0,'h'},
++               {"timeout-status", required_argument, 0, 'T'},
+                {0,0,0,0}
+        };
+ 
+@@ -478,7 +482,7 @@
+        }
+ 
+        while (1){
+-               c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:",longopts,&option);
++               c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:T:",longopts,&option);
+ 
+                if (c==-1||c==EOF||c==1)
+                        break;
+@@ -549,8 +553,11 @@
+                                socket_timeout=atoi(optarg);
+                                if(socket_timeout<=0)
+                                        return ERROR;
++                               break;
++                       case 'T':
++                               if(set_timeout_status(optarg) == ERROR) return ERROR;
++                               break;
+                        }
+-
+        }
+ 
+        if (vars_to_check==CHECK_NONE)
+diff -urN ./plugins/common.h ../plugins/plugins/common.h
+--- ./plugins/common.h  2004-12-10 11:42:00.000000000 +0100
++++ ../plugins/plugins/common.h 2005-02-17 12:26:57.000000000 +0100
+@@ -157,8 +157,13 @@
+        ERROR = -1
+ };
+ 
+-/* AIX seems to have this defined somewhere else */
+-#ifndef FALSE
++/* AIX seems to have FALSE defined somewhere else, so make sure
++ * TRUE means something else (we assume it does if it's already defined) */
++#ifdef FALSE
++# ifndef TRUE
++#  define TRUE (FALSE ^ 1)
++# endif
++#else
+ enum {
+        FALSE,
+        TRUE
+@@ -170,7 +175,8 @@
+        STATE_WARNING,
+        STATE_CRITICAL,
+        STATE_UNKNOWN,
+-       STATE_DEPENDENT
++       STATE_DEPENDENT,
++       STATE_OOB           /* result out of bounds (keep last in list!) */
+ };
+ 
+ enum {
+diff -urN ./plugins/netutils.c ../plugins/plugins/netutils.c
+--- ./plugins/netutils.c        2005-01-05 21:53:22.000000000 +0100
++++ ../plugins/plugins/netutils.c       2005-02-17 12:34:23.000000000 +0100
+@@ -38,18 +38,23 @@
+ int econn_refuse_state = STATE_CRITICAL;
+ int was_refused = FALSE;
+ int address_family = AF_UNSPEC;
++extern char *status_strings;
++extern int timeout_status;
+ 
+ static int my_connect(const char *address, int port, int *sd, int proto);
+ /* handles socket timeouts */
+ void
+ socket_timeout_alarm_handler (int sig)
+ {
+-       if (sig == SIGALRM)
+-               printf (_("CRITICAL - Socket timeout after %d seconds\n"), socket_timeout);
+-       else
+-               printf (_("CRITICAL - Abnormal timeout after %d seconds\n"), socket_timeout);
++       /* this can only happen with poorly written plugins, so chalk
++        * it up as input validation error and return STATE_UNKNOWN */
++       if(timeout_status < 0 || timeout_status >= STATE_OOB)
++               timeout_status = STATE_UNKNOWN;
+ 
+-       exit (STATE_CRITICAL);
++       printf (_("%s - Socket timeout after %d seconds\n"),
++                 status_strings[timeout_status], socket_timeout);
++
++       exit (timeout_status);
+ }
+ 
+ 
+diff -urN ./plugins/utils.c ../plugins/plugins/utils.c
+--- ./plugins/utils.c   2005-01-05 21:53:23.000000000 +0100
++++ ../plugins/plugins/utils.c  2005-02-17 12:26:57.000000000 +0100
+@@ -23,6 +23,20 @@
+ extern void print_usage (void);
+ extern const char *progname;
+ 
++/* NULL-terminate these arrays just to be prudent
++ * It's a bit faster and a lot more portable to use two separate
++ * arrays for this, as we don't need to rely on strcasecmp being available
++ */
++const char *status_strings[] = {
++       "OK", "WARNING", "CRITICAL", "UNKNOWN", "DEPENDENT", NULL
++};
++const char *lowercase_status_strings[] = {
++       "ok", "warning", "critical", "unknown", "dependent", NULL
++};
++/* plugins may set this themselves, so export it from here
++ * and have the plugins import it explicitly as extern */
++int timeout_status = STATE_CRITICAL;
++
+ #define STRLEN 64
+ #define TXTBLK 128
+ 
+@@ -105,18 +119,10 @@
+ const char *
+ state_text (int result)
+ {
+-       switch (result) {
+-       case STATE_OK:
+-               return "OK";
+-       case STATE_WARNING:
+-               return "WARNING";
+-       case STATE_CRITICAL:
+-               return "CRITICAL";
+-       case STATE_DEPENDENT:
+-               return "DEPENDENT";
+-       default:
++       if(result < 0 || result >= STATE_OOB)
+                return "UNKNOWN";
+-       }
++
++       return status_strings[result];
+ }
+ 
+ void
+@@ -129,14 +135,54 @@
+        exit (result);
+ }
+ 
++int
++set_timeout_status(const char *arg)
++{
++       int i;
++       
++       timeou_status = -1;
++       for(i = 0; status_strings[i],lowercase_status_strings[i]; i++) {
++               if(status_strings[i][0] = arg[0] ||
++                  lowercase_status_strings[i][0] = arg[0])
++               {
++                       timeout_status = i;
++                       break;
++               }
++
++               if(timeout_status != -1) return OK;
++
++               errno = 0;
++               timeout_status = (int)strtol(arg, NULL, 0);
++               if(timeout_status < STATE_OK || timeout_status >= STATE_OOB ||
++                  (!timeout_status && errno))
++               {
++                       timeout_status = STATE_UNKNOWN;
++                       return ERROR;
++               }
++       }
++
++       return OK;
++}
++
++
+ void
+ timeout_alarm_handler (int signo)
+ {
++       /* don't segfault if someone stupid has set this arbitrarily */
++       if(timeout_status < 0 || timeout_status >= STATE_OOB)
++               timeout_status = STATE_UNKNOWN;
++
+        if (signo == SIGALRM) {
+-               printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
+-                                               timeout_interval);
+-               exit (STATE_CRITICAL);
++               printf (_("%s - Plugin timed out after %d seconds\n"),
++                                               status_strings[timeout_status], timeout_interval);
++               exit (timeout_status);
+        }
++
++       /* fallthrough so we print something in case some stupid plugin
++        * contributor has set this function to the catch-all sighandler */
++       printf(_("Caught signal %d in timeout_alarm_handler (bad coding).\n"),
++               signo);
++       exit(STATE_UNKNOWN);
+ }
+ 
+ int
diff --git a/web/attachments/121773-check_icmp-bundled.diff b/web/attachments/121773-check_icmp-bundled.diff
new file mode 100644
index 0000000..4bb56b4
--- /dev/null
+++ b/web/attachments/121773-check_icmp-bundled.diff
@@ -0,0 +1,742 @@
+diff -urN ../plugins/plugins/check_icmp.c ./plugins/check_icmp.c
+--- ../plugins/plugins/check_icmp.c     2005-02-01 15:31:11.000000000 +0100
++++ ./plugins/check_icmp.c      2005-02-18 15:57:08.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: check_icmp.c,v 1.5 2005/02/01 07:33:13 stanleyhopcroft Exp $
++ * $Id: check_icmp.c,v 1.12 2005/01/29 23:23:23 exon Exp $
+  *
+  * Author: Andreas Ericsson <ae@op5.se>
+  *
+@@ -14,6 +14,15 @@
+  * redundant routes. The only remainders of fping is currently a few
+  * function names.
+  *
++ * Kudos to;
++ *   Joe Rhett
++ *   Wickus Botha
++ *   Aaron Carr
++ *   Harper Mann
++ *   Phil Costelloe
++ *   Carsten Schmitz
++ * for lending me system resources, testing and feedback
++ *
+  */
+ 
+ #include <sys/time.h>
+@@ -84,7 +93,7 @@
+        char *msg;                   /* icmp error message, if any */
+        struct sockaddr_in saddr_in; /* the address of this host */
+        struct in_addr error_addr;   /* stores address of error replies */
+-       unsigned long long time_waited; /* total time waited, in usecs */
++       unsigned long int time_waited; /* total time waited, in usecs */
+        unsigned int icmp_sent, icmp_recv, icmp_lost; /* counters */
+        unsigned char icmp_type, icmp_code; /* type and code from errors */
+        unsigned short flags;        /* control/status flags */
+@@ -137,18 +146,19 @@
+ #define IP_HDR_SIZE 20
+ #define MAX_PING_DATA (MAX_IP_PKT_SIZE - IP_HDR_SIZE - ICMP_MINLEN)
+ #define DEFAULT_PING_DATA_SIZE (MIN_PING_DATA_SIZE + 44)
++#define DEFAULT_TTL 64
+ 
+-/* various target states */
+-#define TSTATE_INACTIVE 0x01   /* don't ping this host anymore */
+-#define TSTATE_WAITING 0x02            /* unanswered packets on the wire */
+-#define TSTATE_ALIVE 0x04       /* target is alive (has answered something) */
+-#define TSTATE_UNREACH 0x08
++#define MIN_PKT_INTERVAL   25000 /* min pkt_interval, microsecs */
++#define NOFORCE_WAIT 0
++#define FORCE_WAIT 1
+ 
+ /** prototypes **/
+-static void usage(unsigned char, char *);
++static void usage(unsigned char, char *, ...);
+ static u_int get_timevar(const char *);
+ static u_int get_timevaldiff(struct timeval *, struct timeval *);
+-static int wait_for_reply(int, u_int);
++static int reap_replies(int, u_int, int);
++void u_sleep(u_int u_sec);
++static u_int wait_for_reply(int, u_int);
+ static int recvfrom_wto(int, char *, unsigned int, struct sockaddr *, u_int *);
+ static int send_icmp_ping(int, struct rta_host *);
+ static int get_threshold(char *str, threshold *th);
+@@ -162,6 +172,7 @@
+ 
+ /** external **/
+ extern int optind, opterr, optopt;
++/* extern int h_errno; */
+ extern char *optarg;
+ extern char **environ;
+ 
+@@ -173,15 +184,15 @@
+ static unsigned short icmp_pkt_size, icmp_data_size = DEFAULT_PING_DATA_SIZE;
+ static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0;
+ #define icmp_pkts_en_route (icmp_sent - (icmp_recv + icmp_lost))
+-static unsigned short targets_down = 0, targets = 0, packets = 0;
++static unsigned int targets_down = 0, targets = 0, packets = 0;
+ #define targets_alive (targets - targets_down)
+ static unsigned int retry_interval, pkt_interval, target_interval;
+ static int icmp_sock, tcp_sock, udp_sock, status = STATE_OK;
+ static pid_t pid;
+ static struct timezone tz;
+ static struct timeval prog_start;
+-static unsigned long long max_completion_time = 0;
+-static unsigned char ttl = 0;  /* outgoing ttl */
++static unsigned long int max_completion_time = 0;
++static unsigned char ttl = 64; /* outgoing ttl */
+ static unsigned int warn_down = 1, crit_down = 1; /* host down threshold values */
+ float pkt_backoff_factor = 1.5;
+ float target_backoff_factor = 1.5;
+@@ -210,7 +221,8 @@
+ {
+        char *msg = "unreachable";
+ 
+-       if(debug > 1) printf("get_icmp_error_msg(%u, %u)\n", icmp_type, icmp_code);
++       if(debug > 3) printf("get_icmp_error_msg(%u, %u) called\n",
++                                                icmp_type, icmp_code);
+        switch(icmp_type) {
+        case ICMP_UNREACH:
+                switch(icmp_code) {
+@@ -269,7 +281,7 @@
+        unsigned char *ptr;
+ 
+        if(p->icmp_type == ICMP_ECHO && p->icmp_id == pid) {
+-               /* echo request from us to us (pinging localhost) */
++               if(debug > 2) printf("echo request from us to us (pinging localhost)\n");
+                return 0;
+        }
+ 
+@@ -286,9 +298,13 @@
+         * TIMXCEED actually sends a proper icmp response we will have passed
+         * too many hops to have a hope of reaching it later, in which case it
+         * indicates overconfidence in the network, poor routing or both. */
++       if(debug > 2) printf("random ICMP response type: %u,  code: %u\n",
++                                                p->icmp_type, p->icmp_code);
+        if(p->icmp_type != ICMP_UNREACH && p->icmp_type != ICMP_TIMXCEED &&
+           p->icmp_type != ICMP_SOURCEQUENCH && p->icmp_type != ICMP_PARAMPROB)
+        {
++               if(debug > 1) printf("Unsafe to handle unknown type %u, returning\n",
++                                                        p->icmp_type);
+                return 0;
+        }
+ 
+@@ -298,7 +314,7 @@
+        if(sent_icmp->icmp_type != ICMP_ECHO || sent_icmp->icmp_id != pid ||
+           sent_icmp->icmp_seq >= targets)
+        {
+-               if(debug) printf("Packet is no response to a packet we sent\n");
++               if(debug) printf("not a response to a packet we sent, or target failed to duplicate request\n");
+                return 0;
+        }
+ 
+@@ -394,12 +410,12 @@
+        }
+        else if(!strcmp(progname, "check_host")) {
+                mode = MODE_HOSTCHECK;
+-               pkt_interval = 1000000;
++               pkt_interval = 200000;
+                packets = 5;
+                crit.rta = warn.rta = 1000000;
+                crit.pl = warn.pl = 100;
+        }
+-       else if(!strcmp(progname, "check_rta_multi")) {
++       else if(!strcmp(progname, "check_icmp_multi")) {
+                mode = MODE_ALL;
+                target_interval = 0;
+                pkt_interval = 50000;
+@@ -408,6 +424,8 @@
+ 
+        /* parse the arguments */
+        for(i = 1; i < argc; i++) {
++               /* the leading '-' of the optstring makes non-argument options
++                * return with arg 1, meaning it's */
+                while((arg = getopt(argc, argv, "vhVw:c:n:p:t:H:i:b:I:l:")) != EOF) {
+                        switch(arg) {
+                        case 'v':
+@@ -436,7 +454,8 @@
+                                timeout = strtoul(optarg, NULL, 0);
+                                if(!timeout) timeout = 10;
+                                break;
+-                       case 'H':
++                       case 'H': case 1: /* 1 is default for non-option arguments */
++                               /* printf("arg: %ld, optarg: %s\n", arg, optarg); */
+                                add_target(optarg);
+                                break;
+                        case 'l':
+@@ -460,11 +479,10 @@
+                add_target(*argv);
+                argv++;
+        }
+-       if(!targets) {
+-               errno = 0;
+-               crash("No hosts to check");
+-               exit(3);
+-       }
++       if(!targets) usage('h', "No hosts to check");
++
++       if(getuid() && pkt_interval < MIN_PKT_INTERVAL)
++               pkt_interval = MIN_PKT_INTERVAL;
+ 
+        if(!sockets) {
+                if(icmp_sock == -1) {
+@@ -486,10 +504,12 @@
+        if(!ttl) ttl = 64;
+ 
+        if(icmp_sock) {
++               errno = 0;
+                result = setsockopt(icmp_sock, SOL_IP, IP_TTL, &ttl, sizeof(ttl));
+                if(debug) {
+-                       if(result == -1) printf("setsockopt failed\n");
+-                       else printf("ttl set to %u\n", ttl);
++                       printf("setsockopt(icmp_sock, SOL_IP, IP_TTL, %u) = %d (%s)\n",
++                                  ttl, result, strerror(errno));
++                       if(result != -1) printf("outgoing ttl set to %u\n", ttl);
+                }
+        }
+ 
+@@ -505,7 +525,7 @@
+        signal(SIGHUP, finish);
+        signal(SIGTERM, finish);
+        signal(SIGALRM, finish);
+-       if(debug) printf("Setting alarm timeout to %u seconds\n", timeout);
++       if(debug > 1) printf("Setting alarm timeout to %u seconds\n", timeout);
+        alarm(timeout);
+ 
+        /* make sure we don't wait any longer than necessary */
+@@ -514,10 +534,9 @@
+                ((targets * packets * pkt_interval) + (targets * target_interval)) +
+                (targets * packets * crit.rta) + crit.rta;
+ 
+-       if(debug) {
++       if(debug > 1) {
+                printf("packets: %u, targets: %u\n"
+-                          "target_interval: %0.3f, pkt_interval %0.3f\n"
+-                          "crit.rta: %0.3f\n"
++                          "target_interval: %0.3f, pkt_interval %0.3f, crit.rta: %0.3f\n"
+                           "max_completion_time: %0.3f\n",
+                           packets, targets,
+                           (float)target_interval / 1000, (float)pkt_interval / 1000,
+@@ -527,9 +546,9 @@
+ 
+        if(debug) {
+                if(max_completion_time > (u_int)timeout * 1000000) {
+-                       printf("max_completion_time: %llu  timeout: %u\n",
++                       printf("max_completion_time: %lu  timeout: %u\n",
+                                   max_completion_time, timeout);
+-                       printf("Timout must be at lest %llu\n",
++                       printf("Timout must be at lest %lu\n",
+                                   max_completion_time / 1000000 + 1);
+                }
+        }
+@@ -579,24 +598,27 @@
+        u_int i, t, result;
+        u_int final_wait, time_passed;
+ 
+-       /* this loop might actually violate the pkt_interval or target_interval
+-        * settings, but only if there aren't any packets on the wire which
+-        * indicates that the target can handle an increased packet rate */
+-       for(i = 0; i < packets; i++) {
+-               for(t = 0; t < targets; t++) {
++       /* send the packets */
++       for(t = 0; t < targets; t++) {
++               for(i = 0; i < packets; i++) {
++
+                        /* don't send useless packets */
+-                       if(!targets_alive) finish(0);
+                        if(table[t]->flags & FLAG_LOST_CAUSE) {
+                                if(debug) printf("%s is a lost cause. not sending any more\n",
+                                                                 table[t]->name);
+                                continue;
+                        }
+-                       
++
+                        /* we're still in the game, so send next packet */
+                        (void)send_icmp_ping(icmp_sock, table[t]);
+-                       result = wait_for_reply(icmp_sock, target_interval);
++
++                       /* pause for a while so we don't flood the network */
++                       result = reap_replies(icmp_sock, pkt_interval, FORCE_WAIT);
+                }
+-               result = wait_for_reply(icmp_sock, pkt_interval * targets);
++
++               /* wait for all incoming packets from all hosts */
++               if(target_interval > pkt_interval)
++                       result = reap_replies(icmp_sock, target_interval - pkt_interval, FORCE_WAIT);
+        }
+ 
+        if(icmp_pkts_en_route && targets_alive) {
+@@ -604,7 +626,7 @@
+                final_wait = max_completion_time - time_passed;
+ 
+                if(debug) {
+-                       printf("time_passed: %u  final_wait: %u  max_completion_time: %llu\n",
++                       printf("time_passed: %u  final_wait: %u  max_completion_time: %lu\n",
+                                   time_passed, final_wait, max_completion_time);
+                }
+                if(time_passed > max_completion_time) {
+@@ -616,8 +638,61 @@
+                 * haven't yet */
+                if(debug) printf("Waiting for %u micro-seconds (%0.3f msecs)\n",
+                                                 final_wait, (float)final_wait / 1000);
+-               result = wait_for_reply(icmp_sock, final_wait);
++               result = reap_replies(icmp_sock, final_wait, NOFORCE_WAIT);
++       }
++}
++
++/*
++ * select() is posix, so we expect it to be around
++ */
++void
++u_sleep(u_int u_sec)
++{
++       int nfound;
++       struct timeval to;
++       fd_set readset, writeset;
++
++       if(debug > 3) printf("sleeping for %u microseconds\n", u_sec);
++       if(!u_sec) return;
++
++       to.tv_sec = u_sec / 1000000;
++       to.tv_usec = u_sec % 1000000;
++       FD_ZERO(&writeset);
++       FD_ZERO(&readset);
++       nfound = select(0, &readset, &writeset, NULL, &to);
++       if(nfound < 0)
++               crash("select() in u_sleep");
++
++       return;
++}                                                              /* u_sleep() */
++
++static int
++reap_replies(int sock, u_int t, int wait_forced)
++{
++       /* wrap up if all targets are declared dead */
++       if(debug > 3) printf("reap_replies(%d, %u, %d) called\n", sock, t, wait_forced);
++
++       if(!targets_alive ||
++          get_timevaldiff(&prog_start, NULL) >= max_completion_time)
++       {
++               finish(0);
++       }
++
++       /* listen til timeout while there are packets en route (rhymes!) ;) */
++       while(t && icmp_pkts_en_route) {
++               t = wait_for_reply(sock, t);
++
++               /* the dead won't sing to us */
++               if(!targets_alive) finish(0);
+        }
++
++       if(icmp_recv == (targets_alive * (int)packets)) finish(0);
++
++       if(!t || !wait_forced) return 0;
++
++       u_sleep(t);
++
++       return 0;
+ }
+ 
+ /* response structure:
+@@ -625,126 +700,98 @@
+  * icmp header : 28 bytes
+  * icmp echo reply : the rest
+  */
+-static int
++static u_int
+ wait_for_reply(int sock, u_int t)
+ {
+        int n, hlen;
+        static char buf[4096];
+        struct sockaddr_in resp_addr;
+        struct ip *ip;
+-       struct icmp *icp, *sent_icmp;
++       struct icmp *icp;
+        struct rta_host *host;
+        struct icmp_ping_data *data;
+        struct timeval wait_start, now;
+-       u_int tdiff, i, per_pkt_wait;
+-
+-       /* if we can't listen or don't have anything to listen to, just return */
+-       if(!t || !icmp_pkts_en_route) return 0;
++       u_int tdiff, timo = t;
+ 
+        gettimeofday(&wait_start, &tz);
+ 
+-       i = t;
+-       per_pkt_wait = t / icmp_pkts_en_route;
+-       while(icmp_pkts_en_route && get_timevaldiff(&wait_start, NULL) < i) {
+-               t = per_pkt_wait;
+-
+-               /* wrap up if all targets are declared dead */
+-               if(!targets_alive ||
+-                  get_timevaldiff(&prog_start, NULL) >= max_completion_time ||
+-                  (mode == MODE_HOSTCHECK && targets_down))
+-               {
+-                       finish(0);
+-               }
++       n = recvfrom_wto(sock, buf, sizeof(buf), (struct sockaddr *)&resp_addr, &timo);
++       if(!n) {        /* timeout */
++               if(debug > 2) printf("recvfrom_wto() timed out during a %u usecs wait\n", t);
++               return 0; /* no time left, so return just that */
++       }
+ 
+-               /* reap responses until we hit a timeout */
+-               n = recvfrom_wto(sock, buf, sizeof(buf),
+-                                                (struct sockaddr *)&resp_addr, &t);
+-               if(!n) {
+-                       if(debug > 1) {
+-                               printf("recvfrom_wto() timed out during a %u usecs wait\n",
+-                                          per_pkt_wait);
+-                       }
+-                       continue;       /* timeout for this one, so keep trying */
+-               }
+-               if(n < 0) {
+-                       if(debug) printf("recvfrom_wto() returned errors\n");
+-                       return n;
+-               }
++       gettimeofday(&now, &tz);
++       tdiff = get_timevaldiff(&wait_start, &now);
++       /* make sure we can return time left */
++       if(t > tdiff) t -= tdiff;
++       else t = 0;
+ 
+-               ip = (struct ip *)buf;
+-               if(debug > 1) printf("received %u bytes from %s\n",
++       ip = (struct ip *)buf;
++       if(debug > 1) printf("received %u bytes from %s\n",
+                                                 ntohs(ip->ip_len), inet_ntoa(resp_addr.sin_addr));
+ 
+-/* obsolete. alpha on tru64 provides the necessary defines, but isn't broken */
++/* obsolete, or at least not globally applicable */
+ /* #if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) */
+                /* alpha headers are decidedly broken. Using an ansi compiler,
+                 * they provide ip_vhl instead of ip_hl and ip_v, so we mask
+                 * off the bottom 4 bits */
+ /*             hlen = (ip->ip_vhl & 0x0f) << 2; */
+ /* #else */
+-               hlen = ip->ip_hl << 2;
++       hlen = ip->ip_hl << 2;
+ /* #endif */
+ 
+-               if(n < (hlen + ICMP_MINLEN)) {
+-                       crash("received packet too short for ICMP (%d bytes, expected %d) from %s\n",
+-                                 n, hlen + icmp_pkt_size, inet_ntoa(resp_addr.sin_addr));
+-               }
+-               /* else if(debug) { */
+-               /*      printf("ip header size: %u, packet size: %u (expected %u, %u)\n", */
+-               /*                 hlen, ntohs(ip->ip_len) - hlen, */
+-               /*                 sizeof(struct ip), icmp_pkt_size); */
+-               /* } */
+-
+-               /* check the response */
+-               icp = (struct icmp *)(buf + hlen);
+-               sent_icmp = (struct icmp *)(buf + hlen + ICMP_MINLEN);
+-               /* printf("buf: %p, icp: %p, distance: %u (expected %u)\n", */
+-               /*         buf, icp, */
+-               /*         (u_int)icp - (u_int)buf, hlen); */
+-               /* printf("buf: %p, sent_icmp: %p, distance: %u (expected %u)\n", */
+-               /*         buf, sent_icmp, */
+-               /*         (u_int)sent_icmp - (u_int)buf, hlen + ICMP_MINLEN); */
+-
+-               if(icp->icmp_id != pid) {
+-                       handle_random_icmp(icp, &resp_addr);
+-                       continue;
+-               }
+-
+-               if(icp->icmp_type != ICMP_ECHOREPLY || icp->icmp_seq >= targets) {
+-                       if(debug > 2) printf("not a proper ICMP_ECHOREPLY\n");
+-                       handle_random_icmp(icp, &resp_addr);
+-                       continue;
+-               }
+-
+-               /* this is indeed a valid response */
+-               data = (struct icmp_ping_data *)(icp->icmp_data);
+-
+-               host = table[icp->icmp_seq];
+-               gettimeofday(&now, &tz);
+-               tdiff = get_timevaldiff(&data->stime, &now);
++       if(n < (hlen + ICMP_MINLEN)) {
++               crash("received packet too short for ICMP (%d bytes, expected %d) from %s\n",
++                         n, hlen + icmp_pkt_size, inet_ntoa(resp_addr.sin_addr));
++       }
++       else if(debug > 2) {
++               printf("ip header size: %u, packet size: %u (expected %u, %u)\n",
++                          hlen, ntohs(ip->ip_len) - hlen,
++                          sizeof(struct ip), (u_int)icmp_pkt_size);
++       }
+ 
+-               host->time_waited += tdiff;
+-               host->icmp_recv++;
+-               icmp_recv++;
++       /* check the response */
++       icp = (struct icmp *)(buf + hlen);
+ 
++       if(icp->icmp_id != pid || icp->icmp_type != ICMP_ECHOREPLY || icp->icmp_seq >= targets) {
+                if(debug) {
+-                       printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u\n",
+-                                  (float)tdiff / 1000, inet_ntoa(resp_addr.sin_addr),
+-                                  ttl, ip->ip_ttl);
+-               }
++                       printf("inbound packet is:\n");
++                       if(icp->icmp_id != pid) printf("\tnot marked by me\n");
++                       if(icp->icmp_type != ICMP_ECHOREPLY) printf("\tnot an echo reply\n");
++                       if(icp->icmp_seq >= targets) printf("\ttagged with a too high seq number\n");
++               }
++               handle_random_icmp(icp, &resp_addr);
++               return t;
++       }
++       if(debug > 2) puts("inbound packet is a valid ICMP_ECHOREPLY to a packet we sent");
++
++       /* this is indeed a valid response */
++       data = (struct icmp_ping_data *)(icp->icmp_data);
++       host = table[icp->icmp_seq];
++       tdiff = get_timevaldiff(&data->stime, &now);
++
++       host->time_waited += tdiff;
++       host->icmp_recv++;
++       icmp_recv++;
+ 
+-               /* if we're in hostcheck mode, exit with limited printouts */
+-               if(mode == MODE_HOSTCHECK) {
+-                       printf("OK - %s responds to ICMP. Packet %u, rta %0.3fms|"
+-                                  "pkt=%u;;0;%u rta=%0.3f;%0.3f;%0.3f;;\n",
+-                                  host->name, icmp_recv, (float)tdiff / 1000,
+-                                  icmp_recv, packets, (float)tdiff / 1000,
+-                                  (float)warn.rta / 1000, (float)crit.rta / 1000);
+-                       exit(STATE_OK);
+-               }
++       if(debug) {
++               printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u\n",
++                          (float)tdiff / 1000, inet_ntoa(resp_addr.sin_addr),
++                          ttl, ip->ip_ttl);
++       }
++
++       /* if we're in hostcheck mode, exit with limited printouts */
++       if(mode == MODE_HOSTCHECK) {
++               printf("OK - %s responds to ICMP. Packet %u, rta %0.3fms|"
++                          "pkt=%u;;0;%u rta=%0.3f;%0.3f;%0.3f;;\n",
++                          host->name, icmp_recv, (float)tdiff / 1000,
++                          icmp_recv, packets, (float)tdiff / 1000,
++                          (float)warn.rta / 1000, (float)crit.rta / 1000);
++               exit(STATE_OK);
+        }
+ 
+-       return 0;
++       return t;
+ }
+ 
+ /* the ping functions */
+@@ -776,8 +823,6 @@
+        }
+        memset(buf, 0, icmp_pkt_size + sizeof(struct ip));
+ 
+-       if((gettimeofday(&tv, &tz)) == -1) return -1;
+-
+        icp = (struct icmp *)buf;
+        icp->icmp_type = ICMP_ECHO;
+        icp->icmp_code = 0;
+@@ -785,7 +830,9 @@
+        icp->icmp_id = pid;
+        icp->icmp_seq = host->id;
+        data = (struct icmp_ping_data *)icp->icmp_data;
+-       data->ping_id = 10; /* host->icmp.icmp_sent; */
++       data->ping_id = host->icmp_sent;
++
++       if((gettimeofday(&tv, &tz)) == -1) return -1;
+        memcpy(&data->stime, &tv, sizeof(struct timeval));
+        icp->icmp_cksum = icmp_checksum((u_short *)icp, icmp_pkt_size);
+ 
+@@ -798,6 +845,7 @@
+                return -1;
+        }
+ 
++       /* increment the counters */
+        icmp_sent++;
+        host->icmp_sent++;
+ 
+@@ -809,7 +857,7 @@
+                         u_int *timo)
+ {
+        u_int slen;
+-       int n;
++       int n, result;
+        struct timeval to, then, now;
+        fd_set rd, wr;
+ 
+@@ -835,7 +883,10 @@
+ 
+        slen = sizeof(struct sockaddr);
+ 
+-       return recvfrom(sock, buf, len, 0, saddr, &slen);
++       result = recvfrom(sock, buf, len, 0, saddr, &slen);
++       if(result < 0) crash("recvfrom in recvfrom_wto");
++
++       return result;
+ }
+ 
+ static void
+@@ -849,7 +900,7 @@
+        {"OK", "WARNING", "CRITICAL", "UNKNOWN", "DEPENDENT"};
+ 
+        alarm(0);
+-       if(debug > 1) printf("finish(%d) called\n", sig);
++       if(debug > 2) printf("finish(%d) called\n", sig);
+ 
+        if(icmp_sock != -1) close(icmp_sock);
+        if(udp_sock != -1) close(udp_sock);
+@@ -1016,23 +1067,20 @@
+        struct hostent *he;
+        struct in_addr *in, ip;
+ 
+-       /* don't resolve if we don't have to */
+-       if((ip.s_addr = inet_addr(arg)) != INADDR_NONE) {
+-               /* don't add all ip's if we were given a specific one */
+-               return add_target_ip(arg, &ip);
+-               /* he = gethostbyaddr((char *)in, sizeof(struct in_addr), AF_INET); */
+-               /* if(!he) return add_target_ip(arg, in); */
+-       }
+-       else {
+-               errno = 0;
++       /* don't resolve if we don't have to, don't add all ip's if we were
++        * given a specific one, even if we're in hostcheck mode */
++       if(inet_aton(arg, &ip)) return add_target_ip(arg, &ip);
++
++       /* not an IP, so resolve */
++       errno = 0;
++       he = gethostbyname(arg);
++       if(!he && h_errno == TRY_AGAIN) {
++               u_sleep(500000);
+                he = gethostbyname(arg);
+-               if(!he) {
+-                       errno = 0;
+-                       crash("Failed to resolve %s", arg);
+-                       return -1;
+-               }
+        }
+ 
++       if(!he) usage(0, "Failed to resolve %s: %s", arg, hstrerror(h_errno));
++
+        /* possibly add all the IP's as targets */
+        for(i = 0; he->h_addr_list[i]; i++) {
+                in = (struct in_addr *)he->h_addr_list[i];
+@@ -1040,7 +1088,7 @@
+ 
+                /* this is silly, but it works */
+                if(mode == MODE_HOSTCHECK || mode == MODE_ALL) {
+-                       printf("mode: %d\n", mode);
++                       if(debug) printf("mode: %d\n", mode);
+                        continue;
+                }
+                break;
+@@ -1048,6 +1096,7 @@
+ 
+        return 0;
+ }
++
+ /*
+  * u = micro
+  * m = milli
+@@ -1073,12 +1122,12 @@
+        if(len >= 2 && !isdigit((int)str[len - 2])) p = str[len - 2];
+        if(p && u == 's') u = p;
+        else if(!p) p = u;
+-       if(debug > 2) printf("evaluating %s, u: %c, p: %c\n", str, u, p);
++       if(debug > 3) printf("evaluating %s, u: %c, p: %c\n", str, u, p);
+ 
+        if(u == 'u') factor = 1;            /* microseconds */
+        else if(u == 'm') factor = 1000;        /* milliseconds */
+        else if(u == 's') factor = 1000000;     /* seconds */
+-       if(debug > 2) printf("factor is %u\n", factor);
++       if(debug > 3) printf("factor is %u\n", factor);
+ 
+        i = strtoul(str, &ptr, 0);
+        if(!ptr || *ptr != '.' || strlen(ptr) < 2 || factor == 1)
+@@ -1149,51 +1198,58 @@
+ 
+ /* make core plugin developers happy (silly, really) */
+ static void
+-usage(unsigned char arg, char *msg)
++usage(unsigned char arg, char *fmt, ...)
+ {
+-       if(msg) printf("%s: %s\n", progname, msg);
++       if(fmt) {
++               va_list ap;
++
++               printf("%s: ", progname);
++
++               va_start(ap, fmt);
++               vprintf(fmt, ap);
++               va_end(ap);
++               puts("\n");
++       }
+ 
+        if(arg == 'V') {
+-               printf("$Id: check_icmp.c,v 1.5 2005/02/01 07:33:13 stanleyhopcroft Exp $\n");
++               printf("$Id: check_icmp.c,v 1.12 2005/01/29 23:23:23 exon Exp $\n");
+                exit(STATE_UNKNOWN);
+        }
+ 
+        printf("Usage: %s [options] [-H] host1 host2 hostn\n\n", progname);
+ 
+-       if(arg != 'h') exit(3);
++       if(arg != 'h') {
++               printf("%s -h  for details\n", progname);
++               exit(3);
++       }
+ 
+        printf("Where options are any combination of:\n"
+-                  " * -H | --host        specify a target\n"
+-                  " * -w | --warn        warning threshold (currently %0.3fms,%u%%)\n"
+-                  " * -c | --crit        critical threshold (currently %0.3fms,%u%%)\n"
+-                  " * -n | --packets     number of packets to send (currently %u)\n"
+-                  " * -i | --interval    max packet interval (currently %0.3fms)\n"
+-                  " * -I | --hostint     max target interval (currently %0.3fms)\n"
+-                  " * -l | --ttl         TTL on outgoing packets (currently %u)\n"
+-                  " * -t | --timeout     timeout value (seconds, currently  %u)\n"
+-                  " * -b | --bytes       icmp packet size (currenly ignored)\n"
+-                  "   -v | --verbose     verbosity++\n"
+-                  "   -h | --help        this cruft\n",
++                  " * -H | --host      specify a target\n"
++                  " * -w | --warn      warning threshold (currently %0.3fms,%u%%)\n"
++                  " * -c | --crit      critical threshold (currently %0.3fms,%u%%)\n"
++                  " * -n | --packets   number of packets to send (currently %u)\n"
++                  " * -i | --interval  max packet interval (currently %0.3fms)\n"
++                  " * -I | --hostint   max target interval (currently %0.3fms)\n",
+                   (float)warn.rta / 1000, warn.pl, (float)crit.rta / 1000, crit.pl,
+                   packets,
+-                  (float)pkt_interval / 1000, (float)target_interval / 1000,
++                  (float)pkt_interval / 1000, (float)target_interval / 1000);
++
++       printf(" * -l | --ttl       outgoing TTL (currently %u, not supported on all platforms)\n"
++                  " * -t | --timeout   timeout value (seconds, currently  %u)\n"
++                  " * -b | --bytes     icmp packet size (currenly ignored)\n"
++                  "   -v | --verbose   verbosity++ (4 is sort of max)\n"
++                  "   -h | --help      this cruft\n",
+                   ttl, timeout);
+ 
+-       puts("\nThe -H switch is optional. Naming a host (or several) to check is not.\n\n"
+-                "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%\n"
+-                "packet loss.  The default values should work well for most users.\n"
++       puts("\nThreshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%\n"
++                "packet loss.  All threshold values match inclusively.\n"
+                 "You can specify different RTA factors using the standardized abbreviations\n"
+-                "us (microseconds), ms (milliseconds, default) or just plain s for seconds.\n\n"
+-                "Threshold format for -d is warn,crit.  12,14 means WARNING if >= 12 hops\n"
+-                "are spent and CRITICAL if >= 14 hops are spent.\n"
+-                "NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not.\n\n"
+-                "The -v switch can be specified several times for increased verbosity.\n\n"
+-                "Long options are currently unsupported.\n\n"
+-                "Options marked with * require an argument\n");
+-
+-       puts("The latest version of this plugin can be found at http://oss.op5.se/nagios\n"
+-                "or https://devel.op5.se/oss until the day it is included in the official\n"
+-                "plugin distribution.\n");
++                "us (microseconds), ms (milliseconds, default) or just plain s for seconds.\n");
++       puts("Long options are currently unsupported.\n");
++       puts("Options marked with * require an argument\n");
++       puts("If this program is invoked as check_host (with a symlink, preferrably), it will exit with status\n"
++                "OK upon the first properly received ICMP_ECHOREPLY, making it ideal\n"
++                "for hostchecks (less network load and much, much faster on OK)\n");
+ 
+        exit(3);
+ }
diff --git a/web/attachments/121775-nagiosplug-cvs-ansiC.diff b/web/attachments/121775-nagiosplug-cvs-ansiC.diff
new file mode 100644
index 0000000..ba408b6
--- /dev/null
+++ b/web/attachments/121775-nagiosplug-cvs-ansiC.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378820455" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378820455" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378820455" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378820455" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378820455');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1143849&group_id=29880&atid=397599&file_id=121775"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/121776-nagiosplug-cvs-ansiC.diff b/web/attachments/121776-nagiosplug-cvs-ansiC.diff
new file mode 100644
index 0000000..58d67fd
--- /dev/null
+++ b/web/attachments/121776-nagiosplug-cvs-ansiC.diff
@@ -0,0 +1,33 @@
+diff -urN ./plugins/check_by_ssh.c ../plugins/plugins/check_by_ssh.c
+--- ./plugins/check_by_ssh.c    2005-01-05 21:53:11.000000000 +0100
++++ ../plugins/plugins/check_by_ssh.c   2005-02-17 13:19:35.000000000 +0100
+@@ -246,7 +246,7 @@
+                case 's':                                                                       /* description of service to check */
+                        service = realloc (service, (++services) * sizeof(char *));
+                        p1 = optarg;
+-                       while ((p2 = index (p1, ':'))) {
++                       while ((p2 = strchr (p1, ':'))) {
+                                *p2 = '\0';
+                                asprintf (&service[services-1], "%s", p1);
+                                service = realloc (service, (++services) * sizeof(char *));
+diff -urN ./plugins/check_dig.c ../plugins/plugins/check_dig.c
+--- ./plugins/check_dig.c       2005-01-28 15:00:58.000000000 +0100
++++ ../plugins/plugins/check_dig.c      2005-02-17 13:55:05.000000000 +0100
+@@ -127,7 +127,7 @@
+ 
+                                /* Translate output TAB -> SPACE */
+                                t = output;
+-                               while ((t = index(t, '\t')) != NULL) 
++                               while ((t = strchr(t, '\t')) != NULL) 
+                                        *t = ' ';
+ 
+                        } while (!strstr (input_buffer, ";; "));
+@@ -149,7 +149,7 @@
+                result = max_state (result, STATE_WARNING);
+                printf ("%s", input_buffer);
+                if (strlen (output) == 0)
+-                       output = strdup (1 + index (input_buffer, ':'));
++                       output = strdup (1 + strchr (input_buffer, ':'));
+        }
+ 
+        (void) fclose (child_stderr);
diff --git a/web/attachments/121777-nagiosplug-cvs-check_hpjd.diff b/web/attachments/121777-nagiosplug-cvs-check_hpjd.diff
new file mode 100644
index 0000000..77d2699
--- /dev/null
+++ b/web/attachments/121777-nagiosplug-cvs-check_hpjd.diff
@@ -0,0 +1,332 @@
+diff -urN ./plugins/check_hpjd.c ../plugins/plugins/check_hpjd.c
+--- ./plugins/check_hpjd.c      2005-01-05 21:53:13.000000000 +0100
++++ ../plugins/plugins/check_hpjd.c     2005-02-18 13:02:58.000000000 +0100
+@@ -44,6 +44,7 @@
+ #define HPJD_GD_DOOR_OPEN          ".1.3.6.1.4.1.11.2.3.9.1.1.2.17"
+ #define HPJD_GD_PAPER_OUTPUT       ".1.3.6.1.4.1.11.2.3.9.1.1.2.19"
+ #define HPJD_GD_STATUS_DISPLAY     ".1.3.6.1.4.1.11.2.3.9.1.1.3"
++#define SNMP_VARS 12
+ 
+ #define ONLINE         0
+ #define OFFLINE                1
+@@ -61,23 +62,30 @@
+ {
+        char command_line[1024];
+        int result = STATE_UNKNOWN;
+-       int line;
++       int line, val = 0;
+        char input_buffer[MAX_INPUT_BUFFER];
+        char query_string[512];
+        char *errmsg;
+        char *temp_buffer;
+        int line_status = ONLINE;
+-       int paper_status = 0;
+-       int intervention_required = 0;
+-       int peripheral_error = 0;
+-       int paper_jam = 0;
+-       int paper_out = 0;
+-       int toner_low = 0;
+-       int page_punt = 0;
+-       int memory_out = 0;
+-       int door_open = 0;
+-       int paper_output = 0;
+-       char display_message[MAX_INPUT_BUFFER];
++       int errorflag = 0;      /* bitflag error tracker */
++       char *display_message;
++       char *errmsg_strings[11];
++       int i;
++
++       /* get the error messages. Will complain about discarded qualifiers
++        * with --disable-nls, but that doesn't matter since they're immutable */
++       errmsg_strings[0] = _("Paper Jam");
++       errmsg_strings[1] = _("Out of Paper");
++       errmsg_strings[2] = _("Printer Offline");
++       errmsg_strings[3] = _("Peripheral Error");
++       errmsg_strings[4] = _("Intervention Required");
++       errmsg_strings[5] = _("Toner Low");
++       errmsg_strings[6] = _("Insufficient Memory");
++       errmsg_strings[7] = _("A Door is Open");
++       errmsg_strings[8] = _("Output Tray is Full");
++       errmsg_strings[9] = _("Data too Slow for Engine");
++       errmsg_strings[10] = _("Unknown Paper Error");
+ 
+        errmsg = malloc(MAX_INPUT_BUFFER);
+ 
+@@ -90,9 +98,12 @@
+ 
+        /* removed ' 2>1' at end of command 10/27/1999 - EG */
+        /* create the query string */
++       /* get status display line first, so we can match line status against
++        * powersave as we parse it */
+        sprintf
+                (query_string,
+                 "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0",
++                HPJD_GD_STATUS_DISPLAY,
+                 HPJD_LINE_STATUS,
+                 HPJD_PAPER_STATUS,
+                 HPJD_INTERVENTION_REQUIRED,
+@@ -102,11 +113,11 @@
+                 HPJD_GD_TONER_LOW,
+                 HPJD_GD_PAGE_PUNT,
+                 HPJD_GD_MEMORY_OUT,
+-                HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
++                HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT);
+ 
+        /* get the command to run */
+-       sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community, 
+-                                                                       address, query_string);
++       sprintf (command_line, "%s -Oqa -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community,
++                address, query_string);
+ 
+        /* run the command */
+        child_process = spopen (command_line);
+@@ -117,170 +128,98 @@
+ 
+        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), command_line);
++               /* don't print newline here, or we might return OK while
++                * only printing an error message (highly confusing) */
++               printf (_("Could not open stderr for %s :: "), command_line);
+        }
+ 
+        result = STATE_OK;
+ 
+        line = 0;
++       /* end parsing when we have display_message, since we won't know
++        * what to do with line 13 or more anyway */
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++               /* strip the newline character from the end of the input, if any */
++               temp_buffer = strrchr(input_buffer, '\n');
++               if(temp_buffer) *temp_buffer = '\0';
++
++               if(line == 0) {
++                       display_message = strdup(input_buffer);
++                       continue;
++               }
++               val = (int)strtol(input_buffer, NULL, 0);
++               if(!val) continue; /* no errors here, so don't handle it */
++               errorflag |= 1 << (line - 1); /* set the error flag */
++
++               /* this switch statement is largely for adding additional
++                * exception handling (POWERSAVE and such) */
++               switch (line) {
++               case 1:         /* line status */
++                       /* clear the flag if it's powersaving */
++                       if(!strstr("POWERSAVE ON", display_message) != 0)
++                               errorflag ^= 1 << (line - 1);
++                       break;
+ 
+-               /* strip the newline character from the end of the input */
+-               if (input_buffer[strlen (input_buffer) - 1] == '\n')
+-                       input_buffer[strlen (input_buffer) - 1] = 0;
+-
+-               line++;
+-
+-               temp_buffer = strtok (input_buffer, "=");
+-               temp_buffer = strtok (NULL, "=");
+-
+-               if (temp_buffer == NULL) {
+-
+-                               result = STATE_UNKNOWN;
+-                               strcpy (errmsg, input_buffer);
+-
+-               } else {
+-
+-                       switch (line) {
+-
+-                       case 1:                                                                         /* 1st line should contain the line status */
+-                               line_status = atoi (temp_buffer);
+-                               break;
+-                       case 2:                                                                         /* 2nd line should contain the paper status */
+-                               paper_status = atoi (temp_buffer);
+-                               break;
+-                       case 3:                                                                         /* 3rd line should be intervention required */
+-                               intervention_required = atoi (temp_buffer);
+-                               break;
+-                       case 4:                                                                         /* 4th line should be peripheral error */
+-                               peripheral_error = atoi (temp_buffer);
+-                               break;
+-                       case 5:                                                                         /* 5th line should contain the paper jam status */
+-                               paper_jam = atoi (temp_buffer);
+-                               break;
+-                       case 6:                                                                         /* 6th line should contain the paper out status */
+-                               paper_out = atoi (temp_buffer);
+-                               break;
+-                       case 7:                                                                         /* 7th line should contain the toner low status */
+-                               toner_low = atoi (temp_buffer);
+-                               break;
+-                       case 8:                                                                         /* did data come too slow for engine */
+-                               page_punt = atoi (temp_buffer);
+-                               break;
+-                       case 9:                                                                         /* did we run out of memory */
+-                               memory_out = atoi (temp_buffer);
+-                               break;
+-                       case 10:                                                                                /* is there a door open */
+-                               door_open = atoi (temp_buffer);
+-                               break;
+-                       case 11:                                                                                /* is output tray full */
+-                               paper_output = atoi (temp_buffer);
+-                               break;
+-                       case 12:                                                                                /* display panel message */
+-                               strcpy (display_message, temp_buffer + 1);
+-                               break;
+-                       default:
+-                               break;
+-                       }
+-
++               case 2:         /* paper status */
++               case 3:         /* intervention required */
++               case 4:         /* peripheral error */
++               case 5:         /* paper jam */
++               case 6:         /* paper out */
++               case 7:         /* toner low */
++               case 8:         /* data came too slow for engine */
++               case 9:         /* out of memory */
++               case 10:        /* is there a door open */
++               case 11:        /* is output tray full */
++               default:        /* notreached */
++                       break;
+                }
+ 
+-               /* break out of the read loop if we encounter an error */
+-               if (result != STATE_OK)
++               if(++line >= SNMP_VARS)
+                        break;
+        }
+ 
+-       /* WARNING if output found on stderr */
+-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
++       /* WARNING if output found on stderr, but only if we
++        * haven't already found an error condition */
++       if (!errorflag && fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                result = max_state (result, STATE_WARNING);
+                /* remove CRLF */
+                if (input_buffer[strlen (input_buffer) - 1] == '\n')
+                        input_buffer[strlen (input_buffer) - 1] = 0;
+-               sprintf (errmsg, "%s", input_buffer );
+-
++               strncpy(errmsg, input_buffer, sizeof(errmsg));
+        }
+-       
++
+        /* close stderr */
+        (void) fclose (child_stderr);
+ 
+-       /* close the pipe */
++       /* close the pipe. set warning at least if snmpget didn't return 0 */
+        if (spclose (child_process))
+-               result = max_state (result, STATE_WARNING);
++               result = STATE_WARNING;
+ 
+        /* if there wasn't any output, display an error */
+        if (line == 0) {
+-
+-               /* might not be the problem, but most likely is. */
+-               result = STATE_UNKNOWN ;
+-               asprintf (&errmsg, "%s : Timeout from host %s\n", errmsg, address );
+-                
+-       }
+-
+-       /* if we had no read errors, check the printer status results... */
+-       if (result == STATE_OK) {
+-
+-               if (paper_jam) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Paper Jam"));
+-               }
+-               else if (paper_out) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Out of Paper"));
+-               }
+-               else if (line_status == OFFLINE) {
+-                       if (strcmp (errmsg, "POWERSAVE ON") != 0) {
+-                               result = STATE_WARNING;
+-                               strcpy (errmsg, _("Printer Offline"));
+-                       }
+-               }
+-               else if (peripheral_error) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Peripheral Error"));
+-               }
+-               else if (intervention_required) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Intervention Required"));
+-               }
+-               else if (toner_low) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Toner Low"));
+-               }
+-               else if (memory_out) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Insufficient Memory"));
+-               }
+-               else if (door_open) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("A Door is Open"));
+-               }
+-               else if (paper_output) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Output Tray is Full"));
+-               }
+-               else if (page_punt) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Data too Slow for Engine"));
+-               }
+-               else if (paper_status) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Unknown Paper Error"));
+-               }
++               /* timeout is not necessarily the problem, and produces wildly
++                * inaccurate error messages when it isn't, so just say
++                * the host didn't return anything and return immediately
++                * (old plugin unconditionally escalated STATE_UNKNOWN to
++                * STATE_CRITICAL at the end, so this just saves a bit of
++                * indentation. */
++               printf (_("%s : No data returned from %s\n"), errmsg, address );
++               return STATE_CRITICAL;
+        }
+ 
+-       if (result == STATE_OK)
++       /* obviously no read errors, so check the printer status results... */
++       if (!errors) {
++               result = STATE_OK;
+                printf (_("Printer ok - (%s)\n"), display_message);
+-
+-       else if (result == STATE_UNKNOWN) {
+-
+-               printf ("%s\n", errmsg);
+-
+-               /* if printer could not be reached, escalate to critical */
+-               if (strstr (errmsg, "Timeout"))
+-                       result = STATE_CRITICAL;
+        }
+-
+-       else if (result == STATE_WARNING)
+-               printf ("%s (%s)\n", errmsg, display_message);
++       else {
++               /* some error occured, so print them all */
++               while(i < SNMP_VARS) {
++                       printf ("%s (%s)\n", errmsg ? errmsg : "", display_message);
++                       if((errorflag >> i) & 1) /* only print if flag is set */
++                               printf(":: %s", errmsg_strings[i++]);
++               }
++       }
+ 
+        return result;
+ }
+@@ -346,12 +285,12 @@
+                        usage2 (_("Invalid hostname/address"), argv[c]);
+                }
+        }
+-       
++
+        if (community == NULL) {
+                if (argv[c] != NULL )
+                        community = argv[c];
+                else
+-                       community = strdup (DEFAULT_COMMUNITY);
++                       community = DEFAULT_COMMUNITY;
+        }
+ 
+        return validate_arguments ();
diff --git a/web/attachments/121778-nagiosplug-cvs-check_mysql-paranoia.diff b/web/attachments/121778-nagiosplug-cvs-check_mysql-paranoia.diff
new file mode 100644
index 0000000..6639e29
--- /dev/null
+++ b/web/attachments/121778-nagiosplug-cvs-check_mysql-paranoia.diff
@@ -0,0 +1,89 @@
+diff -urN ./plugins/check_mysql.c ../plugins/plugins/check_mysql.c
+--- ./plugins/check_mysql.c     2005-01-05 21:53:16.000000000 +0100
++++ ../plugins/plugins/check_mysql.c    2005-02-17 16:08:30.000000000 +0100
+@@ -155,7 +155,7 @@
+ int
+ process_arguments (int argc, char **argv)
+ {
+-       int c;
++       int c, i;
+ 
+        int option = 0;
+        static struct option longopts[] = {
+@@ -193,10 +193,19 @@
+                        db = optarg;
+                        break;
+                case 'u':                                                                       /* username */
+-                       db_user = optarg;
++                       if((db_user = strdup(optarg))) {
++                               for(i = 0; i < strlen(argv[optind]); i++) argv[optind][i] = 'x';
++                       }
++                       else
++                               db_user = optarg;
+                        break;
+                case 'p':                                                                       /* authentication information: password */
+-                       db_pass = optarg;
++                       if((db_pass = strdup(optarg))) {
++                               /* strdup was successful, so obscure passwd from ps view */
++                               for(i = 0; i < strlen(argv[optind]); i++) argv[optind][i] = 'x';
++                       }
++                       else /* strdup failed, so point it to password input string */
++                               db_pass = optarg;
+                        break;
+                case 'P':                                                                       /* critical time threshold */
+                        db_port = atoi (optarg);
+@@ -219,18 +228,27 @@
+ 
+        while ( argc > c ) {
+ 
+-               if (strlen(db_host) == 0)
++               if (db_host == NULL || strlen(db_host) == 0) {
+                        if (is_host (argv[c])) {
+                                db_host = argv[c++];
+                        }
+                        else {
+                                usage2 (_("Invalid hostname/address"), optarg);
+                        }
+-               else if (strlen(db_user) == 0)
+-                       db_user = argv[c++];
+-               else if (strlen(db_pass) == 0)
+-                       db_pass = argv[c++];
+-               else if (strlen(db) == 0)
++               }
++               else if (db_user == NULL || strlen(db_user) == 0) {
++                       if((db_user = strdup(argv[c++])))
++                               for(i = 0; i < strlen(argv[c]); i++) argv[c][i] = 'x';
++                       else
++                               db_user = argv[c];
++               }
++               else if (db_pass == NULL || strlen(db_pass) == 0) {
++                       if((db_pass = strdup(argv[c++])))
++                               for(i = 0; i < strlen(argv[c]); i++) argv[c][i] = 'x';
++                       else
++                               db_pass = argv[c];
++               }
++               else if (db == NULL || strlen(db) == 0)
+                        db = argv[c++];
+                else if (is_intnonneg (argv[c]))
+                        db_port = atoi (argv[c++]);
+@@ -246,16 +264,16 @@
+ validate_arguments (void)
+ {
+        if (db_user == NULL)
+-               db_user = strdup("");
++               db_user = "";
+ 
+        if (db_host == NULL)
+-               db_host = strdup("");
++               db_host = "";
+ 
+        if (db_pass == NULL)
+-               db_pass == strdup("");
++               db_pass == "";
+ 
+        if (db == NULL)
+-               db = strdup("");
++               db = "";
+ 
+        return OK;
+ }
diff --git a/web/attachments/121779-nagiosplug-cvs-check_snmp.diff b/web/attachments/121779-nagiosplug-cvs-check_snmp.diff
new file mode 100644
index 0000000..d2c1cde
--- /dev/null
+++ b/web/attachments/121779-nagiosplug-cvs-check_snmp.diff
@@ -0,0 +1,116 @@
+diff -urN ./plugins/check_snmp.c ../plugins/plugins/check_snmp.c
+--- ./plugins/check_snmp.c      2005-01-24 08:29:54.000000000 +0100
++++ ../plugins/plugins/check_snmp.c     2005-02-17 16:53:58.000000000 +0100
+@@ -36,6 +36,7 @@
+ #define DEFAULT_AUTH_PROTOCOL "MD5"
+ #define DEFAULT_DELIMITER "="
+ #define DEFAULT_OUTPUT_DELIMITER " "
++#define DEFAULT_SEC_LEVEL "noAuthNoPriv"
+ 
+ #define mark(a) ((a)!=0?"*":"")
+ 
+@@ -88,12 +89,12 @@
+ #endif
+ 
+ char *server_address = NULL;
+-char *community = NULL;
++char *community = DEFAULT_COMMUNITY;
+ char *authpriv = NULL;
+-char *proto = NULL;
+-char *seclevel = NULL;
++char *proto = DEFAULT_PROTOCOL;
++char *seclevel = DEFAULT_SEC_LEVEL;
+ char *secname = NULL;
+-char *authproto = NULL;
++char *authproto = DEFAULT_AUTH_PROTOCOL;
+ char *authpasswd = NULL;
+ char *privpasswd = NULL;
+ char *oid;
+@@ -147,15 +148,15 @@
+                eval_method[i] = CHECK_UNDEF;
+        i = 0;
+ 
+-       oid = strdup ("");
+-       label = strdup ("SNMP");
+-       units = strdup ("");
+-       port = strdup (DEFAULT_PORT);
+-       outbuff = strdup ("");
+-       output = strdup ("");
+-       delimiter = strdup (DEFAULT_DELIMITER);
+-       output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
+-       miblist = strdup (DEFAULT_MIBLIST);
++       oid = "";
++       label = "SNMP";
++       units = "";
++       port = DEFAULT_PORT;
++       outbuff = "";
++       output = "";
++       delimiter = DEFAULT_DELIMITER;
++       output_delim = DEFAULT_OUTPUT_DELIMITER;
++       miblist = DEFAULT_MIBLIST;
+        timeout_interval = DEFAULT_TIMEOUT;
+        retries = DEFAULT_RETRIES;
+ 
+@@ -598,9 +599,6 @@
+        if (server_address == NULL)
+                server_address = argv[optind];
+ 
+-       if (community == NULL)
+-               community = strdup (DEFAULT_COMMUNITY);
+-
+        return validate_arguments ();
+ }
+ 
+@@ -631,30 +629,28 @@
+ validate_arguments ()
+ {
+ 
+-       /* Need better checks to verify seclevel and authproto choices */
+-       
+-       if (seclevel == NULL) 
+-               asprintf (&seclevel, "noAuthNoPriv");
++       /* Need checks to verify seclevel and authproto choices */
+ 
++       /* default protocol is set in variable declaraion, so this can't
++        * possibly be NULL any-more. It can, however, be a zero length string
++        * (if a check_command is specified that can use either v1 or v2c, the
++        * $ARGx$ macro is quote-escaped and not given in service-description)
++        * in which case we don't fuss much about it but just set it to default */
++       if (!strlen(proto))
++               proto = DEFAULT_PROTOCOL;
+ 
+-       if (authproto == NULL ) 
+-               asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
+-       
+-        
+-       
+-       if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) {        /* default protocol version */
+-               asprintf(&proto, DEFAULT_PROTOCOL);
++       if (proto[0] == '1' || proto[0] == '2') {   /* community based access */
+                asprintf(&authpriv, "%s%s", "-c ", community);
+        }
+        else if ( strcmp (proto, "3") == 0 ) {                 /* snmpv3 args */
+-               asprintf(&proto, "%s", "3");
+-               
++               proto = "3";
++
+                if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) {
+-                       asprintf(&authpriv, "%s", "-l noAuthNoPriv" );
++                       asprintf(&authpriv, "%s %s", "-l", DEFAULT_SEC_LEVEL);
+                }
+                else if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+                        if ( secname == NULL || authpasswd == NULL) {
+-                               printf (_("Missing secname (%s) or authpassword (%s) ! \n"),secname, authpasswd );
++                               printf (_("Missing secname or authpassword!\n"));
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+                        }
+@@ -662,7 +658,7 @@
+                }
+                else if ( strcmp(seclevel, "authPriv") == 0 ) {
+                        if ( secname == NULL || authpasswd == NULL || privpasswd == NULL ) {
+-                               printf (_("Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"),secname, authpasswd,privpasswd );
++                               printf (_("Missing secname, authpassword or privpasswd!\n"));
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+                        }
diff --git a/web/attachments/121780-nagiosplug-cvs-check_tcp.diff b/web/attachments/121780-nagiosplug-cvs-check_tcp.diff
new file mode 100644
index 0000000..8f80d0e
--- /dev/null
+++ b/web/attachments/121780-nagiosplug-cvs-check_tcp.diff
@@ -0,0 +1,204 @@
+diff -urN ./plugins/check_tcp.c ../foo/plugins/check_tcp.c
+--- ./plugins/check_tcp.c       2005-01-05 21:53:20.000000000 +0100
++++ ../foo/plugins/check_tcp.c  2005-02-18 16:10:17.000000000 +0100
+@@ -114,138 +114,105 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       if (strstr (argv[0], "check_udp")) {
+-               progname = strdup ("check_udp");
+-               SERVICE = strdup ("UDP");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               QUIT = NULL;
++       progname = strrchr(argv[0], '/');
++       if(progname && strlen(progname) > 1) progname++;
++       else progname = argv[0];
++
++       /* determine service, if possible */
++       SERVICE = strrchr(progname, '_');
++       if(SERVICE && strlen(SERVICE) > 1) {
++               /* get a unique pointer and upcase it */
++               SERVICE++;
++               SERVICE = strdup(SERVICE);
++               for(i = 0; i < strlen(SERVICE); i++)
++                       SERVICE[i] = toupper(SERVICE[i]);
++       }
++       else SERVICE = "UNKNOWN SERVICE";
++
++       PROTOCOL = TCP_PROTOCOL; /* majority, so default */
++
++       if (!strncmp(SERVICE, "UDP", 3)) { /* strncmp to match check_udp2 also */
+                PROTOCOL = UDP_PROTOCOL;
+-               PORT = 0;
+        }
+-       else if (strstr (argv[0], "check_tcp")) {
+-               progname = strdup ("check_tcp");
+-               SERVICE = strdup ("TCP");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               QUIT = NULL;
+-               PROTOCOL = TCP_PROTOCOL;
+-               PORT = 0;
+-       }
+-       else if (strstr (argv[0], "check_ftp")) {
+-               progname = strdup ("check_ftp");
+-               SERVICE = strdup ("FTP");
+-               SEND = NULL;
+-               EXPECT = strdup ("220");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++       else if (!strcmp (SERVICE, "FTP")) {
++               EXPECT = "220";
++               QUIT = "QUIT\r\n";
+                PORT = 21;
+        }
+-       else if (strstr (argv[0], "check_smtp")) {
+-               progname = strdup ("check_smtp");
+-               SERVICE = strdup ("SMTP");
+-               SEND = NULL;
+-               EXPECT = strdup ("220");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++       else if (!strcmp (SERVICE, "SMTP")) {
++               EXPECT = "220";
++               QUIT = "QUIT\r\n";
+                PORT = 25;
+        }
+-       else if (strstr (argv[0], "check_pop")) {
+-               progname = strdup ("check_pop");
+-               SERVICE = strdup ("POP");
+-               SEND = NULL;
+-               EXPECT = strdup ("+OK");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++       else if (!strcmp (SERVICE, "POP")) {
+                PORT = 110;
+        }
+-       else if (strstr (argv[0], "check_imap")) {
+-               progname = strdup ("check_imap");
+-               SERVICE = strdup ("IMAP");
+-               SEND = NULL;
+-               EXPECT = strdup ("* OK");
+-               QUIT = strdup ("a1 LOGOUT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++       else if (!strcmp (SERVICE, "IMAP")) {
++               SERVICE = "IMAP";
+                PORT = 143;
+        }
+ #ifdef HAVE_SSL
+-       else if (strstr(argv[0],"check_simap")) {
+-               progname = strdup ("check_simap");
+-               SERVICE = strdup ("SIMAP");
+-               SEND=NULL;
+-               EXPECT = strdup ("* OK");
+-               QUIT = strdup ("a1 LOGOUT\r\n");
+-               PROTOCOL=TCP_PROTOCOL;
++       else if (!strcmp(SERVICE,"SIMAP")) {
++               SERVICE = "SIMAP";
+                use_ssl=TRUE;
+                PORT=993;
+        }
+-       else if (strstr(argv[0],"check_spop")) {
+-               progname = strdup ("check_spop");
+-               SERVICE = strdup ("SPOP");
+-               SEND=NULL;
+-               EXPECT = strdup ("+OK");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL=TCP_PROTOCOL;
++       else if (!strcmp(SERVICE,"SPOP")) {
+                use_ssl=TRUE;
+                PORT=995;
+        }
+-       else if (strstr(argv[0],"check_jabber")) {
+-               progname = strdup("check_jabber");
+-               SERVICE = strdup("JABBER");
+-               SEND = strdup("<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n");
+-               EXPECT = strdup("<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'");
+-               QUIT = strdup("</stream:stream>\n");
+-               PROTOCOL=TCP_PROTOCOL;
++       else if (!strcmp(SERVICE, "JABBER")) {
++               SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
++               EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
++               QUIT = "</stream:stream>\n";
+                use_ssl=TRUE;
+                PORT = 5222;
+        }
+-       else if (strstr (argv[0], "check_nntps")) {
+-               progname = strdup("check_nntps");
+-               SERVICE = strdup("NNTPS");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               server_expect = realloc (server_expect, ++server_expect_count);
+-               asprintf (&server_expect[server_expect_count - 1], "200");
+-               server_expect = realloc (server_expect, ++server_expect_count);
+-               asprintf (&server_expect[server_expect_count - 1], "201");
+-               QUIT = strdup("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++       else if (!strcmp (SERVICE, "NNTPS")) {
+                use_ssl=TRUE;
+                PORT = 563;
+-}
+-
++       }
+ #endif
+-       else if (strstr (argv[0], "check_nntp")) {
+-               progname = strdup ("check_nntp");
+-               SERVICE = strdup ("NNTP");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
+-               asprintf (&server_expect[server_expect_count - 1], "200");
+-               server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
+-               asprintf (&server_expect[server_expect_count - 1], "201");
+-               asprintf (&QUIT, "QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++       else if (!strcmp (SERVICE, "NNTP")) {
+                PORT = 119;
+        }
+-       else {
+-               progname = strdup ("check_tcp");
++       else if (strncmp(SERVICE, "TCP", 3)) {
++               /* match if NOT called as check_tcp */
+                usage (_("CRITICAL - Generic check_tcp called with unknown service\n"));
+        }
+ 
+-       server_address = strdup ("127.0.0.1");
++
++       /* SSL and plaintext counterparts set here to avoid duplicate code
++        * (OSI layer 7 stuff here, layer 3-4 goes above unless protocol doesn't
++        * support SSL, in which case we bundle it above to save LOC count */
++       if(!strncmp(SERVICE, "NTTP") || !strcmp(SERVICE, "NNTPS")) {
++               server_expect = realloc (server_expect, sizeof(char *) * (server_expect_count + 2));
++               server_expect[server_expect_count++] = "200";
++               server_expect[server_expect_count++] = "201";
++               QUIT = "QUIT\r\n";
++       }
++       else if(!strcmp(SERVICE, "IMAP") || !strcmp(SERVICE, "SIMAP")) {
++               EXPECT = "* OK";
++               QUIT = "a1 LOGOUT\r\n";
++       }
++       else if(!strcmp(SERVICE, "POP") || !strcmp(SERVICE, "SPOP")) {
++               EXPECT = "+OK";
++               QUIT = "QUIT\r\n";
++       }
++
++       server_address = "127.0.0.1";
+        server_port = PORT;
+        server_send = SEND;
+        server_quit = QUIT;
+-       status = strdup ("");
++       status = "";
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+        /* use default expect if none listed in process_arguments() */
+        if (EXPECT && server_expect_count == 0) {
+-               server_expect = malloc (sizeof (char *) * (++server_expect_count));
+-               server_expect[server_expect_count - 1] = EXPECT;
++               server_expect = malloc (sizeof (char *));
++               server_expect[server_expect_count++] = EXPECT;
+        }
+ 
+        /* initialize alarm signal handling */
diff --git a/web/attachments/121781-nagiosplug-cvs-netutils-wrappers.diff b/web/attachments/121781-nagiosplug-cvs-netutils-wrappers.diff
new file mode 100644
index 0000000..de98a26
--- /dev/null
+++ b/web/attachments/121781-nagiosplug-cvs-netutils-wrappers.diff
@@ -0,0 +1,59 @@
+diff -urN ./plugins/netutils.c ../foo/plugins/netutils.c
+--- ./plugins/netutils.c        2005-02-18 14:59:29.000000000 +0100
++++ ../foo/plugins/netutils.c   2005-02-18 16:12:35.000000000 +0100
+@@ -64,12 +64,8 @@
+ process_tcp_request (const char *server_address, int server_port,
+        const char *send_buffer, char *recv_buffer, int recv_size)
+ {
+-       int result;
+-
+-       result = process_request (server_address, server_port,
+-                       IPPROTO_TCP, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
++       return process_request (server_address, server_port, IPPROTO_TCP,
++                               send_buffer, recv_buffer, recv_size);
+ }
+ 
+ 
+@@ -79,12 +75,8 @@
+ process_udp_request (const char *server_address, int server_port,
+        const char *send_buffer, char *recv_buffer, int recv_size)
+ {
+-       int result;
+-
+-       result = process_request (server_address, server_port,
+-                       IPPROTO_UDP, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
++       return process_request (server_address, server_port, IPPROTO_UDP,
++                               send_buffer, recv_buffer, recv_size);
+ }
+ 
+ 
+@@ -195,11 +187,7 @@
+ int
+ my_tcp_connect (const char *host_name, int port, int *sd)
+ {
+-       int result;
+-
+-       result = my_connect (host_name, port, sd, IPPROTO_TCP);
+-
+-       return result;
++       return my_connect (host_name, port, sd, IPPROTO_TCP);
+ }
+ 
+ 
+@@ -207,11 +195,7 @@
+ int
+ my_udp_connect (const char *host_name, int port, int *sd)
+ {
+-       int result;
+-
+-       result = my_connect (host_name, port, sd, IPPROTO_UDP);
+-
+-       return result;
++       return my_connect (host_name, port, sd, IPPROTO_UDP);
+ }
+ 
+ 
diff --git a/web/attachments/121782-nagiosplug-cvs-perl-uselib.diff b/web/attachments/121782-nagiosplug-cvs-perl-uselib.diff
new file mode 100644
index 0000000..24e128b
--- /dev/null
+++ b/web/attachments/121782-nagiosplug-cvs-perl-uselib.diff
@@ -0,0 +1,24 @@
+diff -urN ./plugins-scripts/check_file_age.pl ../plugins/plugins-scripts/check_file_age.pl
+--- ./plugins-scripts/check_file_age.pl 2003-10-21 17:56:35.000000000 +0200
++++ ../plugins/plugins-scripts/check_file_age.pl        2005-02-18 13:08:06.000000000 +0100
+@@ -27,7 +27,7 @@
+ use Getopt::Long;
+ use File::stat;
+ use vars qw($PROGNAME);
+-use lib ".";
++use lib utils.pm;
+ use utils qw (%ERRORS &print_revision &support);
+ 
+ sub print_help ();
+diff -urN ./plugins-scripts/check_mssql.pl ../plugins/plugins-scripts/check_mssql.pl
+--- ./plugins-scripts/check_mssql.pl    2004-04-19 15:10:48.000000000 +0200
++++ ../plugins/plugins-scripts/check_mssql.pl   2005-02-18 13:08:13.000000000 +0100
+@@ -30,7 +30,7 @@
+ use DBI;
+ use DBD::Sybase;
+ use Getopt::Long;
+-use lib ".";
++use lib utils.pm;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support);
+ use strict;
+ 
diff --git a/web/attachments/121783-nagiosplug-cvs-progname.diff b/web/attachments/121783-nagiosplug-cvs-progname.diff
new file mode 100644
index 0000000..8663049
--- /dev/null
+++ b/web/attachments/121783-nagiosplug-cvs-progname.diff
@@ -0,0 +1,25 @@
+diff -urN ./plugins/check_ldap.c ../plugins/plugins/check_ldap.c
+--- ./plugins/check_ldap.c      2005-01-05 21:53:15.000000000 +0100
++++ ../plugins/plugins/check_ldap.c     2005-02-17 15:37:46.000000000 +0100
+@@ -19,7 +19,7 @@
+ ******************************************************************************/
+ 
+ /* progname may be check_ldaps */
+-char *progname = "check_ldap";
++char *progname;
+ const char *revision = "$Revision: 1.30 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+@@ -84,9 +84,9 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       if (strstr(argv[0],"check_ldaps")) {
+-               asprintf (&progname, "check_ldaps");
+-       }
++       progname = strrchr(argv[0], '/');
++       if(progname && strlen(progname > 1)) progname++;
++       else progname = argv[0];
+        
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
diff --git a/web/attachments/121784-nagiosplug-cvs-silly.diff b/web/attachments/121784-nagiosplug-cvs-silly.diff
new file mode 100644
index 0000000..a518e81
--- /dev/null
+++ b/web/attachments/121784-nagiosplug-cvs-silly.diff
@@ -0,0 +1,806 @@
+diff -urN ./plugins/check_by_ssh.c ../plugins/plugins/check_by_ssh.c
+--- ./plugins/check_by_ssh.c    2005-01-05 21:53:11.000000000 +0100
++++ ../plugins/plugins/check_by_ssh.c   2005-02-17 13:19:35.000000000 +0100
+@@ -59,9 +59,9 @@
+        time_t local_time;
+        FILE *fp = NULL;
+ 
+-       remotecmd = strdup ("");
+-       comm = strdup (SSH_COMMAND);
+-       result_text = strdup ("");
++       remotecmd = "";
++       comm = SSH_COMMAND;
++       result_text = "";
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -137,7 +137,7 @@
+                                printf ("%s", result_text);
+                                return result;
+                        }
+-                       asprintf (&output, "%s", result_text);
++                       output = result_text;
+                        result_text = strnl (status_text);
+                        eol = strpbrk (output, "\r\n");
+                        if (eol != NULL)
+diff -urN ./plugins/check_dig.c ../plugins/plugins/check_dig.c
+--- ./plugins/check_dig.c       2005-01-28 15:00:58.000000000 +0100
++++ ../plugins/plugins/check_dig.c      2005-02-17 13:55:05.000000000 +0100
+@@ -59,7 +59,7 @@
+        double elapsed_time;
+        int result = STATE_UNKNOWN;
+ 
+-       output = strdup ("");
++       output = "";
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -293,7 +293,7 @@
+                        }
+                }
+                else {
+-                       dns_server = strdup ("127.0.0.1");
++                       dns_server = "127.0.0.1";
+                }
+        }
+ 
+diff -urN ./plugins/check_disk.c ../plugins/plugins/check_disk.c
+--- ./plugins/check_disk.c      2005-01-05 21:53:12.000000000 +0100
++++ ../plugins/plugins/check_disk.c     2005-02-17 13:12:09.000000000 +0100
+@@ -153,9 +153,9 @@
+        struct fs_usage fsp;
+        struct name_list *temp_list;
+ 
+-       output = strdup (" - free space:");
+-       details = strdup ("");
+-       perf = strdup ("");
++       output = " - free space:";
++       details = "";
++       perf = "";
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -283,7 +283,7 @@
+                return ERROR;
+ 
+        se = (struct name_list *) malloc (sizeof (struct name_list));
+-       se->name = strdup ("iso9660");
++       se->name = "iso9660";
+        se->name_next = NULL;
+        *fstail = se;
+        fstail = &se->name_next;
+@@ -346,19 +346,19 @@
+                                free(units);
+                        if (! strcmp (optarg, "bytes")) {
+                                mult = (uintmax_t)1;
+-                               units = strdup ("B");
++                               units = "B";
+                        } else if (! strcmp (optarg, "kB")) {
+                                mult = (uintmax_t)1024;
+-                               units = strdup ("kB");
++                               units = "kB";
+                        } else if (! strcmp (optarg, "MB")) {
+                                mult = (uintmax_t)1024 * 1024;
+-                               units = strdup ("MB");
++                               units = "MB";
+                        } else if (! strcmp (optarg, "GB")) {
+                                mult = (uintmax_t)1024 * 1024 * 1024;
+-                               units = strdup ("GB");
++                               units = "GB";
+                        } else if (! strcmp (optarg, "TB")) {
+                                mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
+-                               units = strdup ("TB");
++                               units = "TB";
+                        } else {
+                                die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+                        }
+@@ -369,13 +369,13 @@
+                        mult = 1024;
+                        if (units)
+                                free(units);
+-                       units = strdup ("kB");
++                       units = "kB";
+                        break;
+                case 'm': /* display mountpoint */
+                        mult = 1024 * 1024;
+                        if (units)
+                                free(units);
+-                       units = strdup ("MB");
++                       units = "MB";
+                        break;
+                case 'l':
+                        show_local_fs = 1;                      
+@@ -518,7 +518,7 @@
+        }
+        
+        if (units == NULL) {
+-               units = strdup ("MB");
++               units = "MB";
+                mult = (uintmax_t)1024 * 1024;
+        }
+        return OK;
+diff -urN ./plugins/check_game.c ../plugins/plugins/check_game.c
+--- ./plugins/check_game.c      2005-01-05 21:53:13.000000000 +0100
++++ ../plugins/plugins/check_game.c     2005-02-17 13:12:09.000000000 +0100
+@@ -110,7 +110,7 @@
+ 
+        /* initialize the returned data buffer */
+        for (i = 0; i < QSTAT_MAX_RETURN_ARGS; i++)
+-               ret[i] = strdup("");
++               ret[i] = "";
+ 
+        i = 0;
+        p = (char *) strtok (input_buffer, QSTAT_DATA_DELIMITER);
+diff -urN ./plugins/check_http.c ../plugins/plugins/check_http.c
+--- ./plugins/check_http.c      2005-01-24 08:29:53.000000000 +0100
++++ ../plugins/plugins/check_http.c     2005-02-17 15:34:59.000000000 +0100
+@@ -60,7 +60,6 @@
+ #ifdef HAVE_SSL
+ int check_cert = FALSE;
+ int days_till_exp;
+-char *randbuff;
+ SSL_CTX *ctx;
+ SSL *ssl;
+ X509 *server_cert;
+@@ -357,7 +356,7 @@
+                        break;
+                case 'P': /* HTTP POST data in URL encoded format */
+                        if (http_method || http_post_data) break;
+-                       http_method = strdup("POST");
++                       http_method = "POST";
+                        http_post_data = strdup (optarg);
+                        break;
+                case 's': /* string or substring */
+@@ -473,7 +472,7 @@
+                socket_timeout = (int)critical_time + 1;
+ 
+        if (http_method == NULL)
+-               http_method = strdup ("GET");
++               http_method = "GET";
+ 
+        return TRUE;
+ }
+@@ -869,7 +868,7 @@
+ #endif
+ 
+        /* fetch the page */
+-       full_page = strdup("");
++       full_page = "";
+        while ((i = my_recv ()) > 0) {
+                buffer[i] = '\0';
+                asprintf (&full_page, "%s%s", full_page, buffer);
+@@ -1250,8 +1249,9 @@
+ int connect_SSL (void)
+ {
+        SSL_METHOD *meth;
+-
+-       asprintf (&randbuff, "%s", "qwertyuiopasdfghjklqwertyuiopasdfghjkl");
++       char *randbuff;
++       
++       randbuff = "qwertyuiopasdfghjklqwertyuiopasdfghjkl";
+        RAND_seed (randbuff, (int)strlen(randbuff));
+        if (verbose)
+                printf(_("SSL seeding: %s\n"), (RAND_status()==1 ? _("OK") : _("Failed")) );
+diff -urN ./plugins/check_mrtg.c ../plugins/plugins/check_mrtg.c
+--- ./plugins/check_mrtg.c      2005-01-05 21:53:15.000000000 +0100
++++ ../plugins/plugins/check_mrtg.c     2005-02-17 15:58:02.000000000 +0100
+@@ -113,7 +113,7 @@
+        /* if we couldn't read enough data, return an unknown error */
+        if (line <= 2) {
+                result = STATE_UNKNOWN;
+-               asprintf (&message, _("Unable to process MRTG log file\n"));
++               message = _("Unable to process MRTG log file\n");
+        }
+ 
+        /* make sure the MRTG data isn't too old */
+@@ -122,8 +122,8 @@
+                if (expire_minutes > 0
+                                && (current_time - timestamp) > (expire_minutes * 60)) {
+                        result = STATE_WARNING;
+-                       asprintf (&message, _("MRTG data has expired (%d minutes old)\n"),
+-                                                        (int) ((current_time - timestamp) / 60));
++                       message = _("MRTG data has expired (%d minutes old)\n"),
++                                  (int) ((current_time - timestamp) / 60));
+                }
+        }
+ 
+@@ -294,10 +294,10 @@
+                usage4 (_("You must supply the variable number"));
+ 
+        if (label == NULL)
+-               label = strdup ("value");
++               label = "value";
+ 
+        if (units == NULL)
+-               units = strdup ("");
++               units = "";
+ 
+        return OK;
+ }
+diff -urN ./plugins/check_nt.c ../plugins/plugins/check_nt.c
+--- ./plugins/check_nt.c        2005-02-17 13:01:02.000000000 +0100
++++ ../plugins/plugins/check_nt.c       2005-02-17 16:18:53.000000000 +0100
+@@ -153,7 +153,7 @@
+                        /* -l parameters is present with only integers */
+                        return_code=STATE_OK;
+                        temp_string = strdup (_("CPU Load"));
+-                       temp_string_perf = strdup (" ");
++                       temp_string_perf = " ";
+       
+                        /* loop until one of the parameters is wrong or not present */
+                        while (lvalue_list[0+offset]> (unsigned long)0 &&
+@@ -327,7 +327,7 @@
+                        asprintf (&output_message, "%.f", counter_value);
+                        else if (isPercent)
+                             {  
+-                               counter_unit = strdup ("%");
++                               counter_unit = "%";
+                                allRight = TRUE;
+                             }
+ 
+diff -urN ./plugins/check_nwstat.c ../plugins/plugins/check_nwstat.c
+--- ./plugins/check_nwstat.c    2005-01-05 21:53:17.000000000 +0100
++++ ../plugins/plugins/check_nwstat.c   2005-02-17 16:24:36.000000000 +0100
+@@ -135,18 +135,18 @@
+ 
+        /* get OS version string */
+        if (check_netware_version==TRUE) {
+-               send_buffer = strdup ("S19\r\n");
++               send_buffer = "S19\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+                if (!strcmp(recv_buffer,"-1\n"))
+-                       netware_version = strdup("");
++                       netware_version = "";
+                else {
+                        recv_buffer[strlen(recv_buffer)-1]=0;
+                        asprintf (&netware_version,_("NetWare %s: "),recv_buffer);
+                }
+        } else
+-               netware_version = strdup("");
++               netware_version = "";
+ 
+ 
+        /* check CPU load */
+@@ -154,13 +154,13 @@
+                        
+                switch(vars_to_check) {
+                case LOAD1:
+-                       temp_buffer = strdup ("1");
++                       temp_buffer = "1";
+                        break;
+                case LOAD5:
+-                       temp_buffer = strdup ("5");
++                       temp_buffer = "5";
+                        break;
+                default:
+-                       temp_buffer = strdup ("15");
++                       temp_buffer = "15";
+                        break;
+                }
+ 
+@@ -169,7 +169,7 @@
+                if (result!=STATE_OK)
+                        return result;
+                utilization=strtoul(recv_buffer,NULL,10);
+-               send_buffer = strdup ("UPTIME\r\n");
++               send_buffer = "UPTIME\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -191,7 +191,7 @@
+                /* check number of user connections */
+        } else if (vars_to_check==CONNS) {
+ 
+-               send_buffer = strdup ("CONNECT\r\n");
++               send_buffer = "CONNECT\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -210,7 +210,7 @@
+                /* check % long term cache hits */
+        } else if (vars_to_check==LTCH) {
+ 
+-               send_buffer = strdup ("S1\r\n");
++               send_buffer = "S1\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -229,7 +229,7 @@
+                /* check cache buffers */
+        } else if (vars_to_check==CBUFF) {
+ 
+-               send_buffer = strdup ("S2\r\n");
++               send_buffer = "S2\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -248,7 +248,7 @@
+                /* check dirty cache buffers */
+        } else if (vars_to_check==CDBUFF) {
+ 
+-               send_buffer = strdup ("S3\r\n");
++               send_buffer = "S3\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -267,7 +267,7 @@
+                /* check LRU sitting time in minutes */
+        } else if (vars_to_check==LRUM) {
+ 
+-               send_buffer = strdup ("S5\r\n");
++               send_buffer = "S5\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -344,7 +344,7 @@
+                /* check to see if DS Database is open or closed */
+        } else if (vars_to_check==DSDB) {
+ 
+-               send_buffer = strdup ("S11\r\n");
++               send_buffer = "S11\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -353,7 +353,7 @@
+                else
+                        result=STATE_WARNING;
+  
+-               send_buffer = strdup ("S13\r\n");
++               send_buffer = "S13\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                temp_buffer=strtok(recv_buffer,"\r\n");
+  
+@@ -362,7 +362,7 @@
+                /* check to see if logins are enabled */
+        } else if (vars_to_check==LOGINS) {
+ 
+-               send_buffer = strdup ("S12\r\n");
++               send_buffer = "S12\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -617,7 +617,7 @@
+                /* check LRU sitting time in secondss */
+        } else if (vars_to_check==LRUS) {
+ 
+-               send_buffer = strdup ("S4\r\n");
++               send_buffer = "S4\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -633,7 +633,7 @@
+                /* check % dirty cacheobuffers as a percentage of the total*/
+        } else if (vars_to_check==DCB) {
+ 
+-               send_buffer = strdup ("S6\r\n");
++               send_buffer = "S6\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -648,7 +648,7 @@
+                /* check % total cache buffers as a percentage of the original*/
+        } else if (vars_to_check==TCB) {
+ 
+-               send_buffer = strdup ("S7\r\n");
++               send_buffer = "S7\r\n";
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -695,7 +695,7 @@
+ 
+        } else {
+ 
+-               output_message = strdup (_("Nothing to check!\n"));
++               output_message = _("Nothing to check!\n");
+                result=STATE_UNKNOWN;
+ 
+        }
+@@ -806,15 +806,15 @@
+                                        vars_to_check=LRUS;
+                                else if (strncmp(optarg,"VPF",3)==0) {
+                                        vars_to_check=VPF;
+-                                       volume_name = strdup (optarg+3);
++                                       volume_name = optarg+3;
+                                        if (!strcmp(volume_name,""))
+-                                               volume_name = strdup ("SYS");
++                                               volume_name = "SYS";
+                                }
+                                else if (strncmp(optarg,"VKF",3)==0) {
+                                        vars_to_check=VKF;
+-                                       volume_name = strdup (optarg+3);
++                                       volume_name = optarg+3;
+                                        if (!strcmp(volume_name,""))
+-                                               volume_name = strdup ("SYS");
++                                               volume_name = "SYS";
+                                }
+                                else if (!strcmp(optarg,"DSDB"))
+                                        vars_to_check=DSDB;
+@@ -835,27 +835,27 @@
+                                        vars_to_check=OFILES;
+                                else if (strncmp(optarg,"VKP",3)==0) {
+                                        vars_to_check=VKP;
+-                                       volume_name = strdup (optarg+3);
++                                       volume_name = optarg+3;
+                                        if (!strcmp(volume_name,""))
+-                                               volume_name = strdup ("SYS");
++                                               volume_name = "SYS";
+                                }
+                                else if (strncmp(optarg,"VPP",3)==0) {
+                                        vars_to_check=VPP;
+-                                       volume_name = strdup (optarg+3);
++                                       volume_name = optarg+3;
+                                        if (!strcmp(volume_name,""))
+-                                               volume_name = strdup ("SYS");
++                                               volume_name = "SYS";
+                                }
+                                else if (strncmp(optarg,"VKNP",4)==0) {
+                                        vars_to_check=VKNP;
+-                                       volume_name = strdup (optarg+4);
++                                       volume_name = optarg+4;
+                                        if (!strcmp(volume_name,""))
+-                                               volume_name = strdup ("SYS");
++                                               volume_name = "SYS";
+                                }
+                                else if (strncmp(optarg,"VPNP",4)==0) {
+                                        vars_to_check=VPNP;
+-                                       volume_name = strdup (optarg+4);
++                                       volume_name = optarg+4;
+                                        if (!strcmp(volume_name,""))
+-                                               volume_name = strdup("SYS");
++                                               volume_name = "SYS";
+                                }
+                                else if (!strcmp(optarg,"ABENDS"))
+                                        vars_to_check=ABENDS;
+@@ -869,7 +869,7 @@
+                                        vars_to_check=UPTIME;
+                                else if (strncmp(optarg,"NLM:",4)==0) {
+                                        vars_to_check=NLM;
+-                                       nlm_name=strdup (optarg+4);
++                                       nlm_name = optarg+4;
+                                }
+                                else
+                                        return ERROR;
+diff -urN ./plugins/check_ping.c ../plugins/plugins/check_ping.c
+--- ./plugins/check_ping.c      2005-01-05 21:53:17.000000000 +0100
++++ ../plugins/plugins/check_ping.c     2005-02-17 16:29:41.000000000 +0100
+@@ -93,11 +93,11 @@
+                
+ #ifdef PING6_COMMAND
+                if (is_inet6_addr(addresses[i]) && address_family != AF_INET)
+-                       rawcmd = strdup(PING6_COMMAND);
++                       rawcmd = PING6_COMMAND;
+                else
+-                       rawcmd = strdup(PING_COMMAND);
++                       rawcmd = PING_COMMAND;
+ #else
+-               rawcmd = strdup(PING_COMMAND);
++               rawcmd = PING_COMMAND;
+ #endif
+ 
+                /* does the host address of number of packets argument come first? */
+@@ -452,7 +452,7 @@
+                result = max_state (result, STATE_WARNING);
+ 
+        if (warn_text == NULL)
+-               warn_text = strdup("");
++               warn_text = "";
+ 
+        return result;
+ }
+@@ -473,7 +473,7 @@
+ 
+        if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
+                if (warn_text == NULL)
+-                       warn_text = strdup (_(WARN_DUPLICATES));
++                       warn_text = _(WARN_DUPLICATES);
+                else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
+                         asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
+                        die (STATE_UNKNOWN, _("Unable to realloc warn_text"));
+diff -urN ./plugins/check_procs.c ../plugins/plugins/check_procs.c
+--- ./plugins/check_procs.c     2005-01-05 21:53:18.000000000 +0100
++++ ../plugins/plugins/check_procs.c    2005-02-17 16:35:49.000000000 +0100
+@@ -117,7 +117,7 @@
+        input_buffer = malloc (MAX_INPUT_BUFFER);
+        procprog = malloc (MAX_INPUT_BUFFER);
+ 
+-       asprintf (&metric_name, "PROCS");
++       metric_name = "PROCS";
+        metric = METRIC_PROCS;
+ 
+        if (process_arguments (argc, argv) == ERROR)
+@@ -147,8 +147,8 @@
+        while ( input_buffer[strlen(input_buffer)-1] != '\n' )
+                fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+ 
++       input_line = "";
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               asprintf (&input_line, "%s", input_buffer);
+                while ( input_buffer[strlen(input_buffer)-1] != '\n' ) {
+                        fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+                        asprintf (&input_line, "%s%s", input_line, input_buffer);
+@@ -157,8 +157,8 @@
+                if (verbose >= 3)
+                        printf ("%s", input_line);
+ 
+-               strcpy (procprog, "");
+-               asprintf (&procargs, "%s", "");
++               *procprog = '\x0';
++               procargs = "";
+ 
+                cols = sscanf (input_line, PS_FORMAT, PS_VARLIST);
+ 
+@@ -493,7 +493,7 @@
+        if (cmax == -1 && argv[c])
+                cmax = atoi (argv[c++]);
+        if (statopts == NULL && argv[c]) {
+-               asprintf (&statopts, "%s", argv[c++]);
++               statopts = argv[c++];
+                asprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts);
+                options |= STAT;
+        }
+@@ -531,19 +531,19 @@
+                options = ALL;
+ 
+        if (statopts==NULL)
+-               statopts = strdup("");
++               statopts = "";
+ 
+        if (prog==NULL)
+-               prog = strdup("");
++               prog = "";
+ 
+        if (args==NULL)
+-               args = strdup("");
++               args = "";
+ 
+        if (fmt==NULL)
+-               fmt = strdup("");
++               fmt = "";
+ 
+        if (fails==NULL)
+-               fails = strdup("");
++               fails = "";
+ 
+        return options;
+ }
+diff -urN ./plugins/check_radius.c ../plugins/plugins/check_radius.c
+--- ./plugins/check_radius.c    2005-01-05 21:53:18.000000000 +0100
++++ ../plugins/plugins/check_radius.c   2005-02-17 13:12:10.000000000 +0100
+@@ -116,7 +116,7 @@
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+-       str = strdup ("dictionary");
++       str = "dictionary";
+        if ((config_file && rc_read_config (config_file)) ||
+                        rc_read_dictionary (rc_conf_str (str)))
+                die (STATE_UNKNOWN, _("Config file error"));
+diff -urN ./plugins/check_real.c ../plugins/plugins/check_real.c
+--- ./plugins/check_real.c      2005-01-05 21:53:18.000000000 +0100
++++ ../plugins/plugins/check_real.c     2005-02-17 16:36:39.000000000 +0100
+@@ -369,7 +369,7 @@
+                usage4 (_("You must provide a server to check"));
+ 
+        if (host_name==NULL)
+-               host_name = strdup (server_address);
++               host_name = server_address;
+ 
+        if (server_expect == NULL)
+                server_expect = strdup(EXPECT);
+diff -urN ./plugins/check_smtp.c ../plugins/plugins/check_smtp.c
+--- ./plugins/check_smtp.c      2005-01-05 21:53:18.000000000 +0100
++++ ../plugins/plugins/check_smtp.c     2005-02-17 16:38:24.000000000 +0100
+@@ -486,18 +486,18 @@
+                                usage2 (_("Invalid hostname/address"), argv[c]);
+                }
+                else {
+-                       asprintf (&server_address, "127.0.0.1");
++                       server_address = "127.0.0.1";
+                }
+        }
+ 
+        if (server_expect == NULL)
+-               server_expect = strdup (SMTP_EXPECT);
++               server_expect = SMTP_EXPECT;
+ 
+        if (mail_command == NULL)
+-               mail_command = strdup("MAIL ");
++               mail_command = "MAIL ";
+ 
+        if (from_arg==NULL)
+-               from_arg = strdup(" ");
++               from_arg = " ";
+ 
+        return validate_arguments ();
+ }
+diff -urN ./plugins/check_swap.c ../plugins/plugins/check_swap.c
+--- ./plugins/check_swap.c      2005-01-24 08:29:54.000000000 +0100
++++ ../plugins/plugins/check_swap.c     2005-02-17 16:56:09.000000000 +0100
+@@ -85,9 +85,9 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       status = strdup ("");
+-       tmp_status = strdup ("");
+-       perf = strdup ("");
++       status = "";
++       tmp_status = "";
++       perf = "";
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+@@ -128,15 +128,15 @@
+        free_swap = dskfree;
+ #else
+ # ifdef HAVE_SWAP
+-       asprintf(&swap_command, "%s", SWAP_COMMAND);
+-       asprintf(&swap_format, "%s", SWAP_FORMAT);
++       swap_command = SWAP_COMMAND;
++       swap_format = SWAP_FORMAT;
+ 
+ /* These override the command used if a summary (and thus ! allswaps) is required */
+ /* The summary flag returns more accurate information about swap usage on these OSes */
+ #  ifdef _AIX
+        if (!allswaps) {
+-               asprintf(&swap_command, "%s", "/usr/sbin/lsps -s");
+-               asprintf(&swap_format, "%s", "%f%*s %f");
++               swap_command = "/usr/sbin/lsps -s";
++               swap_format = "%f%*s %f";
+                conv_factor = 1;
+        }
+ #  endif
+diff -urN ./plugins/check_udp.c ../plugins/plugins/check_udp.c
+--- ./plugins/check_udp.c       2005-01-05 21:53:21.000000000 +0100
++++ ../plugins/plugins/check_udp.c      2005-02-17 13:12:10.000000000 +0100
+@@ -207,7 +207,7 @@
+                usage4 (_("Hostname was not supplied"));
+ 
+        if (server_send == NULL)
+-               server_send = strdup("");
++               server_send = "";
+ 
+        return c;
+ }
+diff -urN ./plugins/check_ups.c ../plugins/plugins/check_ups.c
+--- ./plugins/check_ups.c       2005-01-05 21:53:22.000000000 +0100
++++ ../plugins/plugins/check_ups.c      2005-02-17 18:21:59.000000000 +0100
+@@ -106,9 +106,9 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       ups_status = strdup ("N/A");
+-       data = strdup ("");
+-       message = strdup ("");
++       ups_status = "N/A";
++       data = "";
++       message = "";
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+@@ -124,16 +124,16 @@
+                return STATE_CRITICAL;
+        if (supported_options & UPS_STATUS) {
+ 
+-               ups_status = strdup ("");
++               ups_status = "";
+                result = STATE_OK;
+ 
+                if (status & UPSSTATUS_OFF) {
+-                       asprintf (&ups_status, "Off");
++                       ups_status = "Off";
+                        result = STATE_CRITICAL;
+                }
+                else if ((status & (UPSSTATUS_OB | UPSSTATUS_LB)) ==
+                                                 (UPSSTATUS_OB | UPSSTATUS_LB)) {
+-                       asprintf (&ups_status, _("On Battery, Low Battery"));
++                       ups_status = _("On Battery, Low Battery");
+                        result = STATE_CRITICAL;
+                }
+                else {
+@@ -203,15 +203,13 @@
+                        else if (check_warn==TRUE && ups_utility_deviation>=warning_value) {
+                                result = max_state (result, STATE_WARNING);
+                        }
+-                       asprintf (&data, "%s",
+-                                 perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
+-                                           check_warn, (long)(1000*warning_value),
+-                                           check_crit, (long)(1000*critical_value),
+-                                           TRUE, 0, FALSE, 0));
++                       data = perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
++                                        check_warn, (long)(1000*warning_value),
++                                        check_crit, (long)(1000*critical_value),
++                                        TRUE, 0, FALSE, 0));
+                } else {
+-                       asprintf (&data, "%s",
+-                                 perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
+-                                           FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
++                       data = perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
++                                        FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                }
+        }
+ 
+@@ -560,7 +558,7 @@
+        }
+ 
+        if (server_address == NULL)
+-               server_address = strdup("127.0.0.1");
++               server_address = "127.0.0.1";
+ 
+        return validate_arguments();
+ }
+diff -urN ./plugins/check_users.c ../plugins/plugins/check_users.c
+--- ./plugins/check_users.c     2005-01-05 21:53:22.000000000 +0100
++++ ../plugins/plugins/check_users.c    2005-02-17 18:22:57.000000000 +0100
+@@ -48,7 +48,7 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       perf = strdup("");
++       perf = "";
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+@@ -100,11 +100,8 @@
+        if (result == STATE_UNKNOWN)
+                printf (_("Unable to read output\n"));
+        else {
+-               asprintf(&perf, "%s", perfdata ("users", users, "",
+-                 TRUE, wusers,
+-                 TRUE, cusers,
+-                 TRUE, 0,
+-                 FALSE, 0));
++               perf = perfdata ("users", users, "", TRUE, wusers, TRUE, cusers,
++                                                TRUE, 0, FALSE, 0));
+                printf (_("USERS %s - %d users currently logged in |%s\n"), state_text (result),
+                  users, perf);
+        }
+diff -urN ./plugins/negate.c ../plugins/plugins/negate.c
+--- ./plugins/negate.c  2005-01-05 21:53:22.000000000 +0100
++++ ../plugins/plugins/negate.c 2005-02-17 18:24:35.000000000 +0100
+@@ -192,7 +192,7 @@
+                }
+        }
+ 
+-       asprintf (&command_line, "%s", argv[optind]);
++       command_line = argv[optind];
+        for (c = optind+1; c < argc; c++) {
+                asprintf (&command_line, "%s %s", command_line, argv[c]);
+        }
+diff -urN ./plugins/popen.c ../plugins/plugins/popen.c
+--- ./plugins/popen.c   2005-01-05 21:53:22.000000000 +0100
++++ ../plugins/plugins/popen.c  2005-02-17 13:12:11.000000000 +0100
+@@ -87,7 +87,7 @@
+        setrlimit (RLIMIT_CORE, &limit);
+ #endif
+ 
+-       env[0] = strdup("LC_ALL=C");
++       env[0] = "LC_ALL=C";
+        env[1] = '\0';
+ 
+        /* if no command was passed, return with no error */
+diff -urN ./plugins/urlize.c ../plugins/plugins/urlize.c
+--- ./plugins/urlize.c  2005-01-05 21:53:23.000000000 +0100
++++ ../plugins/plugins/urlize.c 2005-02-17 18:28:19.000000000 +0100
+@@ -67,7 +67,7 @@
+                        exit (EXIT_SUCCESS);
+                        break;
+                case 'u':
+-                       url = strdup (argv[optind]);
++                       url = argv[optind];
+                        break;
+                case '?':
+                default:
+@@ -76,9 +76,9 @@
+        }
+ 
+        if (url == NULL)
+-               url = strdup (argv[optind++]);
++               url = argv[optind++];
+ 
+-       cmd = strdup (argv[optind++]);
++       cmd = argv[optind++];
+        for (c = optind; c < argc; c++) {
+                asprintf (&cmd, "%s %s", cmd, argv[c]);
+        }
diff --git a/web/attachments/122140-diff b/web/attachments/122140-diff
new file mode 100644
index 0000000..736b1c1
--- /dev/null
+++ b/web/attachments/122140-diff
@@ -0,0 +1,91 @@
+Index: check_tcp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
+retrieving revision 1.61
+diff -r1.61 check_tcp.c
+99c99
+< int use_ssl = FALSE;
+---
+> int use_ssl = FALSE;  
+170a171,180
+>       else if (strstr (argv[0], "check_clamd")) {
+>               progname = strdup ("check_clamd");
+>               SERVICE = strdup ("CLAMD");
+>               SEND = strdup ("PING");
+>               EXPECT = strdup ("PONG");
+>               QUIT = NULL;
+>               PROTOCOL = TCP_PROTOCOL;
+>               PORT = 3310;
+>       }
+> 
+378,379c388,395
+< 
+<       printf
+---
+>       if(server_address[0]=='/')
+>               printf
+>               (_("%s %s%s - %.3f second response on socket %s"),
+>                SERVICE,
+>                state_text (result),
+>                (was_refused) ? " (refused)" : "",
+>                elapsed_time, server_address);
+>       else printf
+486c502
+<                       if (is_host (optarg) == FALSE)
+---
+>                       if (optarg[0]!= '/' && is_host (optarg) == FALSE)
+761c777
+<       printf (_("This plugin tests %s connections with the specified host.\n\n"),
+---
+>       printf (_("This plugin tests %s connections with the specified host or unix socket.\n\n"),
+Index: netutils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
+retrieving revision 1.22
+diff -r1.22 netutils.c
+221a222
+>       
+227a229
+>       if (host_name[0] != '/') {
+267a270,294
+>       }
+>       else{ // unix socket
+>               struct sockaddr_un su;
+>               if (strlen(host_name) >= sizeof(su.sun_path)) {
+>                       printf("Hostname too long for unix domain socket: %s\n",
+>                       host_name);
+>                       return STATE_UNKNOWN;
+>               }
+>               memset(&su, 0, sizeof su);
+>               su.sun_family = AF_UNIX;
+>               strncpy(su.sun_path, host_name, sizeof su.sun_path);
+>               *sd = socket(PF_UNIX, SOCK_STREAM, 0);
+>               if ( sd < 0) {
+>                       printf ("Socket creation failed\n");
+>                       return STATE_UNKNOWN;
+>               }
+>               result=connect(*sd, (struct sockaddr *)&su, sizeof su);
+>               if (result == -1) {
+>                       printf ("Connect to socket failed\n");
+>                       close(*sd);
+>                       return STATE_UNKNOWN;
+>               }
+>               
+>       }
+>       
+Index: netutils.h
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h,v
+retrieving revision 1.10
+diff -r1.10 netutils.h
+37a38
+> #include <sys/un.h>
+Index: utils.h
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h,v
+retrieving revision 1.22
+diff -r1.22 utils.h
+139c139
+<     Host name or IP Address\n\
+---
+>     Host name or IP Address or unix socket (starting with \"/\")\n\
diff --git a/web/attachments/122868-check_ntp.patch b/web/attachments/122868-check_ntp.patch
new file mode 100644
index 0000000..b463ed6
--- /dev/null
+++ b/web/attachments/122868-check_ntp.patch
@@ -0,0 +1,15 @@
+*** nagios-plugins-HEAD-200502231747/plugins-scripts/check_ntp.pl       Fri Nov 19 14:59:43 2004
+--- nagios-plugins-NEW/plugins-scripts/check_ntp.pl     Thu Feb 24 16:13:59 2005
+***************
+*** 200,209 ****
+        if (/(offset|adjust)\s+([-.\d]+)/i) {
+                $offset = $2;
+  
+-               # An offset of 0.000000 with an error is probably bogus. Actually,
+-               # it's probably always bogus, but let's be paranoid here.
+-               if ($offset == 0) { undef $offset;}
+- 
+                $ntpdate_error = defined ($offset) ? $ERRORS{"OK"} : $ERRORS{"CRITICAL"};
+                print "ntperr = $ntpdate_error \n" if $verbose;
+        
+--- 200,205 ----
diff --git a/web/attachments/123083-check_mysql.diff.gz b/web/attachments/123083-check_mysql.diff.gz
new file mode 100644
index 0000000..95f9d1c
--- /dev/null
+++ b/web/attachments/123083-check_mysql.diff.gz
diff --git a/web/attachments/123084-patch-check_mysql.c b/web/attachments/123084-patch-check_mysql.c
new file mode 100644
index 0000000..998ad47
--- /dev/null
+++ b/web/attachments/123084-patch-check_mysql.c
@@ -0,0 +1,20 @@
+--- plugins/check_mysql.c.orig  Sun Dec 26 00:17:44 2004
++++ plugins/check_mysql.c       Sun Feb 20 14:12:10 2005
+@@ -123,8 +123,16 @@
+                                die (STATE_CRITICAL, "%s\n", slaveresult);
+                        }
+ 
++               } else if (mysql_field_count (&mysql) == 33) {
++                       /* mysql >= 4.1.1 */
++                       snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s", row[10], row[11]);
++                       if (strcmp (row[10], "Yes") != 0 || strcmp (row[11], "Yes") != 0) {
++                               mysql_free_result (res);
++                               mysql_close (&mysql);
++                               die (STATE_CRITICAL, "%s\n", slaveresult);
++                       }
+                } else {
+-                       /* mysql 4.x.x */
++                       /* mysql 4.0.x or 4.1.0 */
+                        snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s", row[9], row[10]);
+                        if (strcmp (row[9], "Yes") != 0 || strcmp (row[10], "Yes") != 0) {
+                                mysql_free_result (res);
diff --git a/web/attachments/123407-long_long_swap.patch b/web/attachments/123407-long_long_swap.patch
new file mode 100644
index 0000000..fcd5802
--- /dev/null
+++ b/web/attachments/123407-long_long_swap.patch
@@ -0,0 +1,173 @@
+Index: check_swap.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_swap.c,v
+retrieving revision 1.9
+diff -u -r1.9 check_swap.c
+--- check_swap.c        18 Feb 2003 03:46:15 -0000      1.9
++++ check_swap.c        27 Feb 2005 23:58:43 -0000
+@@ -36,6 +36,18 @@
+ #define EMAIL "kdebisschop@users.sourceforge.net"
+ #define SUMMARY "Check swap space on local server.\n"
+ 
++#ifdef HAVE_LONGLONG
++typedef long long unsigned int swapsize_t;
++#define SWAPSIZEFORMAT "%llu"
++#define SWAPSIZEFORMAT_OUT SWAPSIZEFORMAT
++#define atos atoll
++#else
++typedef float swapsize_t;
++#define SWAPSIZEFORMAT "%f"
++#define SWAPSIZEFORMAT_OUT "%.0f"
++#define atos (float)atof
++#endif
++
+ int process_arguments (int argc, char **argv);
+ int validate_arguments (void);
+ void print_usage (void);
+@@ -43,8 +55,8 @@
+ 
+ int warn_percent = 200;
+ int crit_percent = 200;
+-long unsigned int warn_size = 0;
+-long unsigned int crit_size = 0;
++swapsize_t warn_size = 0;
++swapsize_t crit_size = 0;
+ int verbose;
+ int allswaps;
+ 
+@@ -52,8 +64,8 @@
+ main (int argc, char **argv)
+ {
+        int percent_used, percent;
+-       long unsigned int total_swap = 0, used_swap = 0, free_swap = 0;
+-       long unsigned int total, used, free;
++       swapsize_t total_swap = 0, used_swap = 0, free_swap = 0;
++       swapsize_t total, used, free;
+        int result = STATE_OK;
+        char input_buffer[MAX_INPUT_BUFFER];
+ #ifdef HAVE_SWAP
+@@ -61,6 +73,7 @@
+ #endif
+ #ifdef HAVE_PROC_MEMINFO
+        FILE *fp;
++       char str_format[32];
+ #endif
+        char str[32];
+        char *status = "";
+@@ -70,9 +83,10 @@
+ 
+ #ifdef HAVE_PROC_MEMINFO
+        fp = fopen (PROC_MEMINFO, "r");
++       sprintf (str_format, " %%s %s %s %s", SWAPSIZEFORMAT, SWAPSIZEFORMAT, SWAPSIZEFORMAT);
+        asprintf (&status, "%s", "Swap used:");
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+-               if (sscanf (input_buffer, " %s %lu %lu %lu", str, &total, &used, &free) == 4 &&
++               if (sscanf (input_buffer, str_format, str, &total, &used, &free) == 4 &&
+                    strstr (str, "Swap")) {
+                        total_swap += total;
+                        used_swap += used;
+@@ -83,8 +97,10 @@
+                                        result = max_state (STATE_CRITICAL, result);
+                                else if (percent >= warn_percent || free <= warn_size)
+                                        result = max_state (STATE_WARNING, result);
+-                               if (verbose)
+-                                       asprintf (&status, "%s [%lu/%lu]", status, used, total);
++                               if (verbose) {
++                                       sprintf (str_format, "%%s [%s/%s]", SWAPSIZEFORMAT_OUT, SWAPSIZEFORMAT_OUT);
++                                       asprintf (&status, str_format, status, used, total);
++                               }
+                        }
+                }
+        }
+@@ -93,7 +109,8 @@
+                result = max_state (STATE_CRITICAL, result);
+        else if (percent_used >= warn_percent || free_swap <= warn_size)
+                result = max_state (STATE_WARNING, result);
+-       asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
++       sprintf (str_format, "%%s %%2d%%%% (%s out of %s)", SWAPSIZEFORMAT_OUT, SWAPSIZEFORMAT_OUT);
++       asprintf (&status, str_format, status, percent_used,
+                  used_swap, total_swap);
+        fclose (fp);
+ #else
+@@ -137,8 +154,9 @@
+                                result = max_state (STATE_CRITICAL, result);
+                        else if (percent >= warn_percent || free <= warn_size)
+                                result = max_state (STATE_WARNING, result);
+-                       if (verbose)
+-                               asprintf (&status, "%s [%lu/%lu]", status, used, total);
++                       if (verbose) {
++                               sprintf (str_format, "%%s [%s/%s]", SWAPSIZEFORMAT_OUT, SWAPSIZEFORMAT_OUT);
++                               asprintf (&status, str_format, status, used, total);
+                }
+        }
+        percent_used = 100 * ((double) used_swap) / ((double) total_swap);
+@@ -146,8 +164,9 @@
+                result = max_state (STATE_CRITICAL, result);
+        else if (percent_used >= warn_percent || free_swap <= warn_size)
+                result = max_state (STATE_WARNING, result);
+-       asprintf (&status, "%s %2d%% (%lu out of %lu)",
+-                                               status, percent_used, used_swap, total_swap);
++       sprintf (str_format, "%%s %%2d%%%% (%s out of %s)", SWAPSIZEFORMAT_OUT, SWAPSIZEFORMAT_OUT)
++       asprintf (&status, str_format,
++                               status, percent_used, used_swap, total_swap);
+ 
+        /* If we get anything on STDERR, at least set warning */
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+@@ -198,6 +217,8 @@
+        int wc = 0; /* warning counter  */
+        int cc = 0; /* critical counter */
+ 
++       char str_format[32];
++
+ #ifdef HAVE_GETOPT_H
+        int option_index = 0;
+        static struct option long_options[] = {
+@@ -224,15 +245,16 @@
+                if (c == -1 || c == EOF)
+                        break;
+ 
++               sprintf (str_format, "%s,%%d%%%%", SWAPSIZEFORMAT);
+                switch (c) {
+                case 'w':                                                                       /* warning time threshold */
+                        if (is_intnonneg (optarg)) {
+-                               warn_size = atoi (optarg);
++                               warn_size = atos (optarg);
+                                break;
+                        }
+                        else if (strstr (optarg, ",") &&
+                                                         strstr (optarg, "%") &&
+-                                                        sscanf (optarg, "%lu,%d%%", &warn_size, &warn_percent) == 2) {
++                                                        sscanf (optarg, str_format, &warn_size, &warn_percent) == 2) {
+                                break;
+                        }
+                        else if (strstr (optarg, "%") &&
+@@ -245,12 +267,12 @@
+                        wc++;
+                case 'c':                                                                       /* critical time threshold */
+                        if (is_intnonneg (optarg)) {
+-                               crit_size = atoi (optarg);
++                               crit_size = atos (optarg);
+                                break;
+                        }
+                        else if (strstr (optarg, ",") &&
+                                                         strstr (optarg, "%") &&
+-                                                        sscanf (optarg, "%lu,%d%%", &crit_size, &crit_percent) == 2) {
++                                                        sscanf (optarg, str_format, &crit_size, &crit_percent) == 2) {
+                                break;
+                        }
+                        else if (strstr (optarg, "%") &&
+@@ -292,12 +314,12 @@
+        if (c == argc)
+                return validate_arguments ();
+        if (warn_size < 0 && is_intnonneg (argv[c]))
+-               warn_size = atoi (argv[c++]);
++               warn_size = atos (argv[c++]);
+ 
+        if (c == argc)
+                return validate_arguments ();
+        if (crit_size < 0 && is_intnonneg (argv[c]))
+-               crit_size = atoi (argv[c++]);
++               crit_size = atos (argv[c++]);
+ 
+        return validate_arguments ();
+ }
diff --git a/web/attachments/123952-check_snmp.c.diff b/web/attachments/123952-check_snmp.c.diff
new file mode 100644
index 0000000..9d726bd
--- /dev/null
+++ b/web/attachments/123952-check_snmp.c.diff
@@ -0,0 +1,23 @@
+diff -ruN nagios-plugins-1.4.orig/plugins/check_snmp.c nagios-plugins-1.4/plugins/check_snmp.c
+--- nagios-plugins-1.4.orig/plugins/check_snmp.c        2005-01-21 04:03:56.000000000 +0300
++++ nagios-plugins-1.4/plugins/check_snmp.c     2005-03-03 14:18:55.000000000 +0300
+@@ -646,6 +646,10 @@
+                asprintf(&proto, DEFAULT_PROTOCOL);
+                asprintf(&authpriv, "%s%s", "-c ", community);
+        }
++       else if ( strcmp (proto, "2c") == 0 ) {                /* snmpv2c args */
++               asprintf(&proto, "%s", "2c");
++               asprintf(&authpriv, "%s%s", "-c ", community);
++       }
+        else if ( strcmp (proto, "3") == 0 ) {                 /* snmpv3 args */
+                asprintf(&proto, "%s", "3");
+                
+@@ -859,7 +863,7 @@
+ 
+        /* SNMP and Authentication Protocol */
+        printf (_("\
+- -P, --protocol=[1|3]\n\
++ -P, --protocol=[1|2c|3]\n\
+     SNMP protocol version\n\
+  -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n\
+     SNMPv3 securityLevel\n\
diff --git a/web/attachments/125109-tcp_bin.patch b/web/attachments/125109-tcp_bin.patch
new file mode 100644
index 0000000..1ac15e4
--- /dev/null
+++ b/web/attachments/125109-tcp_bin.patch
@@ -0,0 +1,214 @@
+diff -rNu nagios_orig/plugins/check_tcp.c nagios-plugins-1.4/plugins/check_tcp.c
+--- nagios_orig/plugins/check_tcp.c     2004-12-30 01:41:40.000000000 +0100
++++ nagios-plugins-1.4/plugins/check_tcp.c      2005-03-09 15:46:03.000000000 +0100
+@@ -80,6 +80,8 @@
+ char *server_address = NULL;
+ char *server_send = NULL;
+ char *server_quit = NULL;
++char *input_file_name = NULL;
++char *output_file_name = NULL;
+ char **server_expect = NULL;
+ size_t server_expect_count = 0;
+ int maxbytes = 0;
+@@ -132,6 +134,15 @@
+                PROTOCOL = TCP_PROTOCOL;
+                PORT = 0;
+        }
++       else if (strstr (argv[0], "check_tcp_bin")) {
++               progname = strdup ("check_tcp_bin");
++               SERVICE = strdup ("TCP");
++               SEND = NULL;
++               EXPECT = NULL;
++               QUIT = NULL;
++               PROTOCOL = TCP_PROTOCOL;
++               PORT = 0;
++       }
+        else if (strstr (argv[0], "check_ftp")) {
+                progname = strdup ("check_ftp");
+                SERVICE = strdup ("FTP");
+@@ -299,6 +310,42 @@
+                        send (sd, server_send, strlen(server_send), 0);
+        }
+ 
++       /* send content of input file ? */
++       if (input_file_name != NULL) {
++               struct stat istat;
++               if (stat(input_file_name, &istat) != 0) {
++                       printf("UNKNOWN - File not found %s\n", input_file_name);
++                       return STATE_UNKNOWN;           
++               }
++               size_t in_len = istat.st_size;
++
++               FILE * in = fopen(input_file_name, "rb");
++               if (in ==  NULL) {
++                       printf("UNKNOWN - Can not open file: %s\n", input_file_name);
++                       return STATE_UNKNOWN;           
++               }
++               char * indata = malloc(in_len);
++               if (indata == NULL) {
++                       printf(_("UNKNOWN - Not enough memory\n"));
++                       return STATE_UNKNOWN;           
++               }
++               size_t bytes = fread(indata, 1, in_len, in);
++               if (bytes != in_len) {
++                       printf("UNKNOWN - Error reading file: \n", input_file_name);
++                       free(indata);
++                       fclose(in);
++                       return STATE_UNKNOWN;           
++               }
++               fclose(in);
++#ifdef HAVE_SSL
++               if (use_ssl)
++                       SSL_write(ssl, indata, in_len);
++               else
++#endif
++                       send (sd, indata, in_len, 0);
++               free(indata);
++       }
++
+        if (delay > 0) {
+                tv.tv_sec += delay;
+                sleep (delay);
+@@ -345,6 +392,57 @@
+                }
+        }
+ 
++       /* Verify server response */
++       if (output_file_name != NULL) {
++               struct stat ostat;
++               if (stat(output_file_name, &ostat) != 0) {
++                       printf("UNKNOWN - File not found %s\n", output_file_name);
++                       return STATE_UNKNOWN;           
++               }
++               size_t out_len = ostat.st_size;
++
++               FILE * out = fopen(output_file_name, "rb");
++               if (out ==  NULL) {
++                       printf("UNKNOWN - Can not open file: %s\n", output_file_name);
++                       return STATE_UNKNOWN;           
++               }
++               char * outdata = malloc(out_len);
++               if (outdata == NULL) {
++                       printf(_("UNKNOWN - Not enough memory\n"));
++                       return STATE_UNKNOWN;           
++               }
++               size_t bytes = fread(outdata, 1, out_len, out);
++               if (bytes != out_len) {
++                       printf("UNKNOWN - Error reading file: \n", output_file_name);
++                       free(outdata);
++                       fclose(out);
++                       return STATE_UNKNOWN;           
++               }
++               fclose(out);
++       
++               char * rcvbuf = malloc(out_len);
++               if (rcvbuf != NULL) {
++                       char *p = rcvbuf;
++                       size_t count = 0;
++                       
++                       do {
++                               count += my_bin_recv(p, out_len-count);
++                               p += count;
++                       } while (count < out_len);
++
++                       if (memcmp(outdata, rcvbuf, out_len) == 0) {
++                               result = STATE_OK;
++                       } else {
++                printf(_("WARNING response does not match\n"));
++                               result = expect_mismatch_state;
++                       }
++                       free(rcvbuf);
++               } else {
++                       result = STATE_UNKNOWN;
++               }
++               
++       }
++
+        if (server_quit != NULL) {
+ #ifdef HAVE_SSL
+                if (use_ssl) {
+@@ -417,6 +515,8 @@
+                {"expect", required_argument, 0, 'e'},
+                {"maxbytes", required_argument, 0, 'm'},
+                {"quit", required_argument, 0, 'q'},
++               {"inputfile", required_argument, 0, 'i'},
++               {"outputfile", required_argument, 0, 'o'},
+                {"jail", required_argument, 0, 'j'},
+                {"delay", required_argument, 0, 'd'},
+                {"refuse", required_argument, 0, 'r'},
+@@ -454,8 +554,8 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
+-                                longopts, &option);
++               c = getopt_long (argc, argv,
++                       "+hVv46H:s:e:q:m:c:i:o:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+@@ -527,6 +627,12 @@
+                case 's':
+                        server_send = optarg;
+                        break;
++               case 'i':
++                       input_file_name = optarg;
++                       break;
++               case 'o':
++                       output_file_name = optarg;
++                       break;
+                case 'e': /* expect string (may be repeated) */
+                        EXPECT = NULL;
+                        exact_matching = FALSE;
+@@ -748,7 +854,18 @@
+        return i;
+ }
+ 
+-
++int my_bin_recv(char * buf, size_t len) {
++       int i;
++#ifdef HAVE_SSL
++       if (use_ssl) {
++               i = SSL_read (ssl, buf, len);
++       } else {
++#endif
++               i = read (sd, buf, len);
++#ifdef HAVE_SSL                
++       }
++#endif
++}
+ 
+ void
+ print_help (void)
+@@ -786,6 +903,10 @@
+     Hide output from TCP socket\n\
+  -m, --maxbytes=INTEGER\n\
+     Close connection once more than this number of bytes are received\n\
++ -i, --inputfile=file_name\n\
++    Input file to send to server\n\
++ -o, --outputfile=file_name\n\
++    Output file to binary compare with server response\n\
+  -d, --delay=INTEGER\n\
+     Seconds to wait between sending string and polling for response\n"));
+ 
+@@ -816,5 +937,6 @@
+                   [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+                   [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+                   [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
++                  [-i <input file>] [-o <output file>]\n\
+                   [-D <days to cert expiry>] [-S <use SSL>]\n", progname);               
+ }
+diff -rNu nagios_orig/plugins/Makefile.am nagios-plugins-1.4/plugins/Makefile.am
+--- nagios_orig/plugins/Makefile.am     2005-02-01 13:30:38.000000000 +0100
++++ nagios-plugins-1.4/plugins/Makefile.am      2005-03-09 17:25:07.000000000 +0100
+@@ -16,8 +16,8 @@
+        check_udp check_ups check_users negate urlize check_icmp\
+        @EXTRAS@
+ 
+-check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
+-       @check_tcp_ssl@
++check_tcp_programs = check_ftp check_imap check_nntp check_pop check_tcp_bin \
++       check_udp2 @check_tcp_ssl@
+ 
+ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
+        check_swap check_fping check_ldap check_game check_dig \
diff --git a/web/attachments/126077-check_oracle.diff b/web/attachments/126077-check_oracle.diff
new file mode 100644
index 0000000..2266ce3
--- /dev/null
+++ b/web/attachments/126077-check_oracle.diff
@@ -0,0 +1,50 @@
+--- check_oracle.new    2005-03-17 15:12:05.000000000 +0100
++++ /home/stefan/packages/nagios-plugins-1.4/plugins-scripts/check_oracle.sh    2004-12-01 21:09:59.000000000 +0100
+@@ -241,36 +241,17 @@
+        echo "UNKNOWN - Warning level is more then Crit"
+        exit $STATE_UNKNOWN
+     fi
+-
+-
+-    if [ ${5} = 'TEMP' ] ; then
+-       result=`sqlplus -s ${3}/${4}@${2} << EOF
+-        set pagesize 0
+-        set numf '9999999.99'
+-
+-        select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc 
+-        from ( 
+-        select tablespace_name,sum(bytes)/1024/1024 total 
+-        from dba_temp_files group by tablespace_name) A, 
+-        ( select tablespace_name,sum(bytes_free)/1024/1024 free 
+-        from v\\$temp_space_header group by tablespace_name) B 
+-        where a.tablespace_name=b.tablespace_name and a.tablespace_name='${5}';
+-        EOF`
+-   else
+-        result=`sqlplus -s ${3}/${4}@${2} << EOF
+-        set pagesize 0
+-        set numf '9999999.99'
+-
+-        select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc 
+-        from ( 
+-        select tablespace_name,sum(bytes)/1024/1024 total 
+-        from dba_data_files group by tablespace_name) A, 
+-        ( select tablespace_name,sum(bytes)/1024/1024 free 
+-        from dba_Free_space group by tablespace_name) B 
+-        where a.tablespace_name=b.tablespace_name and a.tablespace_name='${5}';
+-        EOF`
+-   fi
+-                                                                                                                                                       
++    result=`sqlplus -s ${3}/${4}@${2} << EOF
++set pagesize 0
++set numf '9999999.99'
++select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc
++from (
++select tablespace_name,sum(bytes)/1024/1024 total
++from dba_data_files group by tablespace_name) A,
++( select tablespace_name,sum(bytes)/1024/1024 free
++from dba_free_space group by tablespace_name) B
++where a.tablespace_name=b.tablespace_name and a.tablespace_name='${5}';
++EOF`
+ 
+     if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
diff --git a/web/attachments/127602-check_ntp.diff b/web/attachments/127602-check_ntp.diff
new file mode 100644
index 0000000..9c585d0
--- /dev/null
+++ b/web/attachments/127602-check_ntp.diff
@@ -0,0 +1,138 @@
+Index: plugins-scripts/check_ntp.pl
+===================================================================
+--- plugins-scripts/check_ntp.pl        (revision 18)
++++ plugins-scripts/check_ntp.pl        (working copy)
+@@ -270,11 +270,11 @@
+                        if (/^(\*|\+|\#|o])/) {
+                                ++$candidate;
+                                push (@candidates, $_);
+-                               print "Candiate count= $candidate\n" if ($verbose);
++                               print "Candidate count= $candidate\n" if ($verbose);
+                        }
+                        
+                        # match sys.peer or pps.peer
+-                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
++                       if (/^(\*|o)([-0-9.]+)\s+(\S+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
+                                $syspeer = $2;
+                                $stratum = $4;
+                                $jitter = $11;
+@@ -283,11 +283,14 @@
+                                        print "Jitter_crit = $11 :$jcrit\n" if ($verbose);
+                                        $jitter_error = $ERRORS{'CRITICAL'};
+                                } elsif ($jitter > $jwarn ) {
+-                                       print "Jitter_warn = $11 :$jwarn \n" if ($verbose);
++                                       print "Jitter_warn = $11 :$jwarn\n" if ($verbose);
+                                        $jitter_error = $ERRORS{'WARNING'};
+                                } else {
+                                        $jitter_error = $ERRORS{'OK'};
+                                }
++                       } else {
++                               print "No match!\n" if $verbose;
++                               $jitter = '(not parsed)';
+                        }
+                        
+                }
+@@ -324,53 +327,53 @@
+ if ($ntpdate_error != $ERRORS{'OK'}) {
+        $state = $ntpdate_error;
+        if ($ntpdate_error == $ERRORS{'WARNING'} ) {
+-               $answer = $msg . "\n";
++               $answer = $msg;
+        }
+        else {
+-               $answer = $msg . "Server for ntp probably down\n";
++               $answer = $msg . "Server for ntp probably down";
+        }
+ 
+        if (defined($offset) && abs($offset) > $ocrit) {
+                $state = $ERRORS{'CRITICAL'};
+-               $answer = "Server Error and offset $offset sec > +/- $ocrit sec\n";
++               $answer = "Server Error and offset $offset sec > +/- $ocrit sec";
+        } elsif (defined($offset) && abs($offset) > $owarn) {
+-               $answer = "Server error and offset $offset sec > +/- $owarn sec\n";
++               $answer = "Server error and offset $offset sec > +/- $owarn sec";
+        } elsif (defined($jitter) && abs($jitter) > $jcrit) {
+-               $answer = "Server error and jitter $jitter msec > +/- $jcrit msec\n";
++               $answer = "Server error and jitter $jitter msec > +/- $jcrit msec";
+        } elsif (defined($jitter) && abs($jitter) > $jwarn) {
+-               $answer = "Server error and jitter $jitter msec > +/- $jwarn msec\n";
++               $answer = "Server error and jitter $jitter msec > +/- $jwarn msec";
+        }
+ 
+ } elsif ($have_ntpq && $jitter_error != $ERRORS{'OK'}) {
+        $state = $jitter_error;
+-       $answer = "Jitter $jitter too high\n";
++       $answer = "Jitter $jitter too high";
+        if (defined($offset) && abs($offset) > $ocrit) {
+                $state = $ERRORS{'CRITICAL'};
+-               $answer = "Jitter error and offset $offset sec > +/- $ocrit sec\n";
++               $answer = "Jitter error and offset $offset sec > +/- $ocrit sec";
+        } elsif (defined($offset) && abs($offset) > $owarn) {
+-               $answer = "Jitter error and offset $offset sec > +/- $owarn sec\n";
++               $answer = "Jitter error and offset $offset sec > +/- $owarn sec";
+        } elsif (defined($jitter) && abs($jitter) > $jcrit) {
+-               $answer = "Jitter error and jitter $jitter msec > +/- $jcrit msec\n";
++               $answer = "Jitter error and jitter $jitter msec > +/- $jcrit msec";
+        } elsif (defined($jitter) && abs($jitter) > $jwarn) {
+-               $answer = "Jitter error and jitter $jitter msec > +/- $jwarn msec\n";
++               $answer = "Jitter error and jitter $jitter msec > +/- $jwarn msec";
+        }
+ 
+ } elsif( !$have_ntpq ) { # no errors from ntpdate and no ntpq or ntpq timed out
+        if (abs($offset) > $ocrit) {
+                $state = $ERRORS{'CRITICAL'};
+-               $answer = "Offset $offset sec > +/- $ocrit sec\n";
++               $answer = "Offset $offset sec > +/- $ocrit sec";
+        } elsif (abs($offset) > $owarn) {
+                $state = $ERRORS{'WARNING'};
+-               $answer = "Offset $offset sec > +/- $owarn sec\n";
++               $answer = "Offset $offset sec > +/- $owarn sec";
+        } elsif (( abs($offset) > $owarn) && $def_jitter ) {
+                $state = $ERRORS{'WARNING'};
+-               $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out\n";
++               $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out";
+        } elsif ( $def_jitter ) {
+                $state = $ERRORS{'WARNING'};
+-               $answer = "Offset $offset secs, ntpq timed out\n";
++               $answer = "Offset $offset secs, ntpq timed out";
+        } else{
+                $state = $ERRORS{'OK'};
+-               $answer = "Offset $offset secs \n";
++               $answer = "Offset $offset secs ";
+        }
+ 
+ 
+@@ -378,27 +381,27 @@
+ } else { # no errors from ntpdate or ntpq
+        if (abs($offset) > $ocrit) {
+                $state = $ERRORS{'CRITICAL'};
+-               $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec\n";
++               $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec";
+        } elsif (abs($jitter) > $jcrit ) {
+                $state = $ERRORS{'CRITICAL'};
+-               $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec \n";
++               $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec";
+        } elsif (abs($offset) > $owarn) {
+                $state = $ERRORS{'WARNING'};
+-               $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec\n";
++               $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec";
+        } elsif (abs($jitter) > $jwarn ) {
+                $state = $ERRORS{'WARNING'};
+-               $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec \n";
++               $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec";
+ 
+        } else {
+                $state = $ERRORS{'OK'};
+-               $answer = "Offset $offset secs, jitter $jitter msec, peer is stratum $stratum\n";
++               $answer = "Offset $offset secs, jitter $jitter msec, peer is stratum $stratum";
+        }
+        
+ }
+ 
+ foreach my $key (keys %ERRORS) {
+        if ($state==$ERRORS{$key}) {
+-               print ("NTP $key: $answer");
++               print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . "\n");
+                last;
+        }
+ }
diff --git a/web/attachments/127924-check_smtp.c b/web/attachments/127924-check_smtp.c
new file mode 100644
index 0000000..f86a119
--- /dev/null
+++ b/web/attachments/127924-check_smtp.c
@@ -0,0 +1,739 @@
+/******************************************************************************
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id: check_smtp.c,v 1.43 2005/01/01 16:15:39 tonvoon Exp $
+ 
+******************************************************************************/
+
+const char *progname = "check_smtp";
+const char *revision = "$Revision: 1.43 $";
+const char *copyright = "2000-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
+#ifdef HAVE_SSL_H
+#  include <rsa.h>
+#  include <crypto.h>
+#  include <x509.h>
+#  include <pem.h>
+#  include <ssl.h>
+#  include <err.h>
+#else
+#  ifdef HAVE_OPENSSL_SSL_H
+#    include <openssl/rsa.h>
+#    include <openssl/crypto.h>
+#    include <openssl/x509.h>
+#    include <openssl/pem.h>
+#    include <openssl/ssl.h>
+#    include <openssl/err.h>
+#  endif
+#endif
+
+#ifdef HAVE_SSL
+
+int check_cert = FALSE;
+int days_till_exp;
+SSL_CTX *ctx;
+SSL *ssl;
+X509 *server_cert;
+int connect_STARTTLS (void);
+int check_certificate (X509 **);
+#endif
+
+enum {
+        SMTP_PORT       = 25
+};
+const char *SMTP_EXPECT = "220";
+const char *SMTP_HELO = "HELO ";
+const char *SMTP_QUIT   = "QUIT\r\n";
+const char *SMTP_STARTTLS = "STARTTLS\r\n";
+
+int process_arguments (int, char **);
+int validate_arguments (void);
+void print_help (void);
+void print_usage (void);
+int myrecv(void);
+int my_close(void);
+
+#ifdef HAVE_REGEX_H
+#include <regex.h>
+char regex_expect[MAX_INPUT_BUFFER] = "";
+regex_t preg;
+regmatch_t pmatch[10];
+char timestamp[10] = "";
+char errbuf[MAX_INPUT_BUFFER];
+int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+int eflags = 0;
+int errcode, excode;
+#endif
+
+int server_port = SMTP_PORT;
+char *server_address = NULL;
+char *server_expect = NULL;
+int smtp_use_dummycmd = 0;
+char *mail_command = NULL;
+char *from_arg = NULL;
+int ncommands=0;
+int command_size=0;
+int nresponses=0;
+int response_size=0;
+char **commands = NULL;
+char **responses = NULL;
+int warning_time = 0;
+int check_warning_time = FALSE;
+int critical_time = 0;
+int check_critical_time = FALSE;
+int verbose = 0;
+int use_ssl = FALSE;
+int sd;
+char buffer[MAX_INPUT_BUFFER];
+enum {
+  TCP_PROTOCOL = 1,
+  UDP_PROTOCOL = 2,
+  MAXBUF = 1024
+};
+
+int
+main (int argc, char **argv)
+{
+
+        int n = 0;
+        double elapsed_time;
+        long microsec;
+        int result = STATE_UNKNOWN;
+        char *cmd_str = NULL;
+        char *helocmd = NULL;
+        struct timeval tv;
+
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+
+        /* initialize the HELO command with the localhostname */
+#ifndef HOST_MAX_BYTES
+#define HOST_MAX_BYTES 255
+#endif
+        helocmd = malloc (HOST_MAX_BYTES);
+        gethostname(helocmd, HOST_MAX_BYTES);
+        asprintf (&helocmd, "%s%s%s", SMTP_HELO, helocmd, "\r\n");
+
+        /* initialize the MAIL command with optional FROM command  */
+        asprintf (&cmd_str, "%sFROM: %s%s", mail_command, from_arg, "\r\n");
+
+        if (verbose && smtp_use_dummycmd)
+                printf ("FROM CMD: %s", cmd_str);
+        
+        /* initialize alarm signal handling */
+        (void) signal (SIGALRM, socket_timeout_alarm_handler);
+
+        /* set socket timeout */
+        (void) alarm (socket_timeout);
+
+        /* start timer */
+        gettimeofday (&tv, NULL);
+
+        /* try to connect to the host at the given port number */
+        result = my_tcp_connect (server_address, server_port, &sd);
+
+        if (result == STATE_OK) { /* we connected */
+
+                /* watch for the SMTP connection string and */
+                /* return a WARNING status if we couldn't read any data */
+                if (recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0) == -1) {
+                        printf (_("recv() failed\n"));
+                        result = STATE_WARNING;
+                }
+                else {
+                        if (verbose)
+                                printf ("%s", buffer);
+                        /* strip the buffer of carriage returns */
+                        strip (buffer);
+                        /* make sure we find the response we are looking for */
+                        if (!strstr (buffer, server_expect)) {
+                                if (server_port == SMTP_PORT)
+                                        printf (_("Invalid SMTP response received from host\n"));
+                                else
+                                        printf (_("Invalid SMTP response received from host on port %d\n"),
+                                                                        server_port);
+                                result = STATE_WARNING;
+                        }
+                }
+#ifdef HAVE_SSL
+                if(use_ssl) {
+                
+                  send(sd, helocmd, strlen(helocmd), 0);
+                  recv(sd,buffer, MAX_INPUT_BUFFER-1, 0); // wait for it
+                  /* send the STARTTLS command */
+                  send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
+
+                  recv(sd,buffer, MAX_INPUT_BUFFER-1, 0); // wait for it
+                  if (!strstr (buffer, server_expect)) {
+                    printf (_("Server does not support STARTTLS : %s \n"),buffer);
+                    return STATE_UNKNOWN;
+                  }
+                  if(connect_STARTTLS() != OK) {
+                    printf (_("CRITICAL - Cannot create SSL context.: %s \n"),buffer);
+                    return STATE_CRITICAL;
+                  }
+                  if ( check_cert ) {
+                    if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
+                      result = check_certificate (&server_cert);
+                      X509_free(server_cert);
+                    }
+                    else {
+                      printf (_("CRITICAL - Cannot retrieve server certificate.: %s \n"),buffer);
+                      result = STATE_CRITICAL;
+                              
+                    }
+                    my_close();
+                    return result;
+                  }
+                }
+#endif
+                /* send the HELO command */
+#ifdef HAVE_SSL
+                if (use_ssl)
+                  SSL_write(ssl, helocmd, strlen(helocmd));
+                else
+#endif
+                send(sd, helocmd, strlen(helocmd), 0);
+
+                /* allow for response to helo command to reach us */
+                myrecv();
+                                
+                /* sendmail will syslog a "NOQUEUE" error if session does not attempt
+                 * to do something useful. This can be prevented by giving a command
+                 * even if syntax is illegal (MAIL requires a FROM:<...> argument)
+                 *
+                 * According to rfc821 you can include a null reversepath in the from command
+                 * - but a log message is generated on the smtp server.
+                 *
+                 * You can disable sending mail_command with '--nocommand'
+                 * Use the -f option to provide a FROM address
+                 */
+                if (smtp_use_dummycmd) {
+#ifdef HAVE_SSL
+                  if (use_ssl)
+                    SSL_write(ssl, cmd_str, strlen(cmd_str));
+                  else
+#endif
+                  send(sd, cmd_str, strlen(cmd_str), 0);
+                  myrecv();
+                  if (verbose) 
+                    printf("%s", buffer);
+                }
+
+                while (n < ncommands) {
+                        asprintf (&cmd_str, "%s%s", commands[n], "\r\n");
+#ifdef HAVE_SSL
+                        if (use_ssl)
+                          SSL_write(ssl,cmd_str, strlen(cmd_str));
+                        else
+#endif
+                        send(sd, cmd_str, strlen(cmd_str), 0);
+                        myrecv();
+                        if (verbose) 
+                                printf("%s", buffer);
+                        strip (buffer);
+                        if (n < nresponses) {
+#ifdef HAVE_REGEX_H
+                                cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+                                //strncpy (regex_expect, responses[n], sizeof (regex_expect) - 1);
+                                //regex_expect[sizeof (regex_expect) - 1] = '\0';
+                                errcode = regcomp (&preg, responses[n], cflags);
+                                if (errcode != 0) {
+                                        regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                        printf (_("Could Not Compile Regular Expression"));
+                                        return ERROR;
+                                }
+                                excode = regexec (&preg, buffer, 10, pmatch, eflags);
+                                if (excode == 0) {
+                                        result = STATE_OK;
+                                }
+                                else if (excode == REG_NOMATCH) {
+                                        result = STATE_WARNING;
+                                        printf (_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text (result), buffer, commands[n]);
+                                }
+                                else {
+                                        regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                        printf (_("Execute Error: %s\n"), errbuf);
+                                        result = STATE_UNKNOWN;
+                                }
+#else
+                                if (strstr(buffer, responses[n])!=buffer) {
+                                        result = STATE_WARNING;
+                                        printf (_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text (result), buffer, commands[n]);
+                                }
+#endif
+                        }
+                        n++;
+                }
+
+                /* tell the server we're done */
+#ifdef HAVE_SSL
+                if (use_ssl)
+                  SSL_write(ssl,SMTP_QUIT, strlen (SMTP_QUIT));
+                else
+#endif
+                send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+
+                /* finally close the connection */
+                close (sd);
+        }
+
+        /* reset the alarm */
+        alarm (0);
+
+        microsec = deltime (tv);
+        elapsed_time = (double)microsec / 1.0e6;
+
+        if (result == STATE_OK) {
+                if (check_critical_time && elapsed_time > (double) critical_time)
+                        result = STATE_CRITICAL;
+                else if (check_warning_time && elapsed_time > (double) warning_time)
+                        result = STATE_WARNING;
+        }
+
+        printf (_("SMTP %s - %.3f sec. response time%s%s|%s\n"),
+                state_text (result), elapsed_time,
+          verbose?", ":"", verbose?buffer:"",
+                fperfdata ("time", elapsed_time, "s",
+                          (int)check_warning_time, warning_time,
+                          (int)check_critical_time, critical_time,
+                          TRUE, 0, FALSE, 0));
+
+        return result;
+}
+
+
+
+/* process command-line arguments */
+int
+process_arguments (int argc, char **argv)
+{
+        int c;
+
+        int option = 0;
+        static struct option longopts[] = {
+                {"hostname", required_argument, 0, 'H'},
+                {"expect", required_argument, 0, 'e'},
+                {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},
+                {"timeout", required_argument, 0, 't'},
+                {"port", required_argument, 0, 'p'},
+                {"from", required_argument, 0, 'f'},
+                {"command", required_argument, 0, 'C'},
+                {"response", required_argument, 0, 'R'},
+                {"nocommand", required_argument, 0, 'n'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"help", no_argument, 0, 'h'},
+                {"starttls",no_argument,0,'S'},
+                {"certificate",required_argument,0,'D'},
+                {0, 0, 0, 0}
+        };
+
+        if (argc < 2)
+                return ERROR;
+
+        for (c = 1; c < argc; c++) {
+                if (strcmp ("-to", argv[c]) == 0)
+                        strcpy (argv[c], "-t");
+                else if (strcmp ("-wt", argv[c]) == 0)
+                        strcpy (argv[c], "-w");
+                else if (strcmp ("-ct", argv[c]) == 0)
+                        strcpy (argv[c], "-c");
+        }
+
+        while (1) {
+                c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:",
+                                 longopts, &option);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case 'H':                                                                       /* hostname */
+                        if (is_host (optarg)) {
+                                server_address = optarg;
+                        }
+                        else {
+                                usage2 (_("Invalid hostname/address"), optarg);
+                        }
+                        break;
+                case 'p':                                                                       /* port */
+                        if (is_intpos (optarg))
+                                server_port = atoi (optarg);
+                        else
+                                usage4 (_("Port must be a positive integer"));
+                        break;
+                case 'f':                                                                       /* from argument */
+                        from_arg = optarg;
+                        smtp_use_dummycmd = 1;
+                        break;
+                case 'e':                                                                       /* server expect string on 220  */
+                        server_expect = optarg;
+                        break;
+                case 'C':                                                                       /* commands  */
+                        if (ncommands >= command_size) {
+                                commands = realloc (commands, command_size+8);
+                                if (commands == NULL)
+                                        die (STATE_UNKNOWN,
+                                             _("Could not realloc() units [%d]\n"), ncommands);
+                        }
+                        commands[ncommands] = optarg;
+                        ncommands++;
+                        break;
+                case 'R':                                                                       /* server responses */
+                        if (nresponses >= response_size) {
+                                responses = realloc (responses, response_size+8);
+                                if (responses == NULL)
+                                        die (STATE_UNKNOWN,
+                                             _("Could not realloc() units [%d]\n"), nresponses);
+                        }
+                        responses[nresponses] = optarg;
+                        nresponses++;
+                        break;
+                case 'c':                                                                       /* critical time threshold */
+                        if (is_intnonneg (optarg)) {
+                                critical_time = atoi (optarg);
+                                check_critical_time = TRUE;
+                        }
+                        else {
+                                usage4 (_("Critical time must be a positive integer"));
+                        }
+                        break;
+                case 'w':                                                                       /* warning time threshold */
+                        if (is_intnonneg (optarg)) {
+                                warning_time = atoi (optarg);
+                                check_warning_time = TRUE;
+                        }
+                        else {
+                                usage4 (_("Warning time must be a positive integer"));
+                        }
+                        break;
+                case 'v':                                                                       /* verbose */
+                        verbose++;
+                        break;
+                case 't':                                                                       /* timeout */
+                        if (is_intnonneg (optarg)) {
+                                socket_timeout = atoi (optarg);
+                        }
+                        else {
+                                usage4 (_("Timeout interval must be a positive integer"));
+                        }
+                        break;
+                case 'S':
+                /* starttls */
+                        use_ssl = TRUE;
+                        break;
+                case 'D':
+                /* Check SSL cert validity */
+#ifdef HAVE_SSL
+                        if (!is_intnonneg (optarg))
+                                usage2 ("Invalid certificate expiration period",optarg);
+                                days_till_exp = atoi (optarg);
+                                check_cert = TRUE;
+#else
+                                usage (_("SSL support not available - install OpenSSL and recompile"));
+#endif
+                        break;
+                case '4':
+                        address_family = AF_INET;
+                        break;
+                case '6':
+#ifdef USE_IPV6
+                        address_family = AF_INET6;
+#else
+                        usage4 (_("IPv6 support not available"));
+#endif
+                        break;
+                case 'V':                                                                       /* version */
+                        print_revision (progname, revision);
+                        exit (STATE_OK);
+                case 'h':                                                                       /* help */
+                        print_help ();
+                        exit (STATE_OK);
+                case '?':                                                                       /* help */
+                        usage2 (_("Unknown argument"), optarg);
+                }
+        }
+
+        c = optind;
+        if (server_address == NULL) {
+                if (argv[c]) {
+                        if (is_host (argv[c]))
+                                server_address = argv[c];
+                        else
+                                usage2 (_("Invalid hostname/address"), argv[c]);
+                }
+                else {
+                        asprintf (&server_address, "127.0.0.1");
+                }
+        }
+
+        if (server_expect == NULL)
+                server_expect = strdup (SMTP_EXPECT);
+
+        if (mail_command == NULL)
+                mail_command = strdup("MAIL ");
+
+        if (from_arg==NULL)
+                from_arg = strdup(" ");
+
+        return validate_arguments ();
+}
+
+
+
+int
+validate_arguments (void)
+{
+        return OK;
+}
+
+
+
+void
+print_help (void)
+{
+        char *myport;
+        asprintf (&myport, "%d", SMTP_PORT);
+
+        print_revision (progname, revision);
+
+        printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
+        printf (COPYRIGHT, copyright, email);
+
+        printf(_("This plugin will attempt to open an SMTP connection with the host.\n\n"));
+
+        print_usage ();
+
+        printf (_(UT_HELP_VRSN));
+
+        printf (_(UT_HOST_PORT), 'p', myport);
+
+        printf (_(UT_IPv46));
+
+        printf (_("\
+ -e, --expect=STRING\n\
+   String to expect in first line of server response (default: '%s')\n\
+ -n, nocommand\n\
+   Suppress SMTP command\n\
+ -C, --command=STRING\n\
+   SMTP command (may be used repeatedly)\n\
+ -R, --command=STRING\n\
+   Expected response to command (may be used repeatedly)\n\
+ -f, --from=STRING\n\
+   FROM-address to include in MAIL command, required by Exchange 2000\n"),
+                SMTP_EXPECT);
+#ifdef HAVE_SSL
+        printf (_("\
+ -D, --certificate=INTEGER\n\
+    Minimum number of days a certificate has to be valid.\n\
+ -S, --starttls\n\
+    Use STARTTLS for the connection.\n"));
+#endif
+
+        printf (_(UT_WARN_CRIT));
+
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+
+        printf (_(UT_VERBOSE));
+
+        printf(_("\n\
+Successul connects return STATE_OK, refusals and timeouts return\n\
+STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful\n\
+connects, but incorrect reponse messages from the host result in\n\
+STATE_WARNING return values.\n"));
+
+        printf (_(UT_SUPPORT));
+}
+
+
+
+void
+print_usage (void)
+{
+        printf ("\
+Usage: %s -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
+                  [-w warn] [-c crit] [-t timeout] [-S] [-D days] [-n] [-v] [-4|-6]\n", progname);
+}
+
+#ifdef HAVE_SSL
+int
+connect_STARTTLS (void)
+{
+  SSL_METHOD *meth;
+
+  /* Initialize SSL context */
+  SSLeay_add_ssl_algorithms ();
+  meth = SSLv2_client_method ();
+  SSL_load_error_strings ();
+  if ((ctx = SSL_CTX_new (meth)) == NULL)
+    {
+      printf(_("CRITICAL - Cannot create SSL context.\n"));
+      return STATE_CRITICAL;
+    }
+  /* do the SSL handshake */
+  if ((ssl = SSL_new (ctx)) != NULL)
+    {
+      SSL_set_fd (ssl, sd);
+      /* original version checked for -1
+         I look for success instead (1) */
+      if (SSL_connect (ssl) == 1)
+        return OK;
+      ERR_print_errors_fp (stderr);
+    }
+  else
+    {
+      printf (_("CRITICAL - Cannot initiate SSL handshake.\n"));
+    }
+  /* this causes a seg faul
+     not sure why, being sloppy
+     and commenting it out */
+  //  SSL_free (ssl);
+  SSL_CTX_free(ctx);
+  my_close();
+  
+  return STATE_CRITICAL;
+}
+
+int
+check_certificate (X509 ** certificate)
+{
+  ASN1_STRING *tm;
+  int offset;
+  struct tm stamp;
+  int days_left;
+
+  /* Retrieve timestamp of certificate */
+  tm = X509_get_notAfter (*certificate);
+  
+  /* Generate tm structure to process timestamp */
+  if (tm->type == V_ASN1_UTCTIME) {
+    if (tm->length < 10) {
+      printf (_("CRITICAL - Wrong time format in certificate.\n"));
+      return STATE_CRITICAL;
+    }
+    else {
+      stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
+      if (stamp.tm_year < 50)
+        stamp.tm_year += 100;
+      offset = 0;
+    }
+  }
+  else {
+    if (tm->length < 12) {
+      printf (_("CRITICAL - Wrong time format in certificate.\n"));
+      return STATE_CRITICAL;
+    }
+    else {
+      stamp.tm_year =
+        (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
+        (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
+      stamp.tm_year -= 1900;
+      offset = 2;
+    }
+  }
+  stamp.tm_mon =
+    (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
+  stamp.tm_mday =
+    (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
+  stamp.tm_hour =
+    (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
+  stamp.tm_min =
+    (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
+  stamp.tm_sec = 0;
+  stamp.tm_isdst = -1;
+  
+  days_left = (mktime (&stamp) - time (NULL)) / 86400;
+  snprintf
+    (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
+     stamp.tm_mon + 1,
+     stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+  
+  if (days_left > 0 && days_left <= days_till_exp) {
+    printf ("Certificate expires in %d day(s) (%s).\n", days_left, timestamp);
+    return STATE_WARNING;
+  }
+  if (days_left < 0) {
+    printf ("Certificate expired on %s.\n", timestamp);
+    return STATE_CRITICAL;
+  }
+  
+  if (days_left == 0) {
+    printf ("Certificate expires today (%s).\n", timestamp);
+    return STATE_WARNING;
+  }
+  
+  printf ("Certificate will expire on %s.\n", timestamp);
+  
+  return STATE_OK;  
+}
+#endif
+
+int
+myrecv (void)
+{
+  int i;
+
+#ifdef HAVE_SSL
+  if (use_ssl) {
+    i = SSL_read (ssl, buffer, MAXBUF - 1);
+  }
+  else {
+#endif
+    i = read (sd, buffer, MAXBUF - 1);
+#ifdef HAVE_SSL
+  }
+#endif
+  return i;
+}
+
+int
+myrecv_norm (void)
+{
+  int i;
+  i = read (sd, buffer, MAXBUF - 1);
+  return i;
+}
+
+int 
+my_close (void)
+{
+#ifdef HAVE_SSL
+  if (use_ssl == TRUE) {
+    SSL_shutdown (ssl);
+    SSL_free (ssl);
+    SSL_CTX_free (ctx);
+    return 0;
+  }
+  else {
+#endif
+    return close(sd);
+#ifdef HAVE_SSL
+  }
+#endif
+}
diff --git a/web/attachments/129978-allow_empty_passwords b/web/attachments/129978-allow_empty_passwords
new file mode 100644
index 0000000..f78f247
--- /dev/null
+++ b/web/attachments/129978-allow_empty_passwords
@@ -0,0 +1,24 @@
+--- plugins-scripts/check_disk_smb.pl.old       2005-04-15 16:22:18.000000000 +0200
++++ plugins-scripts/check_disk_smb.pl   2005-04-15 16:25:44.000000000 +0200
+@@ -76,7 +76,7 @@
+ my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/);
+ ($user) || usage("Invalid user: $opt_u\n");
+ 
+-($opt_p) || ($opt_p = shift) || ($opt_p = "guest");
++($opt_p) || ($opt_p = shift) || ($opt_p = "");
+ my $pass = $1 if ($opt_p =~ /(.*)/);
+ 
+ ($opt_w) || ($opt_w = shift) || ($opt_w = 85);
+@@ -123,10 +123,10 @@
+ # Execute an "ls" on the share using smbclient program
+ # get the results into $res
+ if (defined($workgroup)) {
+-       $res = qx/$smbclient \/\/$host\/$share $pass -W $workgroup -U $user $smbclientoptions -c ls/;
++       $res = qx/$smbclient \/\/$host\/$share -W $workgroup -U $user%$pass $smbclientoptions -c ls/;
+ } else {
+        print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
+-       $res = qx/$smbclient \/\/$host\/$share $pass -U $user $smbclientoptions -c ls/;
++       $res = qx/$smbclient \/\/$host\/$share -U $user%$pass $smbclientoptions -c ls/;
+ }
+ #Turn off alarm
+ alarm(0);
diff --git a/web/attachments/130855-NPTest-Final.tar.gz b/web/attachments/130855-NPTest-Final.tar.gz
new file mode 100644
index 0000000..1426e4f
--- /dev/null
+++ b/web/attachments/130855-NPTest-Final.tar.gz
diff --git a/web/attachments/130858-check_time.c.patch b/web/attachments/130858-check_time.c.patch
new file mode 100644
index 0000000..a00fb3d
--- /dev/null
+++ b/web/attachments/130858-check_time.c.patch
@@ -0,0 +1,15 @@
+*** nagios-plugins-1.4/plugins/check_time.c     Sat Dec 25 23:17:44 2004
+--- nagios-plugins-1.4-fixed/plugins/check_time.c       Fri Apr  8 08:15:56 2005
+***************
+*** 34,38 ****
+  #define       UNIX_EPOCH 2208988800UL
+  
+! unsigned long server_time, raw_server_time;
+  time_t diff_time;
+  int warning_time = 0;
+--- 34,38 ----
+  #define       UNIX_EPOCH 2208988800UL
+  
+! uint32_t server_time, raw_server_time;
+  time_t diff_time;
+  int warning_time = 0;
diff --git a/web/attachments/130868-test.pl b/web/attachments/130868-test.pl
new file mode 100644
index 0000000..22d0576
--- /dev/null
+++ b/web/attachments/130868-test.pl
@@ -0,0 +1,51 @@
+#!/usr/bin/perl -w -I .. -I ../..
+#
+# Wrapper for running the test harnesses
+#
+# $Id$
+#
+
+use strict;
+
+use Getopt::Long;
+
+use NPTest qw(DetermineTestHarnessDirectory TestsFrom);
+
+my $tstdir;
+
+if ( ! GetOptions( "testdir:s" => \$tstdir ) )
+{
+  print "Usage: ${0} [--testdir=<directory>] [<test_harness.t> ...]\n";
+  exit 1;
+}
+
+my @tests;
+
+if ( scalar( @ARGV ) )
+{
+  @tests = @ARGV;
+}
+else
+{
+  my $directory = DetermineTestHarnessDirectory( $tstdir );
+
+  if ( !defined( $directory ) )
+  {
+    print STDERR "$0: Unable to determine the test harness directory - ABORTING\n";
+    exit 2;
+  }
+
+  @tests = TestsFrom( $directory, 1 );
+}
+
+if ( ! scalar( @tests ) )
+{
+  print STDERR "$0: Unable to determine the test harnesses to run - ABORTING\n";
+  exit 3;
+}
+
+use Test::Harness;
+
+#$Test::Harness::verbose=1;
+
+runtests( @tests );
diff --git a/web/attachments/131422-diff_check_nt b/web/attachments/131422-diff_check_nt
new file mode 100644
index 0000000..6d0865d
--- /dev/null
+++ b/web/attachments/131422-diff_check_nt
@@ -0,0 +1,230 @@
+--- check_nt.c.original 2005-03-05 04:45:05.000000000 -0500
++++ check_nt.c  2005-04-23 08:35:43.000000000 -0400
+@@ -282,111 +282,74 @@
+                break;
+ 
+        case CHECK_COUNTER:
+-
+-
+-               /* 
+-               CHECK_COUNTER has been modified to provide extensive perfdata information.
+-                       In order to do this, some modifications have been done to the code
+-                       and some constraints have been introduced.
+-                       
+-                       1) For the sake of simplicity of the code, perfdata information will only be 
+-                        provided when the "description" field is added. 
+-                       
+-                       2) If the counter you're going to measure is percent-based, the code will detect
+-                        the percent sign in its name and will attribute minimum (0%) and maximum (100%) 
+-                        values automagically, as well the �%" sign to graph units.
+-
+-                       3) OTOH, if the counter is "absolute", you'll have to provide the following
+-                        the counter unit - that is, the dimensions of the counter you're getting. Examples:
+-                        pages/s, packets transferred, etc.
+-
+-                       4) If you want, you may provide the minimum and maximum values to expect. They aren't mandatory,
+-                        but once specified they MUST have the same order of magnitude and units of -w and -c; otherwise.
+-                        strange things will happen when you make graphs of your data.
+-               */
+-
+-               if (value_list == NULL)
+-                       output_message = strdup (_("No counter specified"));
+-               else
+-               {
+-                       preparelist (value_list);       /* replace , between services with & to send the request */
+-                       isPercent = (strchr (value_list, '%') != NULL);
+-
+-                       strtok (value_list, "&");       /* burn the first parameters */
+-                       description = strtok (NULL, "&");
+-                       counter_unit = strtok (NULL, "&");
+-                       asprintf (&send_buffer, "%s&8&%s", req_password, value_list);
+-                       fetch_data (server_address, server_port, send_buffer);
+-                       counter_value = atof (recv_buffer);
+-
+-
+-                       if (description == NULL)
+-                       asprintf (&output_message, "%.f", counter_value);
+-                       else if (isPercent)
+-                            {  
+-                               counter_unit = strdup ("%");
+-                               allRight = TRUE;
+-                            }
+-
+-                       if ((counter_unit != NULL) && (!allRight))
+-                       {       
+-                               minval = strtok (NULL, "&");
+-                               maxval = strtok (NULL, "&");
+-
+-                               /* All parameters specified. Let's check the numbers */
+-
+-                               fminval = (minval != NULL) ? strtod (minval, &errcvt) : -1;
+-                               fmaxval = (minval != NULL) ? strtod (maxval, &errcvt) : -1;
+-
+-                               if ((fminval == 0) && (minval == errcvt))
+-                                       output_message = strdup (_("Minimum value contains non-numbers"));
+-                               else
+-                               {
+-                                       if ((fmaxval == 0) && (maxval == errcvt))
+-                                               output_message = strdup (_("Maximum value contains non-numbers"));
+-                                       else
+-                                               allRight = TRUE;        /* Everything is OK. */
+-
+-                               }
+-                       }
+-                       else if ((counter_unit == NULL) && (description != NULL))
+-                               output_message = strdup (_("No unit counter specified"));
+-
+-                       if (allRight)
+-                       {
+-                               /* Let's format the output string, finally... */
+-                                       if (strstr(description, "%") == NULL) {
+-                                               asprintf (&output_message, "%s = %.2f %s",                                                                                      description, counter_value, counter_unit);
+-                                       } else {
+-                                               /* has formatting, will segv if wrong */
+-                                       asprintf (&output_message, description, counter_value);
+-                                       }
+-                                       asprintf (&output_message, "%s |", output_message);
+-                               asprintf (&output_message,"%s %s", output_message, 
+-                                               fperfdata (description, counter_value, 
+-                                                       counter_unit, 1, warning_value, 1, critical_value,
+-                                                       (!(isPercent) && (minval != NULL)), fminval,
+-                                                       (!(isPercent) && (minval != NULL)), fmaxval));
+-                       }
+-               }
+-
+-               if (critical_value > warning_value)
+-               {                       /* Normal thresholds */
+-                       if (check_critical_value == TRUE && counter_value >= critical_value)
+-                            return_code = STATE_CRITICAL;
+-                       else if (check_warning_value == TRUE && counter_value >= warning_value)
+-                               return_code = STATE_WARNING;
+-                            else
+-                               return_code = STATE_OK;
+-               }
+-               else
+-               {                       /* inverse thresholds */
+-                       return_code = STATE_OK;
+-                       if (check_critical_value == TRUE && counter_value <= critical_value)
+-                            return_code = STATE_CRITICAL;
+-                       else if (check_warning_value == TRUE && counter_value <= warning_value)
+-                                   return_code = STATE_WARNING;
+-               }
++               /* 

++                *      Check_Counter has been rewriten for NC_Net now it processes the pref data in 

++                *      a more consistent way to the Nagios plug-in development guidelines. 

++                *      1) if no Units of mesurement use a 0 (zero) for the UOM  in the check 

++                *      and the units will be omited from the output.

++                *      2) it will do MIN without a MAX

++                *      3) still processes custom min and max even if it is %

++                *      4) % has a default of min 0, max 100

++                *      5) -w and -c are no longer causing a seg fault. old code said to always

++                *      process both for perf data, but it should have checked that they were in use.

++                *      6) the description is only a label for perf data not a formatter...   

++                ****************************************************************************/

++               if (value_list == NULL)

++                       output_message = strdup (_("No counter specified"));

++               else {

++                       preparelist (value_list);       /* replace , between services with & to send the request */

++

++                       temp_string = strtok (value_list, "&");

++                       isPercent = (strchr (temp_string, '%') != NULL);

++                       description = strtok (NULL, "&");

++                       counter_unit = strtok (NULL, "&");

++                       asprintf (&send_buffer, "%s&8&%s", req_password, value_list);

++                       fetch_data (server_address, server_port, send_buffer);

++                       counter_value = atof (recv_buffer);

++                       if (isPercent)  counter_unit = strdup ("%");

++                       if ( description != NULL && counter_unit == NULL )

++                               counter_unit = strdup ( "0" );

++                       if ( counter_unit != NULL && description != NULL) 

++                       {       

++                               if ( counter_unit[0] == '0' ) counter_unit[0] = '\0';

++                               minval = strtok (NULL, "&");

++                               maxval = strtok (NULL, "&");

++                               if ( minval == NULL && isPercent ) asprintf(&minval,"0");

++                               if ( minval != NULL ) fminval = strtod ( minval, NULL ) ;

++                               if ( maxval == NULL && isPercent ) asprintf(&maxval,"100");

++                               if ( maxval != NULL )   fmaxval = strtod (maxval, NULL);

++                               allRight = TRUE;

++                               /* Let's format the output string, finally... */

++                               asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);

++                               asprintf (&output_message,"%s | %s", output_message, 

++                                               fperfdata (description, counter_value, 

++                                                       counter_unit, check_warning_value, warning_value,

++                                                       check_critical_value, critical_value,

++                                                       (minval != NULL), fminval,

++                                                       (maxval != NULL), fmaxval  ));

++                       }

++                       else if (isPercent)

++                               asprintf(&output_message, "%s = %.2f %%",temp_string,counter_value);

++                       else

++                               asprintf(&output_message, "%s = %.2f",temp_string,counter_value);

++               }

++               if (critical_value > warning_value)

++               {                       /* Normal thresholds */

++                       if (check_critical_value == TRUE && counter_value >= critical_value)

++                            return_code = STATE_CRITICAL;

++                       else if (check_warning_value == TRUE && counter_value >= warning_value)

++                               return_code = STATE_WARNING;

++                            else

++                               return_code = STATE_OK;

++               }

++               else

++               {                       /* inverse thresholds */

++                       return_code = STATE_OK;

++                       if (check_critical_value == TRUE && counter_value <= critical_value)

++                            return_code = STATE_CRITICAL;

++                       else if (check_warning_value == TRUE && counter_value <= warning_value)

++                                   return_code = STATE_WARNING;

++               }

+         break;
+                
+        case CHECK_FILEAGE:
+@@ -394,7 +357,7 @@
+                if (value_list==NULL)
+                        output_message = strdup (_("No counter specified"));
+                else {
+-                       preparelist(value_list);                /* replace , between services with & to send the request */
++                       preparelist(value_list);                /* replace , between services with & to send the request */
+                        asprintf(&send_buffer,"%s&9&%s", req_password,value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+                        age_in_minutes = atoi(strtok(recv_buffer,"&"));
+@@ -672,13 +635,32 @@
+   printf (_("\
+    COUNTER = Check any performance counter of Windows NT/2000.\n\
+      Request a -l parameters with the following syntax:\n\
+-                -l \"\\\\<performance object>\\\\counter\",\"<description>\n\
+-     The <description> parameter is optional and \n\
+-     is given to a printf output command which requires a float parameter.\n\
+-     If <description> does not include \"%%\", it is used as a label.\n\
++     -l \"\\\\<performance object>\\\\counter\"[,\"<Label>\"][,<UOM>][,<MIN>][,<MAX>]\n\
++     The <label> parameter is optional and is used for performance data\n\
++     If <performance object> includes \"%%\", it automaticlly considers %% performanc data.\n\
++     label is the label for performance data\n\
++     If the label is omited then the performance counter object will be used.\n\
++     UOM - Unit of Measurment -if no UOM use a zero 0, \n\
++     a zero tells check_nt to ignore the UOM in the output.\n\
++     examples of UOM- s,us,ms,%%,B,KB,MB,TB,c \n\
++      c- is for continous counter. \n\
++     Min and Max are optional but are used by third party program (RRD) for graphing.\n\
+      Some examples:\n\
+-       \"Paging file usage is %%.2f %%%%\"\n\
+-       \"%%.f %%%% paging file used.\"\n"));
++     -l \"\\Process(_Total)\\Thread Count\",\"Thread Count\",MB,0,1000 -w 5 -c 700\n\
++     Thread Count = 534.00 MB | 'Thread Count'=534.000000MB;5.000000;700.000000;0.000000;1000.000000\n\
++     -l \"\\Paging File(_Total)\\%% Usage\"\n\
++     \\Paging File(_Total)\\%% Usage = 36.61 %%\n\
++     -l \"\\paging file(_total)\\%% usage\"\n\
++     \\paging File(_total)\\%% usage = 36.61 %%\n\
++     -l \"\\paging file(_total)\\%% usage\",\"test1\"\n\
++     test1 = 36.60 % | test1=36.599730%;;;0.000000;100.000000\n\
++     -l \"\\paging file(_total)\\%% usage\",\"test1\",%%,20\n\
++     test1 = 36.60 % | test1=36.599730%;;;20.000000;100.000000\n\
++     -l \"\\Server\\Server Sessions\",\"test SS\",%%\n\
++     test SS = 1.00 %% | 'test SS'=1.000000%%;;;\n\
++     -l  \"\\Server\\Server Sessions\",\"Server Sessions\",0,0,50 -w 20 -c 45\n\
++     Server Sessions = 1.00 c | 'Server Sessions'=1.000000;20.000000;45.000000;0.000000;50.000000\n"));
++  
+   printf (_("Notes:\n\
+  - The NSClient service should be running on the server to get any information\n\
+    (http://nsclient.ready2run.nl).\n\
diff --git a/web/attachments/131931-check_jabber.pl b/web/attachments/131931-check_jabber.pl
new file mode 100644
index 0000000..1176441
--- /dev/null
+++ b/web/attachments/131931-check_jabber.pl
@@ -0,0 +1,97 @@
+#!/usr/bin/perl -w
+##################################################################
+# CHECK_JABBER.PL
+#
+# Jabber Plugin for Nagios
+# License: GPL
+# C.Doblado (cdoblado@pulsartec.com)
+# check_jabber.pl, v1.0 2005/04/27
+#
+#################################################################
+
+use strict;
+use Getopt::Std;
+use Net::Jabber qw(Client);
+
+use lib "/usr/lib/nagios/plugins/";
+use utils qw($TIMEOUT %ERRORS &print_revision);
+
+sub CheckJabber;
+sub Help;
+
+my $PROGNAME = "check_jabber";
+
+
+sub CheckJabber
+{
+ my $host=shift;
+ my $port=shift;
+ my $result;
+ my $con= new Net::Jabber::Client();
+ $con->Connect(hostname=>$host,port=>$port);
+ if ($con->Connected()){
+        $result->{NUM}=1;
+        $result->{MSG}="Jabber server OK at port $port \n";
+        $con->Disconnect();
+ }
+ else {
+  $result->{NUM}=0;
+  $result->{MSG}="Jabber server Error at port $port \n";
+ }
+ return $result;
+}
+
+
+sub Help
+{
+  print_revision($PROGNAME, '$Revision: 1.0 $');
+  print "\nCheckjabber checks the Jabber server status\n";
+  print "Usage:  checkjabber.pl -s server [-p port -v version -h help] \n";
+  print "        (default port is 5222) \n\n";
+}
+
+
+##### Main #####
+
+# TIMEOUT alarm
+$SIG{'ALRM'} = sub {
+                print ("ERROR: No response from server (alarm timeout)\n");
+                exit $ERRORS{"UNKNOWN"};
+};
+alarm($TIMEOUT);
+
+
+# Arguments
+my %options=();
+getopts("s:p:h:v",\%options);
+
+
+# Options
+if (defined $options{s}){
+        if (not defined $options{p}){
+                $options{p}='5222'; # default Jabber port
+        }
+        my $status=CheckJabber($options{s},$options{p});
+        print "$status->{MSG}\n";       
+        if ($status->{NUM}==1) {
+                 exit $ERRORS{"OK"};
+        }
+        elsif ($status->{NUM}==0) {
+                exit $ERRORS{"CRITICAL"};
+        }
+        else {
+                exit $ERRORS{"UNKNOWN"};
+        }
+}
+elsif ($options{v}) {
+  print_revision($PROGNAME, '$Revision: 1.0 $');        
+  exit $ERRORS{"UNKNOWN"};
+}
+else {
+    Help;
+    exit $ERRORS{"UNKNOWN"};
+}
+
+
+
+
diff --git a/web/attachments/133253-patch.diff b/web/attachments/133253-patch.diff
new file mode 100644
index 0000000..373743c
--- /dev/null
+++ b/web/attachments/133253-patch.diff
@@ -0,0 +1,5 @@
+115,116c115
+<       print $dn."\n";
+<       if ( $resp =~ /($dn)/ ) {
+---
+>       if ( $resp =~ /($dn)/i ) {
diff --git a/web/attachments/134273-check_cpu_perfdata.diff b/web/attachments/134273-check_cpu_perfdata.diff
new file mode 100644
index 0000000..c841234
--- /dev/null
+++ b/web/attachments/134273-check_cpu_perfdata.diff
@@ -0,0 +1,31 @@
+--- check_cpu   2005-05-12 15:26:00.273073312 -0700
++++ check_cpu.orig      2005-05-12 15:26:56.617507656 -0700
+@@ -146,25 +146,17 @@
+ ### state,  and exit the plugin.
+ 
+ 
+-# if critical or warning is not set on the command line, then set it to zero
+-# this keeps the performance data from having negative values for warn and crit
+-if critical == -2:
+-       critical = 0
+-if warning == -1:
+-       warning = 0
+-
+-
+ if idleValue <= critical:
+         status = "CPU CRITICAL"
+-        print status + ": CPU is only " + idleCPU + "% idle | CPU_idle=" + idleCPU +"%;" + `warning` + ";" + `critical` + ";"
++        print status + ": CPU is only " + idleCPU + "% idle"
+         sys.exit(2) 
+ elif idleValue <= warning:
+         status = "WARNING"
+-        print status + ": CPU is only " + idleCPU + "% idle | CPU_idle=" + idleCPU +"%;" + `warning` + ";" + `critical` + ";"
++        print status + ": CPU is only " + idleCPU + "% idle"
+         sys.exit(1)
+ elif warning < idleValue:
+         status = "OK"
+-        print status + ": CPU is " + idleCPU + "% idle | CPU_idle=" + idleCPU +"%;" + `warning` + ";" + `critical` + ";"
++        print status + ": CPU is " + idleCPU + "% idle"
+         sys.exit(0)
+ else:
+         status = "CPU STATUS UNKNOWN"
diff --git a/web/attachments/134274-check_mem b/web/attachments/134274-check_mem
new file mode 100644
index 0000000..ed13f25
--- /dev/null
+++ b/web/attachments/134274-check_mem
@@ -0,0 +1,26 @@
+#!/usr/bin/perl -w
+#
+# check_mem v1.0 plugin for nagios
+#
+# uses the output of `free` to find the percentage of memory used
+#
+# Copyright Notice: GPL
+#
+# Garrett Honeycutt - gh@3gupload.com
+#
+ 
+my ($mem_percent) = &sys_stats();
+print "$mem_percent\% Memory Used | MemUsed=$mem_percent\%;0;0;\n";
+exit(0);
+
+sub sys_stats {
+
+   my ($mem_total, $mem_used);
+
+   chomp($mem_total = `free -mt | grep Mem | awk '{print \$2}'`);
+   chomp($mem_used = `free -mt | grep cache | tail -1 | awk '{print \$3}'`);
+
+   my $mem_percent = ($mem_used / $mem_total) * 100;
+
+   return (sprintf("%.0f",$mem_percent));
+}
diff --git a/web/attachments/135799-nagiosplug-wrapper-macros.diff b/web/attachments/135799-nagiosplug-wrapper-macros.diff
new file mode 100644
index 0000000..ce0a0c5
--- /dev/null
+++ b/web/attachments/135799-nagiosplug-wrapper-macros.diff
@@ -0,0 +1,197 @@
+diff -urN ../nagiosplug.orig/plugins/netutils.c ./plugins/netutils.c
+--- ../nagiosplug.orig/plugins/netutils.c       2005-01-05 21:53:22.000000000 +0100
++++ ./plugins/netutils.c        2005-05-24 09:25:09.000000000 +0200
+@@ -39,7 +39,6 @@
+ int was_refused = FALSE;
+ int address_family = AF_UNSPEC;
+ 
+-static int my_connect(const char *address, int port, int *sd, int proto);
+ /* handles socket timeouts */
+ void
+ socket_timeout_alarm_handler (int sig)
+@@ -53,37 +52,6 @@
+ }
+ 
+ 
+-/* connects to a host on a specified TCP port, sends a string,
+-   and gets a response */
+-int
+-process_tcp_request (const char *server_address, int server_port,
+-       const char *send_buffer, char *recv_buffer, int recv_size)
+-{
+-       int result;
+-
+-       result = process_request (server_address, server_port,
+-                       IPPROTO_TCP, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
+-}
+-
+-
+-/* connects to a host on a specified UDP port, sends a string, and gets a
+-    response */
+-int
+-process_udp_request (const char *server_address, int server_port,
+-       const char *send_buffer, char *recv_buffer, int recv_size)
+-{
+-       int result;
+-
+-       result = process_request (server_address, server_port,
+-                       IPPROTO_UDP, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
+-}
+-
+-
+-
+ /* connects to a host on a specified tcp port, sends a string, and gets a 
+         response. loops on select-recv until timeout or eof to get all of a 
+         multi-packet answer */
+@@ -163,6 +131,7 @@
+        return result;
+ }
+ 
++
+ /* connects to a host on a specified port, sends a string, and gets a 
+    response */
+ int
+@@ -186,32 +155,8 @@
+ }
+ 
+ 
+-/* opens a connection to a remote host/tcp port */
+-int
+-my_tcp_connect (const char *host_name, int port, int *sd)
+-{
+-       int result;
+-
+-       result = my_connect (host_name, port, sd, IPPROTO_TCP);
+-
+-       return result;
+-}
+-
+-
+-/* opens a connection to a remote host/udp port */
+-int
+-my_udp_connect (const char *host_name, int port, int *sd)
+-{
+-       int result;
+-
+-       result = my_connect (host_name, port, sd, IPPROTO_UDP);
+-
+-       return result;
+-}
+-
+-
+ /* opens a tcp or udp connection to a remote host */
+-static int
++int
+ my_connect (const char *host_name, int port, int *sd, int proto)
+ {
+        struct addrinfo hints;
+@@ -291,20 +236,6 @@
+ 
+ 
+ int
+-send_tcp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size)
+-{
+-       return send_request (sd, IPPROTO_TCP, send_buffer, recv_buffer, recv_size);
+-}
+-
+-
+-int
+-send_udp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size)
+-{
+-       return send_request (sd, IPPROTO_UDP, send_buffer, recv_buffer, recv_size);
+-}
+-
+-
+-int
+ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size)
+ {
+        int result = STATE_OK;
+@@ -397,28 +328,3 @@
+                return TRUE;
+        }
+ }
+-
+-int
+-is_inet_addr (const char *address)
+-{
+-       return resolve_host_or_addr (address, AF_INET);
+-}
+-
+-#ifdef USE_IPV6
+-int
+-is_inet6_addr (const char *address)
+-{
+-       return resolve_host_or_addr (address, AF_INET6);
+-}
+-#endif
+-
+-int
+-is_hostname (const char *s1)
+-{
+-#ifdef USE_IPV6
+-       return resolve_host_or_addr (s1, address_family);
+-#else
+-       return resolve_host_or_addr (s1, AF_INET);
+-#endif
+-}
+-
+diff -urN ../nagiosplug.orig/plugins/netutils.h ./plugins/netutils.h
+--- ../nagiosplug.orig/plugins/netutils.h       2004-12-02 00:54:51.000000000 +0100
++++ ./plugins/netutils.h        2005-05-24 09:25:35.000000000 +0200
+@@ -38,30 +38,40 @@
+ 
+ RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
+ 
++/* process_request and wrapper macros */
++#define process_tcp_request(addr, port, sbuf, rbuf, rsize) \
++       process_request(addr, port, IPPROTO_TCP, sbuf, rbuf, rsize)
++#define process_udp_request(addr, port, sbuf, rbuf, rsize) \
++       process_request(addr, port, IPPROTO_UDP, sbuf, rbuf, rsize)
+ int process_tcp_request2 (const char *address, int port,
+   const char *sbuffer, char *rbuffer, int rsize);
+-int process_tcp_request (const char *address, int port,
+-  const char *sbuffer, char *rbuffer, int rsize);
+-int process_udp_request (const char *address, int port,
+-  const char *sbuffer, char *rbuffer, int rsize);
+ int process_request (const char *address, int port, int proto,
+   const char *sbuffer, char *rbuffer, int rsize);
+ 
+-int my_tcp_connect (const char *address, int port, int *sd);
+-int my_udp_connect (const char *address, int port, int *sd);
+-
+-int send_tcp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size);
+-int send_udp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size);
++/* my_connect and wrapper macros */
++#define my_tcp_connect(addr, port, s) my_connect(addr, port, s, IPPROTO_TCP)
++#define my_udp_connect(addr, port, s) my_connect(addr, port, s, IPPROTO_UDP)
++int my_connect(const char *address, int port, int *sd, int proto);
++
++/* send_request and wrapper macros */
++#define send_tcp_request(s, sbuf, rbuf, rsize) \
++       send_request(s, IPPROTO_TCP, sbuf, rbuf, rsize)
++#define send_udp_request(s, sbuf, rbuf, rsize) \
++       send_request(s, IPPROTO_UDP, sbuf, rbuf, rsize)
+ int send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size);
+ 
++
++/* "is_*" wrapper macros and functions */
+ int is_host (const char *);
+ int is_addr (const char *);
+ int resolve_host_or_addr (const char *, int);
+-int is_inet_addr (const char *);
++#define is_inet_addr(addr) resolve_host_or_addr(addr, AF_INET)
+ #ifdef USE_IPV6
+-int is_inet6_addr (const char *);
++#  define is_inet6_addr(addr) resolve_host_or_addr(addr, AF_INET6)
++#  define is_hostname(addr) resolve_host_or_addr(addr, address_family)
++#else
++#  define is_hostname(addr) resolve_host_or_addr(addr, AF_INET)
+ #endif
+-int is_hostname (const char *);
+ 
+ extern unsigned int socket_timeout;
+ extern int econn_refuse_state;
diff --git a/web/attachments/135800-nagiosplug-check_tcp-protocol.diff b/web/attachments/135800-nagiosplug-check_tcp-protocol.diff
new file mode 100644
index 0000000..ea63efb
--- /dev/null
+++ b/web/attachments/135800-nagiosplug-check_tcp-protocol.diff
@@ -0,0 +1,139 @@
+diff -urN ../orig.nplg/plugins/check_tcp.c ./plugins/check_tcp.c
+--- ../orig.nplg/plugins/check_tcp.c    2005-05-23 21:55:06.000000000 +0200
++++ ./plugins/check_tcp.c       2005-05-24 21:13:43.000000000 +0200
+@@ -57,11 +57,7 @@
+ int check_certificate (X509 **);
+ #endif
+ 
+-enum {
+-       TCP_PROTOCOL = 1,
+-       UDP_PROTOCOL = 2,
+-       MAXBUF = 1024
+-};
++#define MAXBUF 1024
+ 
+ int process_arguments (int, char **);
+ int my_recv (void);
+@@ -120,7 +116,7 @@
+                SEND = NULL;
+                EXPECT = NULL;
+                QUIT = NULL;
+-               PROTOCOL = UDP_PROTOCOL;
++               PROTOCOL = IPPROTO_UDP;
+                PORT = 0;
+        }
+        else if (strstr (argv[0], "check_tcp")) {
+@@ -129,7 +125,7 @@
+                SEND = NULL;
+                EXPECT = NULL;
+                QUIT = NULL;
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                PORT = 0;
+        }
+        else if (strstr (argv[0], "check_ftp")) {
+@@ -138,7 +134,7 @@
+                SEND = NULL;
+                EXPECT = strdup ("220");
+                QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                PORT = 21;
+        }
+        else if (strstr (argv[0], "check_smtp")) {
+@@ -147,7 +143,7 @@
+                SEND = NULL;
+                EXPECT = strdup ("220");
+                QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                PORT = 25;
+        }
+        else if (strstr (argv[0], "check_pop")) {
+@@ -156,7 +152,7 @@
+                SEND = NULL;
+                EXPECT = strdup ("+OK");
+                QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                PORT = 110;
+        }
+        else if (strstr (argv[0], "check_imap")) {
+@@ -165,7 +161,7 @@
+                SEND = NULL;
+                EXPECT = strdup ("* OK");
+                QUIT = strdup ("a1 LOGOUT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                PORT = 143;
+        }
+ #ifdef HAVE_SSL
+@@ -175,7 +171,7 @@
+                SEND=NULL;
+                EXPECT = strdup ("* OK");
+                QUIT = strdup ("a1 LOGOUT\r\n");
+-               PROTOCOL=TCP_PROTOCOL;
++               PROTOCOL=IPPROTO_TCP;
+                use_ssl=TRUE;
+                PORT=993;
+        }
+@@ -185,7 +181,7 @@
+                SEND=NULL;
+                EXPECT = strdup ("+OK");
+                QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL=TCP_PROTOCOL;
++               PROTOCOL=IPPROTO_TCP;
+                use_ssl=TRUE;
+                PORT=995;
+        }
+@@ -195,7 +191,7 @@
+                SEND=NULL;
+                EXPECT = strdup ("220");
+                QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL=TCP_PROTOCOL;
++               PROTOCOL=IPPROTO_TCP;
+                use_ssl=TRUE;
+                PORT=465;
+        }
+@@ -205,7 +201,7 @@
+                SEND = strdup("<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n");
+                EXPECT = strdup("<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'");
+                QUIT = strdup("</stream:stream>\n");
+-               PROTOCOL=TCP_PROTOCOL;
++               PROTOCOL=IPPROTO_TCP;
+                use_ssl=TRUE;
+                PORT = 5222;
+        }
+@@ -219,7 +215,7 @@
+                server_expect = realloc (server_expect, ++server_expect_count);
+                asprintf (&server_expect[server_expect_count - 1], "201");
+                QUIT = strdup("QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                use_ssl=TRUE;
+                PORT = 563;
+ }
+@@ -235,7 +231,7 @@
+                server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
+                asprintf (&server_expect[server_expect_count - 1], "201");
+                asprintf (&QUIT, "QUIT\r\n");
+-               PROTOCOL = TCP_PROTOCOL;
++               PROTOCOL = IPPROTO_TCP;
+                PORT = 119;
+        }
+        else {
+@@ -288,13 +284,7 @@
+                result = connect_SSL ();
+        else
+ #endif
+-               {
+-                       if (PROTOCOL == UDP_PROTOCOL)
+-                               result = my_udp_connect (server_address, server_port, &sd);
+-                       else
+-                               /* default is TCP */
+-                               result = my_tcp_connect (server_address, server_port, &sd);
+-               }
++               result = my_connect (server_address, server_port, &sd, PROTOCOL);
+ 
+        if (result == STATE_CRITICAL)
+                return STATE_CRITICAL;
diff --git a/web/attachments/136223-nagiosplug-check_load.diff b/web/attachments/136223-nagiosplug-check_load.diff
new file mode 100644
index 0000000..fcccf43
--- /dev/null
+++ b/web/attachments/136223-nagiosplug-check_load.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378820797" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378820797" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378820797" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378820797" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378820797');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1209978&group_id=29880&atid=397599&file_id=136223"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/136226-nagiosplug-check_load.diff b/web/attachments/136226-nagiosplug-check_load.diff
new file mode 100644
index 0000000..2330ab4
--- /dev/null
+++ b/web/attachments/136226-nagiosplug-check_load.diff
@@ -0,0 +1,311 @@
+diff -urN ../orig.nplg/plugins/check_load.c ./plugins/check_load.c
+--- ../orig.nplg/plugins/check_load.c   2005-05-27 15:56:34.000000000 +0200
++++ ./plugins/check_load.c      2005-05-27 18:04:50.000000000 +0200
+@@ -39,37 +39,64 @@
+ #endif /* !defined LOADAVG_1MIN */
+ 
+ 
+-int process_arguments (int argc, char **argv);
+-int validate_arguments (void);
++static int process_arguments (int argc, char **argv);
++static int validate_arguments (void);
+ void print_help (void);
+ void print_usage (void);
+ 
+-float wload1 = -1, wload5 = -1, wload15 = -1;
+-float cload1 = -1, cload5 = -1, cload15 = -1;
++/* strictly for pretty-print usage in loops */
++static const int nums[3] = { 1, 5, 15 };
++
++/* provide some fairly sane defaults */
++double wload[3] = { 0.0, 0.0, 0.0 };
++double cload[3] = { 0.0, 0.0, 0.0 };
++#define la1 la[0]
++#define la5 la[1]
++#define la15 la[2]
+ 
+ char *status_line;
+ 
++static void
++get_threshold(char *arg, double *th)
++{
++       size_t i, n;
++       char *str = arg, *p;
++
++       n = strlen(arg);
++       for(i = 0; i < 3; i++) {
++               th[i] = strtod(str, &p);
++               if(p == str) break;
++
++               str = p + 1;
++               if(n <= (size_t)(str - arg)) break;
++       }
++
++       /* empty argument or non-floatish, so warn about it and die */
++       if(!i) usage (_("Warning threshold must be float or float triplet!\n"));
++
++       if(i != 2) {
++               /* one or more numbers were given, so fill array with last
++                * we got (most likely to NOT produce the least expected result) */
++               for(n = i; n < 3; n++) th[n] = th[i];
++       }
++}
+ 
+ 
+ int
+ main (int argc, char **argv)
+ {
+-       int result = STATE_UNKNOWN;
+-       
+-#if HAVE_GETLOADAVG==1
++       int result;
++       int i;
++
+        double la[3] = { 0.0, 0.0, 0.0 };       /* NetBSD complains about unitialized arrays */
+-#else
+-# if HAVE_PROC_LOADAVG==1
+-       FILE *fp;
+-       char input_buffer[MAX_INPUT_BUFFER];
+-       char *tmp_ptr;
+-# else
++#ifndef HAVE_GETLOADAVG
+        char input_buffer[MAX_INPUT_BUFFER];
++# ifdef HAVE_PROC_LOADAVG
++       FILE *fp;
++       char *str, *next;
+ # endif
+ #endif
+ 
+-       float la1, la5, la15;
+-
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+@@ -77,30 +104,24 @@
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+-#if HAVE_GETLOADAVG==1
++#ifdef HAVE_GETLOADAVG
+        result = getloadavg (la, 3);
+-       if (result == -1)
++       if (result != 3)
+                return STATE_UNKNOWN;
+-       la1 = la[LOADAVG_1MIN];
+-       la5 = la[LOADAVG_5MIN];
+-       la15 = la[LOADAVG_15MIN];
+ #else
+-# if HAVE_PROC_LOADAVG==1
++# ifdef HAVE_PROC_LOADAVG
+        fp = fopen (PROC_LOADAVG, "r");
+        if (fp == NULL) {
+                printf (_("Error opening %s\n"), PROC_LOADAVG);
+                return STATE_UNKNOWN;
+        }
+ 
+-       la1 = la5 = la15 = -1;
+-
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+-               tmp_ptr = strtok (input_buffer, " ");
+-               la1 = atof (tmp_ptr);
+-               tmp_ptr = strtok (NULL, " ");
+-               la5 = atof (tmp_ptr);
+-               tmp_ptr = strtok (NULL, " ");
+-               la15 = atof (tmp_ptr);
++               str = (char *)input_buffer;
++               for(i = 0; i < 3; i++) {
++                       la[i] = strtod(str, &next);
++                       str = next;
++               }
+        }
+ 
+        fclose (fp);
+@@ -125,12 +146,11 @@
+ # endif
+ #endif
+ 
+-
+-       if ((la1 < 0.0) || (la5 < 0.0) || (la15 < 0.0)) {
+-#if HAVE_GETLOADAVG==1
++       if ((la[0] < 0.0) || (la[1] < 0.0) || (la[2] < 0.0)) {
++#ifdef HAVE_GETLOADAVG
+                printf (_("Error in getloadavg()\n"));
+ #else
+-# if HAVE_PROC_LOADAVG==1
++# ifdef HAVE_PROC_LOADAVG
+                printf (_("Error processing %s\n"), PROC_LOADAVG);
+ # else
+                printf (_("Error processing %s\n"), PATH_TO_UPTIME);
+@@ -139,29 +159,30 @@
+                return STATE_UNKNOWN;
+        }
+ 
++       /* we got this far, so assume OK until we've measured */
++       result = STATE_OK;
++
+        asprintf(&status_line, _("load average: %.2f, %.2f, %.2f"), la1, la5, la15);
+ 
+-       if ((la1 >= cload1) || (la5 >= cload5) || (la15 >= cload15))
+-               result = STATE_CRITICAL;
+-       else if ((la1 >= wload1) || (la5 >= wload5) || (la15 >= wload15))
+-               result = STATE_WARNING;
+-       else
+-               result = STATE_OK;
+-
+-       die (result,
+-            "%s - %s|%s %s %s\n",
+-            state_text (result),
+-            status_line,
+-            fperfdata ("load1", la1, "", (int)wload1, wload1, (int)cload1, cload1, TRUE, 0, FALSE, 0),
+-            fperfdata ("load5", la5, "", (int)wload5, wload5, (int)cload5, cload5, TRUE, 0, FALSE, 0),
+-            fperfdata ("load15", la15, "", (int)wload15, wload15, (int)cload15, cload15, TRUE, 0, FALSE, 0));
+-       return STATE_OK;
+-}
++       for(i = 0; i < 3; i++) {
++               if(la[i] > cload[i]) {
++                       result = STATE_CRITICAL;
++                       break;
++               }
++               else if(la[i] > wload[i]) result = STATE_WARNING;
++       }
+ 
++       printf("%s - %s|", state_text(result), status_line);
++       for(i = 0; i < 3; i++)
++               printf("load%d=%.3f;%.3f;%.3f;0; ", nums[i], la[i], wload[i], cload[i]);
++
++       putchar('\n');
++       return result;
++}
+ 
+ 
+ /* process command-line arguments */
+-int
++static int
+ process_arguments (int argc, char **argv)
+ {
+        int c = 0;
+@@ -185,37 +206,11 @@
+                        break;
+ 
+                switch (c) {
+-               case 'w':                                                                       /* warning time threshold */
+-                       if (is_intnonneg (optarg)) {
+-                               wload1 = atof (optarg);
+-                               wload5 = atof (optarg);
+-                               wload15 = atof (optarg);
+-                               break;
+-                       }
+-                       else if (strstr (optarg, ",") &&
+-                                                                sscanf (optarg, "%f,%f,%f", &wload1, &wload5, &wload15) == 3)
+-                               break;
+-                       else if (strstr (optarg, ":") &&
+-                                                        sscanf (optarg, "%f:%f:%f", &wload1, &wload5, &wload15) == 3)
+-                               break;
+-                       else
+-                               usage (_("Warning threshold must be float or float triplet!\n"));
++               case 'w': /* warning time threshold */
++                       get_threshold(optarg, wload);
+                        break;
+-               case 'c':                                                                       /* critical time threshold */
+-                       if (is_intnonneg (optarg)) {
+-                               cload1 = atof (optarg);
+-                               cload5 = atof (optarg);
+-                               cload15 = atof (optarg);
+-                               break;
+-                       }
+-                       else if (strstr (optarg, ",") &&
+-                                                        sscanf (optarg, "%f,%f,%f", &cload1, &cload5, &cload15) == 3)
+-                               break;
+-                       else if (strstr (optarg, ":") &&
+-                                                        sscanf (optarg, "%f:%f:%f", &cload1, &cload5, &cload15) == 3)
+-                               break;
+-                       else
+-                               usage (_("Critical threshold must be float or float triplet!\n"));
++               case 'c': /* critical time threshold */
++                       get_threshold(optarg, cload);
+                        break;
+                case 'V':                                                                       /* version */
+                        print_revision (progname, revision);
+@@ -231,60 +226,38 @@
+        c = optind;
+        if (c == argc)
+                return validate_arguments ();
+-       if (wload1 < 0 && is_nonnegative (argv[c]))
+-               wload1 = atof (argv[c++]);
+-
+-       if (c == argc)
+-               return validate_arguments ();
+-       if (cload1 < 0 && is_nonnegative (argv[c]))
+-               cload1 = atof (argv[c++]);
+-
+-       if (c == argc)
+-               return validate_arguments ();
+-       if (wload5 < 0 && is_nonnegative (argv[c]))
+-               wload5 = atof (argv[c++]);
+-
+-       if (c == argc)
+-               return validate_arguments ();
+-       if (cload5 < 0 && is_nonnegative (argv[c]))
+-               cload5 = atof (argv[c++]);
+ 
+-       if (c == argc)
+-               return validate_arguments ();
+-       if (wload15 < 0 && is_nonnegative (argv[c]))
+-               wload15 = atof (argv[c++]);
+-
+-       if (c == argc)
+-               return validate_arguments ();
+-       if (cload15 < 0 && is_nonnegative (argv[c]))
+-               cload15 = atof (argv[c++]);
++       /* handle the case if both arguments are missing,
++        * but not if only one is given without -c or -w flag */
++       if(c - argc == 2) {
++               get_threshold(argv[c++], wload);
++               get_threshold(argv[c++], cload);
++       }
++       else if(c - argc == 1) {
++               get_threshold(argv[c++], cload);
++       }
+ 
+        return validate_arguments ();
+ }
+ 
+ 
+ 
+-int
++static int
+ validate_arguments (void)
+ {
+-       if (wload1 < 0)
+-               usage (_("Warning threshold for 1-minute load average is not specified\n"));
+-       if (wload5 < 0)
+-               usage (_("Warning threshold for 5-minute load average is not specified\n"));
+-       if (wload15 < 0)
+-               usage (_("Warning threshold for 15-minute load average is not specified\n"));
+-       if (cload1 < 0)
+-               usage (_("Critical threshold for 1-minute load average is not specified\n"));
+-       if (cload5 < 0)
+-               usage (_("Critical threshold for 5-minute load average is not specified\n"));
+-       if (cload15 < 0)
+-               usage (_("Critical threshold for 15-minute load average is not specified\n"));
+-       if (wload1 > cload1)
+-               usage (_("Parameter inconsistency: 1-minute \"warning load\" greater than \"critical load\".\n"));
+-       if (wload5 > cload5)
+-               usage (_("Parameter inconsistency: 5-minute \"warning load\" greater than \"critical load\".\n"));
+-       if (wload15 > cload15)
+-               usage (_("Parameter inconsistency: 15-minute \"warning load\" greater than \"critical load\".\n"));
++       int i = 0;
++
++       /* match cload first, as it will give the most friendly error message
++        * if user hasn't given the -c switch properly */
++       for(i = 0; i < 3; i++) {
++               if(cload[i] < 0)
++                       die (STATE_UNKNOWN, _("Critical threshold for %d-minute load average is not specified\n"), nums[i]);
++               if(wload[i] < 0)
++                       die (STATE_UNKNOWN, _("Warning threshold for %d-minute load average is not specified\n"), nums[i]);
++               if(wload[i] > cload[i])
++                       die (STATE_UNKNOWN, _("Parameter inconsistency: %d-minute \"warning load\" is greater than \"critical load\"\n"), nums[i]);
++       }
++
+        return OK;
+ }
diff --git a/web/attachments/136573-nagiosplug-check_tcp.diff b/web/attachments/136573-nagiosplug-check_tcp.diff
new file mode 100644
index 0000000..0b26f13
--- /dev/null
+++ b/web/attachments/136573-nagiosplug-check_tcp.diff
@@ -0,0 +1,725 @@
+--- ../orig.nplg/plugins/check_tcp.c    2005-05-26 14:12:21.000000000 +0200
++++ plugins/check_tcp.c 2005-05-30 23:45:35.000000000 +0200
+@@ -47,240 +47,206 @@
+ #endif
+ 
+ #ifdef HAVE_SSL
+-int check_cert = FALSE;
+-int days_till_exp;
+-char *randbuff = "";
+-SSL_CTX *ctx;
+-SSL *ssl;
+-X509 *server_cert;
+-int connect_SSL (void);
+-int check_certificate (X509 **);
++static int check_cert = FALSE;
++static int days_till_exp;
++static char *randbuff = "";
++static SSL_CTX *ctx;
++static SSL *ssl;
++static X509 *server_cert;
++static int connect_SSL (void);
++static int check_certificate (X509 **);
++# define my_recv(buf, len) ((flags & FLAG_SSL) ? SSL_read(ssl, buf, len) : read(sd, buf, len))
++#else
++# define my_recv(buf, len) read(sd, buf, len)
+ #endif
+ 
+-#define MAXBUF 1024
+ 
+-int process_arguments (int, char **);
+-int my_recv (void);
++/* int my_recv(char *, size_t); */
++static int process_arguments (int, char **);
+ void print_help (void);
+ void print_usage (void);
+ 
+-char *SERVICE = NULL;
+-char *SEND = NULL;
+-char *EXPECT = NULL;
+-char *QUIT = NULL;
+-int PROTOCOL = 0;
+-int PORT = 0;
+-
+-char timestamp[17] = "";
+-int server_port = 0;
+-char *server_address = NULL;
+-char *server_send = NULL;
+-char *server_quit = NULL;
+-char **server_expect = NULL;
+-size_t server_expect_count = 0;
+-int maxbytes = 0;
+-char **warn_codes = NULL;
+-size_t warn_codes_count = 0;
+-char **crit_codes = NULL;
+-size_t crit_codes_count = 0;
+-unsigned int delay = 0;
+-double warning_time = 0;
+-int check_warning_time = FALSE;
+-double critical_time = 0;
+-int check_critical_time = FALSE;
+-int hide_output = FALSE;
+-double elapsed_time = 0;
+-long microsec;
+-int verbose = FALSE;
+-int use_ssl = FALSE;
+-int sd = 0;
+-char *buffer;
+-int expect_mismatch_state = STATE_WARNING;
+-int exact_matching = TRUE;
++#define EXPECT server_expect[0]
++static char *SERVICE = "TCP";
++static char *SEND = NULL
++static char *QUIT = NULL;
++static int PROTOCOL = IPPROTO_TCP; /* most common is default */
++static int PORT = 0;
++
++static char timestamp[17] = "";
++static int server_port = 0;
++static char *server_address = NULL;
++static char *server_send = NULL;
++static char *server_quit = NULL;
++static char **server_expect;
++static size_t server_expect_count = 0;
++static size_t maxbytes = 0;
++static char **warn_codes = NULL;
++static size_t warn_codes_count = 0;
++static char **crit_codes = NULL;
++static size_t crit_codes_count = 0;
++static unsigned int delay = 0;
++static double warning_time = 0;
++static double critical_time = 0;
++static double elapsed_time = 0;
++static long microsec;
++static int sd = 0;
++#define MAXBUF 1024
++static char buffer[MAXBUF];
++static int expect_mismatch_state = STATE_WARNING;
++
++#define FLAG_SSL 0x01
++#define FLAG_VERBOSE 0x02
++#define FLAG_EXACT_MATCH 0x04
++#define FLAG_TIME_WARN 0x08
++#define FLAG_TIME_CRIT 0x10
++#define FLAG_HIDE_OUTPUT 0x20
++static size_t flags = FLAG_EXACT_MATCH;
+ 
+ int
+ main (int argc, char **argv)
+ {
+        int result = STATE_UNKNOWN;
+        int i;
+-       char *status;
++       char *status = NULL;
+        struct timeval tv;
++       size_t len, match = -1;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       if (strstr (argv[0], "check_udp")) {
+-               progname = strdup ("check_udp");
+-               SERVICE = strdup ("UDP");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               QUIT = NULL;
++       /* determine program- and service-name quickly */
++       progname = strrchr(argv[0], '/');
++       if(progname != NULL) progname++;
++       else progname = argv[0];
++
++       len = strlen(progname);
++       if(len > 6 && !memcmp(progname, "check_", 6)) {
++               SERVICE = progname + 6;
++               for(i = 0; i < len - 6; i++)
++                       SERVICE[i] = toupper(SERVICE[i]);
++       }
++
++       /* set up a resonable buffer at first (will be realloc()'ed if
++        * user specifies other options) */
++       server_expect = calloc(sizeof(char *), 2);
++
++       /* determine defaults for this service's protocol */
++       if (!strncmp(SERVICE, "UDP", 3)) {
+                PROTOCOL = IPPROTO_UDP;
+-               PORT = 0;
+        }
+-       else if (strstr (argv[0], "check_tcp")) {
+-               progname = strdup ("check_tcp");
+-               SERVICE = strdup ("TCP");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               QUIT = NULL;
+-               PROTOCOL = IPPROTO_TCP;
+-               PORT = 0;
+-       }
+-       else if (strstr (argv[0], "check_ftp")) {
+-               progname = strdup ("check_ftp");
+-               SERVICE = strdup ("FTP");
+-               SEND = NULL;
+-               EXPECT = strdup ("220");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = IPPROTO_TCP;
++       else if (!strncmp(SERVICE, "FTP", 3)) {
++               EXPECT = "220";
++               QUIT = "QUIT\r\n";
+                PORT = 21;
+        }
+-       else if (strstr (argv[0], "check_smtp")) {
+-               progname = strdup ("check_smtp");
+-               SERVICE = strdup ("SMTP");
+-               SEND = NULL;
+-               EXPECT = strdup ("220");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = IPPROTO_TCP;
+-               PORT = 25;
+-       }
+-       else if (strstr (argv[0], "check_pop")) {
+-               progname = strdup ("check_pop");
+-               SERVICE = strdup ("POP");
+-               SEND = NULL;
+-               EXPECT = strdup ("+OK");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL = IPPROTO_TCP;
++       else if (!strncmp(SERVICE, "POP", 3) || !strncmp(SERVICE, "POP3", 4)) {
++               EXPECT = "+OK";
++               QUIT = "QUIT\r\n";
+                PORT = 110;
+        }
+-       else if (strstr (argv[0], "check_imap")) {
+-               progname = strdup ("check_imap");
+-               SERVICE = strdup ("IMAP");
+-               SEND = NULL;
+-               EXPECT = strdup ("* OK");
+-               QUIT = strdup ("a1 LOGOUT\r\n");
+-               PROTOCOL = IPPROTO_TCP;
++       else if (!strncmp(SERVICE, "SMTP", 4)) {
++               EXPECT = "220";
++               QUIT = "QUIT\r\n";
++               PORT = 25;
++       }
++       else if (!strncmp(SERVICE, "IMAP", 4)) {
++               EXPECT = "* OK";
++               QUIT = "a1 LOGOUT\r\n";
+                PORT = 143;
+        }
+ #ifdef HAVE_SSL
+-       else if (strstr(argv[0],"check_simap")) {
+-               progname = strdup ("check_simap");
+-               SERVICE = strdup ("SIMAP");
+-               SEND=NULL;
+-               EXPECT = strdup ("* OK");
+-               QUIT = strdup ("a1 LOGOUT\r\n");
+-               PROTOCOL=IPPROTO_TCP;
+-               use_ssl=TRUE;
+-               PORT=993;
+-       }
+-       else if (strstr(argv[0],"check_spop")) {
+-               progname = strdup ("check_spop");
+-               SERVICE = strdup ("SPOP");
+-               SEND=NULL;
+-               EXPECT = strdup ("+OK");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL=IPPROTO_TCP;
+-               use_ssl=TRUE;
+-               PORT=995;
+-       }
+-       else if (strstr(argv[0],"check_ssmtp")) {
+-               progname = strdup ("check_ssmtp");
+-               SERVICE = strdup ("SSMTP");
+-               SEND=NULL;
+-               EXPECT = strdup ("220");
+-               QUIT = strdup ("QUIT\r\n");
+-               PROTOCOL=IPPROTO_TCP;
+-               use_ssl=TRUE;
+-               PORT=465;
+-       }
+-       else if (strstr(argv[0],"check_jabber")) {
+-               progname = strdup("check_jabber");
+-               SERVICE = strdup("JABBER");
+-               SEND = strdup("<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n");
+-               EXPECT = strdup("<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'");
+-               QUIT = strdup("</stream:stream>\n");
+-               PROTOCOL=IPPROTO_TCP;
+-               use_ssl=TRUE;
++       else if (!strncmp(SERVICE, "SIMAP", 5)) {
++               EXPECT = "* OK";
++               QUIT = "a1 LOGOUT\r\n";
++               flags |= FLAG_SSL;
++               PORT = 993;
++       }
++       else if (!strncmp(SERVICE, "SPOP", 4)) {
++               EXPECT = "+OK";
++               QUIT = "QUIT\r\n";
++               flags |= FLAG_SSL;
++               PORT = 995;
++       }
++       else if (!strncmp(SERVICE, "SSMTP", 5)) {
++               EXPECT = "220";
++               QUIT = "QUIT\r\n";
++               flags |= FLAG_SSL;
++               PORT = 465;
++       }
++       else if (!strncmp(SERVICE, "JABBER", 6)) {
++               SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
++               EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
++               QUIT = "</stream:stream>\n";
++               flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
+                PORT = 5222;
+        }
+-       else if (strstr (argv[0], "check_nntps")) {
+-               progname = strdup("check_nntps");
+-               SERVICE = strdup("NNTPS");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               server_expect = realloc (server_expect, ++server_expect_count);
+-               asprintf (&server_expect[server_expect_count - 1], "200");
+-               server_expect = realloc (server_expect, ++server_expect_count);
+-               asprintf (&server_expect[server_expect_count - 1], "201");
+-               QUIT = strdup("QUIT\r\n");
+-               PROTOCOL = IPPROTO_TCP;
+-               use_ssl=TRUE;
++       else if (!strncmp (SERVICE, "NNTPS", 5)) {
++               server_expect_count = 2;
++               server_expect[0] = "200";
++               server_expect[1] = "201";
++               QUIT = "QUIT\r\n";
++               flags |= FLAG_SSL;
+                PORT = 563;
+-}
+-
++       }
+ #endif
+-       else if (strstr (argv[0], "check_nntp")) {
+-               progname = strdup ("check_nntp");
+-               SERVICE = strdup ("NNTP");
+-               SEND = NULL;
+-               EXPECT = NULL;
+-               server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
+-               asprintf (&server_expect[server_expect_count - 1], "200");
+-               server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
+-               asprintf (&server_expect[server_expect_count - 1], "201");
+-               asprintf (&QUIT, "QUIT\r\n");
+-               PROTOCOL = IPPROTO_TCP;
++       else if (!strncmp (SERVICE, "NNTP", 4)) {
++               server_expect_count = 2;
++               server_expect = malloc(sizeof(char *) * server_expect_count);
++               server_expect[0] = strdup("200");
++               server_expect[1] = strdup("201");
++               QUIT = "QUIT\r\n";
+                PORT = 119;
+        }
+-       else {
+-               progname = strdup ("check_tcp");
++       /* fallthrough check, so it's supposed to use reverse matching */
++       else if (strcmp (SERVICE, "TCP"))
+                usage (_("CRITICAL - Generic check_tcp called with unknown service\n"));
+-       }
+ 
+-       server_address = strdup ("127.0.0.1");
++       server_address = "127.0.0.1";
+        server_port = PORT;
+        server_send = SEND;
+        server_quit = QUIT;
+-       status = strdup ("");
++       status = NULL;
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+-       /* use default expect if none listed in process_arguments() */
+-       if (EXPECT && server_expect_count == 0) {
+-               server_expect = malloc (sizeof (char *) * (++server_expect_count));
+-               server_expect[server_expect_count - 1] = EXPECT;
++       if(flags & FLAG_VERBOSE) {
++               printf("Using service %s\n", SERVICE);
++               printf("Port: %d\n", PORT);
++               printf("flags: 0x%x\n", flags);
+        }
+ 
+-       /* initialize alarm signal handling */
+-       signal (SIGALRM, socket_timeout_alarm_handler);
++       if(EXPECT && !server_expect_count)
++               server_expect_count++;
+ 
+-       /* set socket timeout */
++       /* set up the timer */
++       signal (SIGALRM, socket_timeout_alarm_handler);
+        alarm (socket_timeout);
+ 
+        /* try to connect to the host at the given port number */
+        gettimeofday (&tv, NULL);
+ #ifdef HAVE_SSL
+-       if (use_ssl && check_cert == TRUE) {
+-         if (connect_SSL () != OK)
+-           die (STATE_CRITICAL,_("CRITICAL - Could not make SSL connection\n"));
+-         if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
+-           result = check_certificate (&server_cert);
+-           X509_free(server_cert);
+-         }
+-         else {
+-           printf(_("CRITICAL - Cannot retrieve server certificate.\n"));
+-           result = STATE_CRITICAL;
+-         }
+-         SSL_shutdown (ssl);
+-         SSL_free (ssl);
+-         SSL_CTX_free (ctx);
+-         close (sd);
+-         return result;
++       if (flags & FLAG_SSL && check_cert == TRUE) {
++               if (connect_SSL () != OK)
++                       die (STATE_CRITICAL,_("CRITICAL - Could not make SSL connection\n"));
++               if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
++                       result = check_certificate (&server_cert);
++                       X509_free(server_cert);
++               }
++               else {
++                       printf(_("CRITICAL - Cannot retrieve server certificate.\n"));
++                       result = STATE_CRITICAL;
++               }
++
++               SSL_shutdown (ssl);
++               SSL_free (ssl);
++               SSL_CTX_free (ctx);
++               close (sd);
++               return result;
+        }
+-       else if (use_ssl)
++       else if (flags & FLAG_SSL)
+                result = connect_SSL ();
+        else
+ #endif
+@@ -290,9 +256,8 @@
+                return STATE_CRITICAL;
+ 
+        if (server_send != NULL) {              /* Something to send? */
+-               asprintf (&server_send, "%s\r\n", server_send);
+ #ifdef HAVE_SSL
+-               if (use_ssl)
++               if (flags & FLAG_SSL)
+                        SSL_write(ssl, server_send, (int)strlen(server_send));
+                else
+ #endif
+@@ -304,63 +269,71 @@
+                sleep (delay);
+        }
+ 
+-       if (server_send || server_expect_count > 0) {
++       if(flags & FLAG_VERBOSE) {
++               printf("server_expect_count: %d\n", server_expect_count);
++               for(i = 0; i < server_expect_count; i++)
++                       printf("\t%d: %s\n", i, server_expect[i]);
++       }
++
++       /* if(len) later on, we know we have a non-NULL response */
++       len = 0;
++       if (server_expect_count) {
+ 
+-               buffer = malloc (MAXBUF);
+-               memset (buffer, '\0', MAXBUF);
+                /* watch for the expect string */
+-               while ((i = my_recv ()) > 0) {
+-                       buffer[i] = '\0';
+-                       asprintf (&status, "%s%s", status, buffer);
+-                       if (buffer[i-1] == '\n') {
+-                               if (buffer[i-2] == '\r' || i < MAXBUF-1)
+-                                       break;
+-                       }
+-                       if (maxbytes>0 && strlen(status) >= (unsigned)maxbytes)
++               while ((i = my_recv(buffer, sizeof(buffer))) > 0) {
++                       status = realloc(status, len + i + 1);
++                       memcpy(&status[len], buffer, i);
++                       len += i;
++
++                       /* stop reading if user-forced or data-starved */
++                       if(i < sizeof(buffer) || (maxbytes && len >= maxbytes))
++                               break;
++
++                       if (maxbytes && len >= maxbytes)
+                                break;
+                }
+ 
+-               /* return a CRITICAL status if we couldn't read any data */
+-               if (strlen(status) == 0)
++               /* no data when expected, so return critical */
++               if (len == 0)
+                        die (STATE_CRITICAL, _("No data received from host\n"));
+ 
+-               strip (status);
+-
+-               if (status && verbose)
+-                       printf ("%s\n", status);
+-
+-               if (server_expect_count > 0) {
+-                       for (i = 0;; i++) {
+-                               if (verbose)
+-                                       printf ("%d %d\n", i, (int)server_expect_count);
+-                               if (i >= (int)server_expect_count)
+-                                       die (expect_mismatch_state, _("Unexpected response from host: %s\n"), status);
+-                               /* default expect gets exact matching */
+-                               if (exact_matching) {
+-                                       if (strncmp(status, server_expect[i], strlen(server_expect[i])) == 0)
+-                                               break;
+-                               } else {
+-                                       if (strstr (status, server_expect[i]))
+-                                               break;
+-                               }
++               /* force null-termination and strip whitespace from end of output */
++               status[len--] = '\0';
++               /* print raw output if we're debugging */
++               if(flags & FLAG_VERBOSE)
++                       printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n",
++                              len + 1, status);
++               while(isspace(status[len])) status[len--] = '\0';
++
++               for (i = 0; i < server_expect_count; i++) {
++                       match = -2;             /* tag it so we know if we tried and failed */
++                       if (flags & FLAG_VERBOSE)
++                               printf ("looking for [%s] %s [%s]\n", server_expect[i],
++                                       (flags & FLAG_EXACT_MATCH) ? "in beginning of" : "anywhere in",
++                                       status);
++
++                       /* match it. math first in short-circuit */
++                       if ((flags & FLAG_EXACT_MATCH && !strncmp(status, server_expect[i], strlen(server_expect[i]))) ||
++                           (!(flags & FLAG_EXACT_MATCH) && strstr(status, server_expect[i])))
++                       {
++                               if(flags & FLAG_VERBOSE) puts("found it");
++                               match = i;
++                               break;
+                        }
+                }
+        }
+ 
+        if (server_quit != NULL) {
+ #ifdef HAVE_SSL
+-               if (use_ssl) {
++               if (flags & FLAG_SSL) {
+                        SSL_write (ssl, server_quit, (int)strlen(server_quit));
+                        SSL_shutdown (ssl);
+                        SSL_free (ssl);
+                        SSL_CTX_free (ctx);
+                }
+-               else {
++               else
+ #endif
+                        send (sd, server_quit, strlen (server_quit), 0);
+-#ifdef HAVE_SSL
+-               }
+-#endif
+        }
+ 
+        /* close the connection */
+@@ -370,37 +343,53 @@
+        microsec = deltime (tv);
+        elapsed_time = (double)microsec / 1.0e6;
+ 
+-       if (check_critical_time == TRUE && elapsed_time > critical_time)
++       if (flags & FLAG_TIME_CRIT && elapsed_time > critical_time)
+                result = STATE_CRITICAL;
+-       else if (check_warning_time == TRUE && elapsed_time > warning_time)
++       else if (flags & FLAG_TIME_WARN && elapsed_time > warning_time)
++               result = STATE_WARNING;
++
++       /* did we get the response we hoped? */
++       if(match == -2 && result != STATE_CRITICAL)
+                result = STATE_WARNING;
+ 
+        /* reset the alarm */
+        alarm (0);
+ 
+-       printf
+-               (_("%s %s%s - %.3f second response time on port %d"),
+-                SERVICE,
+-                state_text (result),
+-                (was_refused) ? " (refused)" : "",
+-                elapsed_time, server_port);
++       /* this is a bit stupid, because we don't want to print the
++        * response time (which can look ok to the user) if we didn't get
++        * the response we were looking for. if-else */
++       printf(_("%s %s - "), SERVICE, state_text(result));
+ 
+-       if (hide_output == FALSE && status && strlen(status) > 0)
++       if(match == -2 && len && !(flags & FLAG_HIDE_OUTPUT))
++               printf("Unexpected response from host: %s", status);
++       else
++               printf("%.3f second response time on port %d",
++                      elapsed_time, server_port);
++
++       if (match != -2 && !(flags & FLAG_HIDE_OUTPUT) && len)
+                printf (" [%s]", status);
+ 
+-       printf (" |%s\n", fperfdata ("time", elapsed_time, "s",
+-               TRUE, warning_time,
+-               TRUE, critical_time,
+-               TRUE, 0,
+-               TRUE, socket_timeout));
++       /* perf-data doesn't apply when server doesn't talk properly,
++        * so print all zeroes on warn and crit */
++       if(match == -2)
++               printf ("|time=%fs;0.0;0.0;0.0;0.0", elapsed_time);
++       else
++               printf("|%s",
++                               fperfdata ("time", elapsed_time, "s",
++                                  TRUE, warning_time,
++                                  TRUE, critical_time,
++                                  TRUE, 0,
++                                  TRUE, socket_timeout)
++                     );
+ 
++       putchar('\n');
+        return result;
+ }
+ 
+ 
+ 
+ /* process command-line arguments */
+-int
++static int
+ process_arguments (int argc, char **argv)
+ {
+        int c;
+@@ -472,7 +461,7 @@
+                        print_revision (progname, revision);
+                        exit (STATE_OK);
+                case 'v':                 /* verbose mode */
+-                       verbose = TRUE;
++                       flags |= FLAG_VERBOSE;
+                        break;
+                case '4':
+                        address_family = AF_INET;
+@@ -494,17 +483,17 @@
+                                usage4 (_("Critical threshold must be a positive integer"));
+                        else
+                                critical_time = strtod (optarg, NULL);
+-                       check_critical_time = TRUE;
++                       flags |= FLAG_TIME_CRIT;
+                        break;
+                case 'j':                 /* hide output */
+-                       hide_output = TRUE;
++                       flags |= FLAG_HIDE_OUTPUT;
+                        break;
+                case 'w':                 /* warning */
+                        if (!is_intnonneg (optarg))
+                                usage4 (_("Warning threshold must be a positive integer"));
+                        else
+                                warning_time = strtod (optarg, NULL);
+-                       check_warning_time = TRUE;
++                       flags |= FLAG_TIME_WARN;
+                        break;
+                case 'C':
+                        crit_codes = realloc (crit_codes, ++crit_codes_count);
+@@ -531,7 +520,7 @@
+                        break;
+                case 'e': /* expect string (may be repeated) */
+                        EXPECT = NULL;
+-                       exact_matching = FALSE;
++                       flags &= ~FLAG_EXACT_MATCH;
+                        if (server_expect_count == 0)
+                                server_expect = malloc (sizeof (char *) * (++server_expect_count));
+                        else
+@@ -542,7 +531,7 @@
+                        if (!is_intpos (optarg))
+                                usage4 (_("Maxbytes must be a positive integer"));
+                        else
+-                               maxbytes = atoi (optarg);
++                               maxbytes = strtol (optarg, NULL, 0);
+                case 'q':
+                        asprintf(&server_quit, "%s\r\n", optarg);
+                        break;
+@@ -572,16 +561,19 @@
+                        else
+                                usage4 (_("Delay must be a positive integer"));
+                        break;
+-                 case 'D': /* Check SSL cert validity - days 'til certificate expiration */
++               case 'D': /* Check SSL cert validity - days 'til certificate expiration */
+ #ifdef HAVE_SSL
+                        if (!is_intnonneg (optarg))
+                                usage2 (_("Invalid certificate expiration period"), optarg);
+                        days_till_exp = atoi (optarg);
+                        check_cert = TRUE;
+-                       use_ssl = TRUE;
++                       flags |= FLAG_SSL;
+                        break;
++#endif
++                       /* fallthrough if we don't have ssl */
+                case 'S':
+-                       use_ssl = TRUE;
++#ifdef HAVE_SSL
++                       flags |= FLAG_SSL;
+ #else
+                        die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
+ #endif
+@@ -596,9 +588,9 @@
+ }
+ 
+ 
+-
++/* SSL-specific functions */
+ #ifdef HAVE_SSL
+-int
++static int
+ connect_SSL (void)
+ {
+   SSL_METHOD *meth;
+@@ -649,12 +641,8 @@
+ 
+   return STATE_CRITICAL;
+ }
+-#endif
+-
+-
+ 
+-#ifdef HAVE_SSL
+-int
++static int
+ check_certificate (X509 ** certificate)
+ {
+   ASN1_STRING *tm;
+@@ -727,29 +715,7 @@
+ 
+         return STATE_OK;
+ }
+-#endif
+-
+-
+-
+-int
+-my_recv (void)
+-{
+-       int i;
+-
+-#ifdef HAVE_SSL
+-       if (use_ssl) {
+-               i = SSL_read (ssl, buffer, MAXBUF - 1);
+-       }
+-       else {
+-#endif
+-               i = read (sd, buffer, MAXBUF - 1);
+-#ifdef HAVE_SSL
+-       }
+-#endif
+-
+-       return i;
+-}
+-
++#endif /* HAVE_SSL */
+ 
+ 
+ void
+@@ -809,7 +775,6 @@
+ }
+ 
+ 
+-
+ void
+ print_usage (void)
+ {
+@@ -818,5 +783,6 @@
+                   [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+                   [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+                   [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
+-                  [-D <days to cert expiry>] [-S <use SSL>]\n", progname);               
++                  [-D <days to cert expiry>] [-S <use SSL>]\n", progname);
+ }
++
diff --git a/web/attachments/136655-nagiosplug-common_h-sanity.diff b/web/attachments/136655-nagiosplug-common_h-sanity.diff
new file mode 100644
index 0000000..187f298
--- /dev/null
+++ b/web/attachments/136655-nagiosplug-common_h-sanity.diff
@@ -0,0 +1,116 @@
+diff -urN ../orig.nplg/plugins/common.h ./plugins/common.h
+--- ../orig.nplg/plugins/common.h       2004-12-10 11:42:00.000000000 +0100
++++ ./plugins/common.h  2005-05-31 14:34:48.000000000 +0200
+@@ -32,7 +32,17 @@
+  *
+  *****************************************************************************/
+ 
+-#include "config.h"
++#ifndef NAGIOSPLUG_COMMON_H
++#define NAGIOSPLUG_COMMON_H
++
++/* For non-GNU compilers to ignore __attribute__
++ * This must be here so that imported GNU headers can be used with non-gnu
++ * compilers and so we can safely (and properly) put prototypes here. */
++#ifndef __GNUC__
++# define __attribute__(x) /* do nothing */
++#endif
++
++# include "config.h"
+ 
+ #ifdef HAVE_FEATURES_H
+ #include <features.h>
+@@ -131,19 +141,25 @@
+ #endif
+ 
+ #ifndef HAVE_ASPRINTF
+-int asprintf(char **strp, const char *fmt, ...);
++int asprintf(char **strp, const char *fmt, ...)
++       __attribute__((__format__(__printf__, 2, 3)));
+ #endif
+ 
++/*
+ #ifndef HAVE_VASPRINTF
+-/* int vasprintf(char **strp, const char *fmt, va_list ap); */
++int vasprintf(char **strp, const char *fmt, va_list ap)
++       __attribute__((__format__(__printf__, 2, 0)));
+ #endif
++*/
+ 
+ #ifndef HAVE_SNPRINTF
+-int snprintf(char *str, size_t size, const  char  *format, ...);
++int snprintf(char *str, size_t size, const  char  *format, ...)
++       __attribute__((__format__(__printf__, 3, 4)));
+ #endif
+ 
+ #ifndef HAVE_VSNPRINTF
+-int vsnprintf(char *str, size_t size, const char  *format, va_list ap);
++int vsnprintf(char *str, size_t size, const char  *format, va_list ap)
++       __attribute__((__format__(__printf__, 3, 0)));
+ #endif
+ 
+ /*
+@@ -152,32 +168,31 @@
+  *
+  */
+ 
+-enum {
+-       OK = 0,
+-       ERROR = -1
+-};
++/* These should be macros so they never have to be fetched
++ * from a different data-segment than the code evaluating it (which is
++ * bizarrely expensive on some weird architectures). It also makes it
++ * easier to develop and implement additional API's without mucking about
++ * with the "official" code (#ifdef STATE_CRITICAL etc).
++ */
++#define OK 0
++#define ERROR -1
+ 
+ /* AIX seems to have this defined somewhere else */
+ #ifndef FALSE
+-enum {
+-       FALSE,
+-       TRUE
+-};
+-#endif
+-
+-enum {
+-       STATE_OK,
+-       STATE_WARNING,
+-       STATE_CRITICAL,
+-       STATE_UNKNOWN,
+-       STATE_DEPENDENT
+-};
+-
+-enum {
+-       DEFAULT_SOCKET_TIMEOUT = 10,     /* timeout after 10 seconds */
+-       MAX_INPUT_BUFFER = 1024,             /* max size of most buffers we use */
+-       MAX_HOST_ADDRESS_LENGTH = 256    /* max size of a host address */
+-};
++# define FALSE 0
++# define TRUE 1
++#endif
++
++#define        STATE_OK 0
++#define STATE_WARNING 1
++#define STATE_CRITICAL 2
++#define STATE_UNKNOWN 3
++#define STATE_DEPENDENT 4
++#define STATE_OOB 5        /* status out of bounds. Must be last */
++
++#define DEFAULT_SOCKET_TIMEOUT 10    /* timeout after 10 seconds */
++#define MAX_INPUT_BUFFER 1024        /* max size of most buffers we use */
++#define MAX_HOST_ADDRESS_LENGTH 256     /* max size of a host address */
+ 
+ /*
+  *
+@@ -187,7 +202,4 @@
+ #include "gettext.h"
+ #define _(String) gettext (String)
+ 
+-/* For non-GNU compilers to ignore __attribute__ */
+-#ifndef __GNUC__
+-# define __attribute__(x) /* do nothing */
+-#endif
++#endif /* NAGIOSPLUG_COMMON_H */
diff --git a/web/attachments/136758-mmmm b/web/attachments/136758-mmmm
new file mode 100644
index 0000000..768eb35
--- /dev/null
+++ b/web/attachments/136758-mmmm
@@ -0,0 +1,75 @@
+*** check_snmp.c.old    Tue May 31 22:09:23 2005
+--- check_snmp.c        Tue May 31 23:35:45 2005
+***************
+*** 336,341 ****
+--- 336,342 ----
+  
+                i++;
+  
++               /* I think this declaration here is bad syntax, and compilation fails */
+                char *str[MAX_INPUT_BUFFER];
+                asprintf(str, "=%s%s;;;; ", show, type ? type : "");
+                strcat(perfstr, *str);
+***************
+*** 376,381 ****
+--- 377,383 ----
+        char *ptr;
+        int c = 1;
+        int j = 0, jj = 0, ii = 0;
++       int needmibs = FALSE;
+  
+        int option = 0;
+        static struct option longopts[] = {
+***************
+*** 510,515 ****
+--- 512,525 ----
+                                retries = atoi(optarg);
+                        break;
+                case 'o':                                                                       /* object identifier */
++                       if ( strspn( optarg, "0123456789." ) != strlen( optarg ) ) {
++                               /*
++                                * we have something other than digits and periods, so we
++                                * have a mib variable, rather than just an SNMP OID, so
++                                * we have to actually read the mib files
++                                */
++                               needmibs = TRUE;
++                       }
+                        for (ptr = optarg; (ptr = index (ptr, ',')); ptr++)
+                                ptr[0] = ' '; /* relpace comma with space */
+                        for (ptr = optarg; (ptr = index (ptr, ' ')); ptr++)
+***************
+*** 628,633 ****
+--- 638,646 ----
+        if (community == NULL)
+                community = strdup (DEFAULT_COMMUNITY);
+  
++       if ( ! needmibs )
++               miblist = "''";         /* don't read any MIB files */
++ 
+        return validate_arguments ();
+  }
+  
+***************
+*** 913,921 ****
+        /* OID Stuff */
+        printf (_("\
+   -o, --oid=OID(s)\n\
+!     Object identifier(s) whose value you wish to query\n\
+   -m, --miblist=STRING\n\
+!     List of MIBS to be loaded (default = ALL)\n -d, --delimiter=STRING\n\
+      Delimiter to use when parsing returned data. Default is \"%s\"\n\
+      Any data on the right hand side of the delimiter is considered\n\
+      to be the data that should be used in the evaluation.\n"), DEFAULT_DELIMITER);
+--- 926,937 ----
+        /* OID Stuff */
+        printf (_("\
+   -o, --oid=OID(s)\n\
+!     Object identifier(s) or SNMP variables whose value you wish to query\n\
+   -m, --miblist=STRING\n\
+!     List of MIBS to be loaded (default = ALL)\n\
+!     Set empty if polling only OIDs, and not SNMP variables\n\
+!     (since no MIB files are needed if we already have the OIDs)\n\
+! -d, --delimiter=STRING\n\
+      Delimiter to use when parsing returned data. Default is \"%s\"\n\
+      Any data on the right hand side of the delimiter is considered\n\
+      to be the data that should be used in the evaluation.\n"), DEFAULT_DELIMITER);
diff --git a/web/attachments/136841-newdiff b/web/attachments/136841-newdiff
new file mode 100644
index 0000000..371d0a8
--- /dev/null
+++ b/web/attachments/136841-newdiff
@@ -0,0 +1,87 @@
+Index: check_tcp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
+retrieving revision 1.65
+diff -r1.65 check_tcp.c
+166a167,176
+>       else if (strstr (argv[0], "check_clamd")) {
+>               progname = strdup ("check_clamd");
+>               SERVICE = strdup ("CLAMD");
+>               SEND = strdup ("PING");
+>               EXPECT = strdup ("PONG");
+>               QUIT = NULL;
+>               PROTOCOL = IPPROTO_TCP;
+>               PORT = 3310;
+>       }
+> 
+380,381c390,397
+< 
+<       printf
+---
+>       if(server_address[0]=='/')
+>               printf
+>               (_("%s %s%s - %.3f second response on socket %s"),
+>                SERVICE,
+>                state_text (result),
+>                (was_refused) ? " (refused)" : "",
+>                elapsed_time, server_address);
+>       else printf
+488c504
+<                       if (is_host (optarg) == FALSE)
+---
+>                       if (optarg[0]!= '/' && is_host (optarg) == FALSE)
+763c779
+<       printf (_("This plugin tests %s connections with the specified host.\n\n"),
+---
+>       printf (_("This plugin tests %s connections with the specified host or unix socket.\n\n"),
+Index: netutils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
+retrieving revision 1.24
+diff -r1.24 netutils.c
+166a167
+>       
+172a174
+>       if (host_name[0] != '/') {
+212a215,239
+>       }
+>       else{ // unix socket
+>               struct sockaddr_un su;
+>               if (strlen(host_name) >= sizeof(su.sun_path)) {
+>                       printf("Hostname too long for unix domain socket: %s\n",
+>                       host_name);
+>                       return STATE_UNKNOWN;
+>               }
+>               memset(&su, 0, sizeof su);
+>               su.sun_family = AF_UNIX;
+>               strncpy(su.sun_path, host_name, sizeof su.sun_path);
+>               *sd = socket(PF_UNIX, SOCK_STREAM, 0);
+>               if ( sd < 0) {
+>                       printf ("Socket creation failed\n");
+>                       return STATE_UNKNOWN;
+>               }
+>               result=connect(*sd, (struct sockaddr *)&su, sizeof su);
+>               if (result == -1) {
+>                       printf ("Connect to socket failed\n");
+>                       close(*sd);
+>                       return STATE_UNKNOWN;
+>               }
+>               
+>       }
+>       
+Index: netutils.h
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h,v
+retrieving revision 1.12
+diff -r1.12 netutils.h
+37a38
+> #include <sys/un.h>
+Index: utils.h
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h,v
+retrieving revision 1.22
+diff -r1.22 utils.h
+139c139
+<     Host name or IP Address\n\
+---
+>     Host name or IP Address or unix socket (starting with \"/\")\n\
diff --git a/web/attachments/137019-nagios-plugins-snmp-v2c.patch b/web/attachments/137019-nagios-plugins-snmp-v2c.patch
new file mode 100644
index 0000000..c3aaa60
--- /dev/null
+++ b/web/attachments/137019-nagios-plugins-snmp-v2c.patch
@@ -0,0 +1,22 @@
+diff -Naur nagios-plugins-1.4.orig/plugins/check_snmp.c nagios-plugins-1.4/plugins/check_snmp.c
+--- nagios-plugins-1.4.orig/plugins/check_snmp.c        2005-01-20 17:03:56.000000000 -0800
++++ nagios-plugins-1.4/plugins/check_snmp.c     2005-06-02 13:05:51.000000000 -0700
+@@ -646,6 +646,9 @@
+                asprintf(&proto, DEFAULT_PROTOCOL);
+                asprintf(&authpriv, "%s%s", "-c ", community);
+        }
++       else if ( strcmp (proto, "2c") == 0 ) {                 /* snmpv2c args */
++               asprintf(&authpriv, "%s%s", "-c ", community);
++       }
+        else if ( strcmp (proto, "3") == 0 ) {                 /* snmpv3 args */
+                asprintf(&proto, "%s", "3");
+                
+@@ -859,7 +862,7 @@
+ 
+        /* SNMP and Authentication Protocol */
+        printf (_("\
+- -P, --protocol=[1|3]\n\
++ -P, --protocol=[1|2c|3]\n\
+     SNMP protocol version\n\
+  -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n\
+     SNMPv3 securityLevel\n\
diff --git a/web/attachments/137235-check_ipmi b/web/attachments/137235-check_ipmi
new file mode 100644
index 0000000..1d2a5bd
--- /dev/null
+++ b/web/attachments/137235-check_ipmi
@@ -0,0 +1,75 @@
+#!/usr/bin/perl
+
+# Nagios plugin for IPMI sensors status checking.
+#
+# Especially useful on Dell Poweredge servers, and others that
+# implement the Intelligent Platform Management Interface (IPMI)
+# interface.
+#
+# (C) Chris Wilson <check_ipmi@qwirx.com>, 2005-06-04
+# Released under the GNU General Public License (GPL)
+
+use warnings;
+use strict;
+
+open IPMI, "ipmitool sdr |" or die "ipmitool: $!";
+
+my %found;
+my %bad;
+
+sub trim ($) {
+        my ($v) = @_;
+        $v =~ s/^ +//;
+        $v =~ s/ +$//;
+        return $v;
+}
+
+while (my $line = <IPMI>)
+{
+        chomp $line;
+        unless ($line =~ m'^(.*) \| (.*) \| (\w+)$')
+        {
+                die "Bad format in ipmitool output: $line";
+        }
+
+        my $name  = trim $1;
+        my $value = trim $2;
+        my $state = trim $3;
+        $name =~ tr| |_|;
+
+        my $counter = 1;
+        my $uname = "$name";
+        while ($found{$uname}) {
+                $uname = $name . $counter++;
+        }
+
+        next if $state eq "ns";
+
+        if ($state ne "ok") {
+                $bad{$uname} = $state;
+        }
+
+        $found{$uname} = $value;
+}
+
+if (keys %bad) {
+        print "IPMI critical: ";
+        my @bad;
+        foreach my $name (sort keys %bad) {
+                push @bad, "$name is $bad{$name}";
+        }
+        print join(", ", @bad) . " ";
+} else {
+        print "IPMI ok ";
+}
+
+my @out;
+
+foreach my $name (sort keys %found) {
+        next unless $name =~ m|Fan| or $name =~ m|Temp|;
+        push @out, "$name = $found{$name}";
+}
+
+print "(" . join(", ", @out) . ")\n";
+
+if (%bad) { exit 2 } else { exit 0 }
diff --git a/web/attachments/137593-check_hpjd.patch b/web/attachments/137593-check_hpjd.patch
new file mode 100644
index 0000000..3c3cc8f
--- /dev/null
+++ b/web/attachments/137593-check_hpjd.patch
@@ -0,0 +1,34 @@
+--- check_hpjd.orig     2005-06-07 17:57:13.000000000 +0100
++++ check_hpjd.c        2005-06-07 18:19:18.000000000 +0100
+@@ -36,8 +36,8 @@
+ #define HPJD_PAPER_STATUS          ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
+ #define HPJD_INTERVENTION_REQUIRED ".1.3.6.1.4.1.11.2.3.9.1.1.2.3"
+ #define HPJD_GD_PERIPHERAL_ERROR   ".1.3.6.1.4.1.11.2.3.9.1.1.2.6"
+-#define HPJD_GD_PAPER_JAM          ".1.3.6.1.4.1.11.2.3.9.1.1.2.8"
+-#define HPJD_GD_PAPER_OUT          ".1.3.6.1.4.1.11.2.3.9.1.1.2.9"
++#define HPJD_GD_PAPER_OUT          ".1.3.6.1.4.1.11.2.3.9.1.1.2.8"
++#define HPJD_GD_PAPER_JAM          ".1.3.6.1.4.1.11.2.3.9.1.1.2.9"
+ #define HPJD_GD_TONER_LOW          ".1.3.6.1.4.1.11.2.3.9.1.1.2.10"
+ #define HPJD_GD_PAGE_PUNT          ".1.3.6.1.4.1.11.2.3.9.1.1.2.11"
+ #define HPJD_GD_MEMORY_OUT         ".1.3.6.1.4.1.11.2.3.9.1.1.2.12"
+@@ -134,7 +134,7 @@
+                temp_buffer = strtok (input_buffer, "=");
+                temp_buffer = strtok (NULL, "=");
+ 
+-               if (temp_buffer == NULL) {
++               if (temp_buffer == NULL && line < 13) {
+ 
+                                result = STATE_UNKNOWN;
+                                strcpy (errmsg, input_buffer);
+@@ -179,8 +179,9 @@
+                        case 12:                                                                                /* display panel message */
+                                strcpy (display_message, temp_buffer + 1);
+                                break;
+-                       default:
+-                               break;
++                       default:                                                                                /* fold multiline message */
++                               strncat (display_message, input_buffer, 
++                                               sizeof (display_message) - strlen (display_message) - 1);
+                        }
+ 
+                }
diff --git a/web/attachments/137902-nagiosplug-runcmd.diff b/web/attachments/137902-nagiosplug-runcmd.diff
new file mode 100644
index 0000000..abebe78
--- /dev/null
+++ b/web/attachments/137902-nagiosplug-runcmd.diff
@@ -0,0 +1,3012 @@
+diff -urN ../nplg/plugins/check_by_ssh.c ./plugins/check_by_ssh.c
+--- ../nplg/plugins/check_by_ssh.c      2005-01-05 21:53:11.000000000 +0100
++++ ./plugins/check_by_ssh.c    2005-06-10 15:01:26.000000000 +0200
+@@ -14,19 +14,19 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_by_ssh.c,v 1.35 2004/12/25 12:09:19 opensides Exp $
++ $Id: check_by_ssh.c,v 1.3 2005/06/06 11:37:06 exon Exp $
+  
+  *****************************************************************************/
+  
+ const char *progname = "check_by_ssh";
+-const char *revision = "$Revision: 1.35 $";
++const char *revision = "$Revision: 1.3 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+ #include "netutils.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -49,15 +49,15 @@
+ main (int argc, char **argv)
+ {
+ 
+-       char input_buffer[MAX_INPUT_BUFFER];
+        char *result_text;
+        char *status_text;
+-       char *output;
++       char *msg;
+        char *eol = NULL;
+        int cresult;
+        int result = STATE_UNKNOWN;
+        time_t local_time;
+        FILE *fp = NULL;
++       struct output chld_out, chld_err;
+ 
+        remotecmd = strdup ("");
+        comm = strdup (SSH_COMMAND);
+@@ -82,48 +82,22 @@
+        if (verbose)
+                printf ("%s\n", comm);
+ 
+-       child_process = spopen (comm);
+-
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), comm);
+-               return STATE_UNKNOWN;
+-       }
+-
+-
+-       /* open STDERR  for spopen */
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), SSH_COMMAND);
+-       }
+-
++       result = np_runcmd(comm, &chld_out, &chld_err, 0);
+ 
+        /* build up results from remote command in result_text */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+-               asprintf (&result_text, "%s%s", result_text, input_buffer);
++       if(skip_lines && skip_lines < chld_out.lines)
++               result_text = chld_out.line[skip_lines];
++       else
++               result_text = chld_out.line[0];
+ 
+        /* WARNING if output found on stderr */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               if (skip_lines > 0) {
+-                       if (input_buffer[strlen(input_buffer)-1] == '\n') {
+-                               skip_lines--;
+-                       }
+-               } else {
+-                       printf ("%s", input_buffer);
+-                       result = STATE_WARNING;
+-               }
++       if(chld_err.buflen) {
++               printf("%s\n", chld_err.line[0]);
++               return STATE_WARNING;
+        }
+-       (void) fclose (child_stderr);
+-       if (result == STATE_WARNING)
+-               return result;
+-
+-
+-       /* close the pipe */
+-       result = spclose (child_process);
+-
+ 
+        /* process output */
+        if (passive) {
+-
+                if (!(fp = fopen (outputfile, "a"))) {
+                        printf (_("SSH WARNING: could not open %s\n"), outputfile);
+                        exit (STATE_UNKNOWN);
+@@ -137,19 +111,19 @@
+                                printf ("%s", result_text);
+                                return result;
+                        }
+-                       asprintf (&output, "%s", result_text);
++                       asprintf (&msg, "%s", result_text);
+                        result_text = strnl (status_text);
+-                       eol = strpbrk (output, "\r\n");
++                       eol = strpbrk (msg, "\r\n");
+                        if (eol != NULL)
+                                eol[0] = 0;
+                        if (service[commands] && status_text
+-                                       && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1) {
++                           && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1)
++                       {
+                                fprintf (fp, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n",
+-                                                                (int) local_time, host_shortname, service[commands++], cresult,
+-                                                                output);
++                                        (int) local_time, host_shortname, service[commands++],
++                                        cresult, msg);
+                        }
+                }
+-
+        }
+ 
+ 
+@@ -206,7 +180,7 @@
+ 
+        while (1) {
+                c = getopt_long (argc, argv, "Vvh1246ft:H:O:p:i:u:l:C:S:n:s:", longopts,
+-                                                                        &option);
++                                &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -244,25 +218,27 @@
+                        passive = TRUE;
+                        break;
+                case 's':                                                                       /* description of service to check */
+-                       service = realloc (service, (++services) * sizeof(char *));
+                        p1 = optarg;
++                       service = realloc (service, (++services) * sizeof(char *));
+                        while ((p2 = index (p1, ':'))) {
+                                *p2 = '\0';
+-                               asprintf (&service[services-1], "%s", p1);
++                               service[services - 1] = p1;
+                                service = realloc (service, (++services) * sizeof(char *));
+                                p1 = p2 + 1;
+                        }
+-                       asprintf (&service[services-1], "%s", p1);
++                       service[services - 1] = p1;
+                        break;
+                case 'n':                                                                       /* short name of host in nagios configuration */
+                        host_shortname = optarg;
+                        break;
++
+                case 'u':
+                        c = 'l';
+                case 'l':                                                                       /* login name */
+                case 'i':                                                                       /* identity */
+                        asprintf (&comm, "%s -%c %s", comm, c, optarg);
+                        break;
++
+                case '1':                                                                       /* Pass these switches directly to ssh */
+                case '2':                                                                       /* 1 to force version 1, 2 to force version 2 */
+                case '4':                                                                       /* -4 for IPv4 */
+diff -urN ../nplg/plugins/check_dig.c ./plugins/check_dig.c
+--- ../nplg/plugins/check_dig.c 2005-01-28 15:00:58.000000000 +0100
++++ ./plugins/check_dig.c       2005-06-10 15:01:26.000000000 +0200
+@@ -14,29 +14,33 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_dig.c,v 1.40 2005/01/26 21:21:01 tonvoon Exp $
++ $Id: check_dig.c,v 1.3 2005/06/06 11:37:06 exon Exp $
+  
+ *****************************************************************************/
+ 
++/* Hackers note:
++ *  There are typecasts to (char *) from _("foo bar") in this file.
++ *  They prevent compiler warnings. Never (ever), permute strings obtained
++ *  that are typecast from (const char *) (which happens when --disable-nls)
++ *  because on some architectures those strings are in non-writable memory */
++
+ const char *progname = "check_dig";
+-const char *revision = "$Revision: 1.40 $";
++const char *revision = "$Revision: 1.3 $";
+ const char *copyright = "2002-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+ #include "netutils.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+ void print_help (void);
+ void print_usage (void);
+ 
+-enum {
+-       UNDEFINED = 0,
+-       DEFAULT_PORT = 53
+-};
++#define UNDEFINED 0
++#define DEFAULT_PORT 53
+ 
+ char *query_address = NULL;
+ char *record_type = "A";
+@@ -51,16 +55,15 @@
+ int
+ main (int argc, char **argv)
+ {
+-       char input_buffer[MAX_INPUT_BUFFER];
+        char *command_line;
+-       char *output;
++       output chld_out, chld_err;
++       char *msg = NULL;
++       size_t i;
+        char *t;
+        long microsec;
+        double elapsed_time;
+        int result = STATE_UNKNOWN;
+ 
+-       output = strdup ("");
+-
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+@@ -89,100 +92,75 @@
+        }
+ 
+        /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), command_line);
+-               return STATE_UNKNOWN;
++       if((result = np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0) {
++               result = STATE_WARNING;
++               msg = (char *)_("dig returned an error status");
+        }
+ 
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Could not open stderr for %s\n"), command_line);
+-
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-
++       for(i = 0; i < chld_out.lines; i++) {
+                /* the server is responding, we just got the host name... */
+-               if (strstr (input_buffer, ";; ANSWER SECTION:")) {
++               if (strstr (chld_out.line[i], ";; ANSWER SECTION:")) {
+ 
+                        /* loop through the whole 'ANSWER SECTION' */
+-                       do {
++                       for(; i < chld_out.lines; i++) {
+                                /* get the host address */
+-                               if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+-                                       break;
+-
+-                               if (strpbrk (input_buffer, "\r\n"))
+-                                       input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
++                               if (verbose)
++                                       printf ("%s\n", chld_out.line[i]);
+ 
+-                               if (verbose && !strstr (input_buffer, ";; ")) 
+-                                       printf ("%s\n", input_buffer); 
+-
+-                               if (expected_address==NULL && strstr (input_buffer, query_address) != NULL) {
+-                                       output = strdup(input_buffer);
++                               if (strstr (chld_out.line[i], (expected_address == NULL ? query_address : expected_address)) != NULL) {
++                                       msg = chld_out.line[i];
+                                        result = STATE_OK;
+-                               }
+-                               else if (expected_address != NULL && strstr (input_buffer, expected_address) != NULL) {
+-                                       output = strdup(input_buffer);
+-                                       result = STATE_OK;
+-                               }
+ 
+-                               /* Translate output TAB -> SPACE */
+-                               t = output;
+-                               while ((t = index(t, '\t')) != NULL) 
+-                                       *t = ' ';
+-
+-                       } while (!strstr (input_buffer, ";; "));
++                                       /* Translate output TAB -> SPACE */
++                                       t = msg;
++                                       while ((t = strchr(t, '\t')) != NULL) *t = ' ';
++                                       break;
++                               }
++                       }
+ 
+                        if (result == STATE_UNKNOWN) {
+-                               asprintf (&output, _("Server not found in ANSWER SECTION"));
+-                               result = STATE_WARNING;
+-                        }
+-               }
+-
+-       }
+-
+-       if (result == STATE_UNKNOWN) {
+-               asprintf (&output, _("No ANSWER SECTION found"));
+-       }
++                               msg = (char *)_("Server not found in ANSWER SECTION");
++                               result = STATE_WARNING;
++                       }
+ 
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               /* If we get anything on STDERR, at least set warning */
+-               result = max_state (result, STATE_WARNING);
+-               printf ("%s", input_buffer);
+-               if (strlen (output) == 0)
+-                       output = strdup (1 + index (input_buffer, ':'));
++                       /* we found the answer section, so break out of the loop */
++                       break;
++               }
+        }
+ 
+-       (void) fclose (child_stderr);
++       if (result == STATE_UNKNOWN)
++               msg = (char *)_("No ANSWER SECTION found");
+ 
+-       /* close the pipe */
+-       if (spclose (child_process)) {
+-               result = max_state (result, STATE_WARNING);
+-               if (strlen (output) == 0)
+-                       asprintf (&output, _("dig returned an error status"));
++       /* If we get anything on STDERR, at least set warning */
++       if(chld_err.buflen > 0) {
++               result = max_state(result, STATE_WARNING);
++               if(!msg) for(i = 0; i < chld_err.lines; i++) {
++                       msg = strchr(chld_err.line[0], ':');
++                       if(msg) {
++                               msg++;
++                               break;
++                       }
++               }
+        }
+ 
+        microsec = deltime (tv);
+        elapsed_time = (double)microsec / 1.0e6;
+ 
+-       if (output == NULL || strlen (output) == 0)
+-               asprintf (&output, _(" Probably a non-existent host/domain"));
+-
+        if (critical_interval > UNDEFINED && elapsed_time > critical_interval)
+                result = STATE_CRITICAL;
+ 
+        else if (warning_interval > UNDEFINED && elapsed_time > warning_interval)
+                result = STATE_WARNING;
+ 
+-       asprintf (&output, _("%.3f seconds response time (%s)"), elapsed_time, output);
+-
+-       printf ("DNS %s - %s|%s\n",
+-               state_text (result), output,
++       printf ("DNS %s - %.3f seconds response time (%s)|%s\n",
++               state_text (result), elapsed_time,
++               msg ? msg : _("Probably a non-existent host/domain"),
+                fperfdata("time", elapsed_time, "s",
+-                        (warning_interval>UNDEFINED?TRUE:FALSE),
+-                        warning_interval,
+-                        (critical_interval>UNDEFINED?TRUE:FALSE),
+-                        critical_interval,
+-                                                                        TRUE, 0, FALSE, 0));
++                         (warning_interval>UNDEFINED?TRUE:FALSE),
++                         warning_interval,
++                         (critical_interval>UNDEFINED?TRUE:FALSE),
++                                         critical_interval,
++                                         TRUE, 0, FALSE, 0));
+        return result;
+ }
+ 
+@@ -359,6 +337,6 @@
+ {
+        printf ("\
+ Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
+-                  [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
+-                  [-a <expected answer address>] [-v]\n", progname);
++              [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
++              [-a <expected answer address>] [-v]\n", progname);
+ }
+diff -urN ../nplg/plugins/check_dns.c ./plugins/check_dns.c
+--- ../nplg/plugins/check_dns.c 2005-01-05 21:53:12.000000000 +0100
++++ ./plugins/check_dns.c       2005-06-10 15:01:26.000000000 +0200
+@@ -17,19 +17,19 @@
+  LIMITATION: nslookup on Solaris 7 can return output over 2 lines, which will not 
+  be picked up by this plugin
+  
+- $Id: check_dns.c,v 1.47 2004/12/30 00:41:39 opensides Exp $
++ $Id: check_dns.c,v 1.3 2005/06/06 11:37:06 exon Exp $
+ 
+ ******************************************************************************/
+ 
+ const char *progname = "check_dns";
+-const char *revision = "$Revision: 1.47 $";
++const char *revision = "$Revision: 1.3 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
+ #include "utils.h"
+ #include "netutils.h"
++#include "runcmd.h"
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -51,8 +51,8 @@
+ {
+        char *command_line = NULL;
+        char input_buffer[MAX_INPUT_BUFFER];
+-       char *output = NULL;
+        char *address = NULL;
++       char *msg = NULL;
+        char *temp_buffer = NULL;
+        int non_authoritative = FALSE;
+        int result = STATE_UNKNOWN;
+@@ -61,6 +61,8 @@
+        struct timeval tv;
+        int multi_address;
+        int parse_address = FALSE; /* This flag scans for Address: but only after Name: */
++       output chld_out, chld_err;
++       size_t i;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -85,37 +87,31 @@
+                printf ("%s\n", command_line);
+ 
+        /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), command_line);
+-               return STATE_UNKNOWN;
++       if((np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0) {
++               msg = (char *)_("nslookup returned error status");
++               result = STATE_WARNING;
+        }
+ 
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Could not open stderr for %s\n"), command_line);
+-
+        /* scan stdout */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-
++       for(i = 0; i < chld_out.lines; i++) {
+                if (verbose)
+-                       printf ("%s", input_buffer);
++                       printf ("%s", chld_out.line[i]);
+ 
+-               if (strstr (input_buffer, ".in-addr.arpa")) {
+-                       if ((temp_buffer = strstr (input_buffer, "name = ")))
++               if (strstr (chld_out.line[i], ".in-addr.arpa")) {
++                       if ((temp_buffer = strstr (chld_out.line[i], "name = ")))
+                                address = strdup (temp_buffer + 7);
+                        else {
+-                               output = strdup (_("Warning plugin error"));
++                               msg = (char *)_("Warning plugin error");
+                                result = STATE_WARNING;
+                        }
+                }
+ 
+                /* the server is responding, we just got the host name... */
+-               if (strstr (input_buffer, "Name:"))
++               if (strstr (chld_out.line[i], "Name:"))
+                        parse_address = TRUE;
+-               else if (parse_address == TRUE && (strstr (input_buffer, "Address:") ||
+-                        strstr (input_buffer, "Addresses:"))) {
+-                       temp_buffer = index (input_buffer, ':');
++               else if (parse_address == TRUE && (strstr (chld_out.line[i], "Address:") ||
++                        strstr (chld_out.line[i], "Addresses:"))) {
++                       temp_buffer = index (chld_out.line[i], ':');
+                        temp_buffer++;
+ 
+                        /* Strip leading spaces */
+@@ -135,59 +131,47 @@
+                                asprintf(&address, "%s,%s", address, temp_buffer);
+                }
+ 
+-               else if (strstr (input_buffer, _("Non-authoritative answer:"))) {
++               else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
+                        non_authoritative = TRUE;
+                }
+ 
+-               result = error_scan (input_buffer);
++               result = error_scan (chld_out.line[i]);
+                if (result != STATE_OK) {
+-                       output = strdup (1 + index (input_buffer, ':'));
+-                       strip (output);
++                       msg = strchr (chld_out.line[i], ':');
++                       if(msg) msg++;
+                        break;
+                }
+-
+        }
+ 
+        /* scan stderr */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-
++       for(i = 0; i < chld_err.lines; i++) {
+                if (verbose)
+-                       printf ("%s", input_buffer);
++                       printf ("%s", chld_err.line[i]);
+ 
+-               if (error_scan (input_buffer) != STATE_OK) {
+-                       result = max_state (result, error_scan (input_buffer));
+-                       output = strdup (1 + index (input_buffer, ':'));
+-                       strip (output);
++               if (error_scan (chld_err.line[i]) != STATE_OK) {
++                       result = max_state (result, error_scan (chld_err.line[i]));
++                       msg = strchr(input_buffer, ':');
++                       if(msg) msg++;
+                }
+        }
+ 
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+-       /* close stdout */
+-       if (spclose (child_process)) {
+-               result = max_state (result, STATE_WARNING);
+-               if (output == NULL || !strcmp (output, ""))
+-                       output = strdup (_("nslookup returned error status"));
+-       }
+-
+-       /* If we got here, we should have an address string, 
+-                and we can segfault if we do not */
++       /* If we got here, we should have an address string,
++        * and we can segfault if we do not */
+        if (address==NULL || strlen(address)==0)
+                die (STATE_CRITICAL,
+-                    _("DNS CRITICAL - '%s' output parsing exited with no address\n"),
++                    _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
+                     NSLOOKUP_COMMAND);
+ 
+        /* compare to expected address */
+        if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
+                result = STATE_CRITICAL;
+-               asprintf(&output, _("expected %s but got %s"), expected_address, address);
++               asprintf(&msg, _("expected %s but got %s"), expected_address, address);
+        }
+ 
+        /* check if authoritative */
+        if (result == STATE_OK && expect_authority && non_authoritative) {
+                result = STATE_CRITICAL;
+-               asprintf(&output, _("server %s is not authoritative for %s"), dns_server, query_address);
++               asprintf(&msg, _("server %s is not authoritative for %s"), dns_server, query_address);
+        }
+ 
+        microsec = deltime (tv);
+@@ -206,13 +190,13 @@
+        }
+        else if (result == STATE_WARNING)
+                printf (_("DNS WARNING - %s\n"),
+-                       !strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
++                       !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+        else if (result == STATE_CRITICAL)
+                printf (_("DNS CRITICAL - %s\n"),
+-                       !strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
++                       !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+        else
+                printf (_("DNS UNKNOW - %s\n"),
+-                       !strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
++                       !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+ 
+        return result;
+ }
+diff -urN ../nplg/plugins/check_fping.c ./plugins/check_fping.c
+--- ../nplg/plugins/check_fping.c       2005-01-05 21:53:13.000000000 +0100
++++ ./plugins/check_fping.c     2005-06-10 15:01:26.000000000 +0200
+@@ -14,26 +14,24 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_fping.c,v 1.24 2004/12/25 23:17:44 opensides Exp $
++ $Id: check_fping.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+  
+ ******************************************************************************/
+ 
+ const char *progname = "check_fping";
+-const char *revision = "$Revision: 1.24 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
+ #include "netutils.h"
+ #include "utils.h"
++#include "runcmd.h"
+ 
+-enum {
+-       PACKET_COUNT = 1,
+-       PACKET_SIZE = 56,
+-       PL = 0,
+-       RTA = 1
+-};
++#define        PACKET_COUNT 1
++#define PACKET_SIZE 56
++#define PL 0
++#define RTA 1
+ 
+ int textscan (char *buf);
+ int process_arguments (int, char **);
+@@ -59,11 +57,11 @@
+ {
+ /* normaly should be   int result = STATE_UNKNOWN; */
+ 
+-       int status = STATE_UNKNOWN;
++       int result = STATE_UNKNOWN;
+        char *server = NULL;
+        char *command_line = NULL;
+-       char *input_buffer = NULL;
+-       input_buffer = malloc (MAX_INPUT_BUFFER);
++       output chld_out, chld_err;
++       size_t i;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -79,43 +77,21 @@
+                  packet_size, packet_count, server);
+ 
+        if (verbose)
+-               printf ("%s\n", command_line);
++               printf ("command_line: %s\n", command_line);
+ 
+        /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), command_line);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), command_line);
+-       }
++       if((np_runcmd(command_line, &chld_out, &chld_err, 0)) || chld_err.buflen)
++               result = STATE_WARNING;
+ 
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               if (verbose)
+-                       printf ("%s", input_buffer);
+-               status = max_state (status, textscan (input_buffer));
+-       }
+-
+-       /* If we get anything on STDERR, at least set warning */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               status = max_state (status, STATE_WARNING);
+-               if (verbose)
+-                       printf ("%s", input_buffer);
+-               status = max_state (status, textscan (input_buffer));
+-       }
+-       (void) fclose (child_stderr);
++       for(i = 0; i < chld_out.lines; i++)
++               result = max_state (result, textscan (chld_out.line[i]));
+ 
+-       /* close the pipe */
+-       if (spclose (child_process))
+-               /* need to use max_state not max */
+-               status = max_state (status, STATE_WARNING);
++       printf ("FPING %s - %s\n", state_text (result), server_name);
+ 
+-       printf ("FPING %s - %s\n", state_text (status), server_name);
++       if (verbose) for(i = 0; i < chld_out.lines; i++)
++                       printf ("%s", chld_out.line[i]);
+ 
+-       return status;
++       return result;
+ }
+ 
+ 
+@@ -127,7 +103,7 @@
+        char *losstr = NULL;
+        double loss;
+        double rta;
+-       int status = STATE_UNKNOWN;
++       int result = STATE_UNKNOWN;
+ 
+        if (strstr (buf, "not found")) {
+                die (STATE_CRITICAL, _("FPING UNKNOW - %s not found\n"), server_name);
+@@ -143,7 +119,7 @@
+ 
+        }
+        else if (strstr (buf, "is alive")) {
+-               status = STATE_OK;
++               result = STATE_OK;
+ 
+        }
+        else if (strstr (buf, "xmt/rcv/%loss") && strstr (buf, "min/avg/max")) {
+@@ -156,18 +132,18 @@
+                loss = strtod (losstr, NULL);
+                rta = strtod (rtastr, NULL);
+                if (cpl_p == TRUE && loss > cpl)
+-                       status = STATE_CRITICAL;
++                       result = STATE_CRITICAL;
+                else if (crta_p == TRUE  && rta > crta)
+-                       status = STATE_CRITICAL;
++                       result = STATE_CRITICAL;
+                else if (wpl_p == TRUE && loss > wpl)
+-                       status = STATE_WARNING;
++                       result = STATE_WARNING;
+                else if (wrta_p == TRUE && rta > wrta)
+-                       status = STATE_WARNING;
++                       result = STATE_WARNING;
+                else
+-                       status = STATE_OK;
+-               die (status,
++                       result = STATE_OK;
++               die (result,
+                      _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"),
+-                                state_text (status), server_name, loss, rta,
++                                state_text (result), server_name, loss, rta,
+                     perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100),
+                     fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0));
+ 
+@@ -179,24 +155,24 @@
+                losstr = 1 + strstr (losstr, "/");
+                loss = strtod (losstr, NULL);
+                if (atoi(losstr) == 100)
+-                       status = STATE_CRITICAL;
++                       result = STATE_CRITICAL;
+                else if (cpl_p == TRUE && loss > cpl)
+-                       status = STATE_CRITICAL;
++                       result = STATE_CRITICAL;
+                else if (wpl_p == TRUE && loss > wpl)
+-                       status = STATE_WARNING;
++                       result = STATE_WARNING;
+                else
+-                       status = STATE_OK;
++                       result = STATE_OK;
+                /* loss=%.0f%%;%d;%d;0;100 */
+-               die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
+-                    state_text (status), server_name, loss ,
++               die (result, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
++                    state_text (result), server_name, loss ,
+                     perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100));
+        
+        }
+        else {
+-               status = max_state (status, STATE_WARNING);
++               result = max_state (result, STATE_WARNING);
+        }
+ 
+-       return status;
++       return result;
+ }
+ 
+ 
+diff -urN ../nplg/plugins/check_game.c ./plugins/check_game.c
+--- ../nplg/plugins/check_game.c        2005-01-05 21:53:13.000000000 +0100
++++ ./plugins/check_game.c      2005-06-10 15:01:26.000000000 +0200
+@@ -14,17 +14,17 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+-* $Id: check_game.c,v 1.22 2004/12/25 23:17:44 opensides Exp $
++* $Id: check_game.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+ *****************************************************************************/
+ 
+ const char *progname = "check_game";
+-const char *revision = "$Revision: 1.22 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "2002-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
+ #include "utils.h"
++#include "runcmd.h"
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -57,9 +57,9 @@
+        char *command_line;
+        int result = STATE_UNKNOWN;
+        FILE *fp;
+-       char input_buffer[MAX_INPUT_BUFFER];
+        char *p, *ret[QSTAT_MAX_RETURN_ARGS];
+-       int i;
++       size_t i = 0;
++       output chld_out;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -80,17 +80,9 @@
+        if (verbose > 0)
+                printf ("%s\n", command_line);
+ 
+-       /* run the command */
+-       fp = spopen (command_line);
+-       if (fp == NULL) {
+-               printf (_("Could not open pipe: %s\n"), command_line);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp); /* Only interested in the first line */
+-
+-       /* strip the newline character from the end of the input */
+-       input_buffer[strlen (input_buffer) - 1] = 0;
++       /* run the command. historically, this plugin ignores output on stderr,
++        * as well as return status of the qstat program */
++       (void)np_runcmd(command_line, &chld_out, NULL, 0);
+ 
+        /* sanity check */
+        /* was thinking about running qstat without any options, capturing the
+@@ -102,18 +94,13 @@
+           In the end, I figured I'd simply let an error occur & then trap it
+         */
+ 
+-       if (!strncmp (input_buffer, "unknown option", 14)) {
++       if (!strncmp (chld_out.line[0], "unknown option", 14)) {
+                printf (_("CRITICAL - Host type parameter incorrect!\n"));
+                result = STATE_CRITICAL;
+                return result;
+        }
+ 
+-       /* initialize the returned data buffer */
+-       for (i = 0; i < QSTAT_MAX_RETURN_ARGS; i++)
+-               ret[i] = strdup("");
+-
+-       i = 0;
+-       p = (char *) strtok (input_buffer, QSTAT_DATA_DELIMITER);
++       p = (char *) strtok (chld_out.line[0], QSTAT_DATA_DELIMITER);
+        while (p != NULL) {
+                ret[i] = p;
+                p = (char *) strtok (NULL, QSTAT_DATA_DELIMITER);
+@@ -141,17 +128,14 @@
+                        ret[qstat_game_field], 
+                        ret[qstat_map_field],
+                        ret[qstat_ping_field],
+-                                               perfdata ("players", atol(ret[qstat_game_players]), "",
++                       perfdata ("players", atol(ret[qstat_game_players]), "",
+                                  FALSE, 0, FALSE, 0,
+                                  TRUE, 0, TRUE, atol(ret[qstat_game_players_max])),
+-                                               fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
++                       fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
+                                  FALSE, 0, FALSE, 0,
+                                  TRUE, 0, FALSE, 0));
+        }
+ 
+-       /* close the pipe */
+-       spclose (fp);
+-
+        return result;
+ }
+ 
+diff -urN ../nplg/plugins/check_hpjd.c ./plugins/check_hpjd.c
+--- ../nplg/plugins/check_hpjd.c        2005-01-05 21:53:13.000000000 +0100
++++ ./plugins/check_hpjd.c      2005-06-10 15:01:26.000000000 +0200
+@@ -14,24 +14,22 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+-* $Id: check_hpjd.c,v 1.31 2004/12/25 23:17:44 opensides Exp $
++* $Id: check_hpjd.c,v 1.4 2005/06/06 11:37:06 exon Exp $
+ *****************************************************************************/
+ 
+ const char *progname = "check_hpjd";
+-const char *revision = "$Revision: 1.31 $";
++const char *revision = "$Revision: 1.4 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
+ #include "utils.h"
+ #include "netutils.h"
++#include "runcmd.h"
+ 
+ #define DEFAULT_COMMUNITY "public"
+ 
+-
+-const char *option_summary = "-H host [-C community]\n";
+-
++/* this macro is only avavilable from main() */
+ #define HPJD_LINE_STATUS           ".1.3.6.1.4.1.11.2.3.9.1.1.2.1"
+ #define HPJD_PAPER_STATUS          ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
+ #define HPJD_INTERVENTION_REQUIRED ".1.3.6.1.4.1.11.2.3.9.1.1.2.3"
+@@ -44,42 +42,50 @@
+ #define HPJD_GD_DOOR_OPEN          ".1.3.6.1.4.1.11.2.3.9.1.1.2.17"
+ #define HPJD_GD_PAPER_OUTPUT       ".1.3.6.1.4.1.11.2.3.9.1.1.2.19"
+ #define HPJD_GD_STATUS_DISPLAY     ".1.3.6.1.4.1.11.2.3.9.1.1.3"
++#define SNMP_VARS 12
+ 
+ #define ONLINE         0
+ #define OFFLINE                1
+ 
+-int process_arguments (int, char **);
+-int validate_arguments (void);
+-void print_help (void);
++/* make it compile without warnings when internationalization is disabled */
++#ifndef ENABLE_NLS
++# ifdef _
++#  undef _
++# endif
++# define _(x) x
++#endif
++
++static int process_arguments (int, char **);
++static int validate_arguments (void);
++static void print_help (void);
+ void print_usage (void);
+ 
+-char *community = NULL;
+-char *address = NULL;
++static char *community = NULL;
++static char *address = NULL;
++
+ 
+ int
+ main (int argc, char **argv)
+ {
+        char command_line[1024];
+-       int result = STATE_UNKNOWN;
+-       int line;
+-       char input_buffer[MAX_INPUT_BUFFER];
+-       char query_string[512];
+-       char *errmsg;
+-       char *temp_buffer;
+-       int line_status = ONLINE;
+-       int paper_status = 0;
+-       int intervention_required = 0;
+-       int peripheral_error = 0;
+-       int paper_jam = 0;
+-       int paper_out = 0;
+-       int toner_low = 0;
+-       int page_punt = 0;
+-       int memory_out = 0;
+-       int door_open = 0;
+-       int paper_output = 0;
+-       char display_message[MAX_INPUT_BUFFER];
+-
+-       errmsg = malloc(MAX_INPUT_BUFFER);
++       int result = STATE_OK;
++       size_t i, val = 0;
++       int errorflag = 0;      /* bitflag error tracker */
++       output chld_out, chld_err;
++       char *errmsg_strings[11];
++
++       /* populate the the error message array */
++       errmsg_strings[0] = _("Printer Offline");
++       errmsg_strings[1] = _("Unknown Paper Error");
++       errmsg_strings[2] = _("Intervention Required");
++       errmsg_strings[3] = _("Peripheral Error");
++       errmsg_strings[4] = _("Paper Jam");
++       errmsg_strings[5] = _("Out of Paper");
++       errmsg_strings[6] = _("Toner Low");
++       errmsg_strings[7] = _("Data too Slow for Engine");
++       errmsg_strings[8] = _("Insufficient Memory");
++       errmsg_strings[9] = _("A Door is Open");
++       errmsg_strings[10] = _("Output Tray is Full");
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -88,206 +94,99 @@
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+-       /* removed ' 2>1' at end of command 10/27/1999 - EG */
+-       /* create the query string */
+-       sprintf
+-               (query_string,
+-                "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0",
+-                HPJD_LINE_STATUS,
+-                HPJD_PAPER_STATUS,
+-                HPJD_INTERVENTION_REQUIRED,
+-                HPJD_GD_PERIPHERAL_ERROR,
+-                HPJD_GD_PAPER_JAM,
+-                HPJD_GD_PAPER_OUT,
+-                HPJD_GD_TONER_LOW,
+-                HPJD_GD_PAGE_PUNT,
+-                HPJD_GD_MEMORY_OUT,
+-                HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
+-
+-       /* get the command to run */
+-       sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community, 
+-                                                                       address, query_string);
++       /* create the command-line. Get status display line first, so we can
++        * match line status against powersave as we parse it */
++       sprintf (command_line, "%s -Oqv -m : -v 1 -c %s %s "
++                "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0",
++                PATH_TO_SNMPGET, community, address,
++                HPJD_GD_STATUS_DISPLAY,
++                HPJD_LINE_STATUS,
++                HPJD_PAPER_STATUS,
++                HPJD_INTERVENTION_REQUIRED,
++                HPJD_GD_PERIPHERAL_ERROR,
++                HPJD_GD_PAPER_JAM,
++                HPJD_GD_PAPER_OUT,
++                HPJD_GD_TONER_LOW,
++                HPJD_GD_PAGE_PUNT,
++                HPJD_GD_MEMORY_OUT,
++                HPJD_GD_DOOR_OPEN,
++                HPJD_GD_PAPER_OUTPUT);
+ 
+        /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), command_line);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), command_line);
+-       }
+-
+-       result = STATE_OK;
+-
+-       line = 0;
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++       if((np_runcmd(command_line, &chld_out, &chld_err, 0)) || chld_err.buflen)
++               result = STATE_WARNING;
+ 
+-               /* strip the newline character from the end of the input */
+-               if (input_buffer[strlen (input_buffer) - 1] == '\n')
+-                       input_buffer[strlen (input_buffer) - 1] = 0;
+-
+-               line++;
+-
+-               temp_buffer = strtok (input_buffer, "=");
+-               temp_buffer = strtok (NULL, "=");
+-
+-               if (temp_buffer == NULL) {
+-
+-                               result = STATE_UNKNOWN;
+-                               strcpy (errmsg, input_buffer);
+-
+-               } else {
+-
+-                       switch (line) {
+-
+-                       case 1:                                                                         /* 1st line should contain the line status */
+-                               line_status = atoi (temp_buffer);
+-                               break;
+-                       case 2:                                                                         /* 2nd line should contain the paper status */
+-                               paper_status = atoi (temp_buffer);
+-                               break;
+-                       case 3:                                                                         /* 3rd line should be intervention required */
+-                               intervention_required = atoi (temp_buffer);
+-                               break;
+-                       case 4:                                                                         /* 4th line should be peripheral error */
+-                               peripheral_error = atoi (temp_buffer);
+-                               break;
+-                       case 5:                                                                         /* 5th line should contain the paper jam status */
+-                               paper_jam = atoi (temp_buffer);
+-                               break;
+-                       case 6:                                                                         /* 6th line should contain the paper out status */
+-                               paper_out = atoi (temp_buffer);
+-                               break;
+-                       case 7:                                                                         /* 7th line should contain the toner low status */
+-                               toner_low = atoi (temp_buffer);
+-                               break;
+-                       case 8:                                                                         /* did data come too slow for engine */
+-                               page_punt = atoi (temp_buffer);
+-                               break;
+-                       case 9:                                                                         /* did we run out of memory */
+-                               memory_out = atoi (temp_buffer);
+-                               break;
+-                       case 10:                                                                                /* is there a door open */
+-                               door_open = atoi (temp_buffer);
+-                               break;
+-                       case 11:                                                                                /* is output tray full */
+-                               paper_output = atoi (temp_buffer);
+-                               break;
+-                       case 12:                                                                                /* display panel message */
+-                               strcpy (display_message, temp_buffer + 1);
+-                               break;
+-                       default:
+-                               break;
+-                       }
+-
+-               }
+-
+-               /* break out of the read loop if we encounter an error */
+-               if (result != STATE_OK)
+-                       break;
+-       }
++       /* if there was none or not enough output, display an error and exit */
++       if (chld_out.buflen == 0 || chld_out.lines != SNMP_VARS - 1) {
++               if(chld_err.buflen) printf("%s : ", chld_err.line[0]);
+ 
+-       /* WARNING if output found on stderr */
+-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               result = max_state (result, STATE_WARNING);
+-               /* remove CRLF */
+-               if (input_buffer[strlen (input_buffer) - 1] == '\n')
+-                       input_buffer[strlen (input_buffer) - 1] = 0;
+-               sprintf (errmsg, "%s", input_buffer );
++               if(chld_out.buflen == 0)
++                       printf (_("No data returned from %s\n"), address );
++               else
++                       printf(_("Not enough data returned from %s\n"), address);
+ 
+-       }
+-       
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process))
+-               result = max_state (result, STATE_WARNING);
+-
+-       /* if there wasn't any output, display an error */
+-       if (line == 0) {
+-
+-               /* might not be the problem, but most likely is. */
+-               result = STATE_UNKNOWN ;
+-               asprintf (&errmsg, "%s : Timeout from host %s\n", errmsg, address );
+-                
++               return STATE_UNKNOWN;
+        }
+ 
+-       /* if we had no read errors, check the printer status results... */
+-       if (result == STATE_OK) {
++       for(i = 1; i < chld_out.lines; i++) {
++               /* move to next if there's no error tag */
++               if(!(val = (size_t)strtol(chld_out.line[i], NULL, 0)))
++                       continue;
++
++               /* tag the error */
++               errorflag |= 1 << i;
++
++               /* this switch statement is only for additional exception handling */
++               switch (i) {
++               case 1:         /* line status */
++                       /* clear this flag if it's powersaving (we know it's set if
++                        * we get here, so use xor and save 2 instructions) */
++                       if(!strstr(chld_out.line[0], "POWERSAVE ON"))
++                               errorflag ^= 1 << i;
++                       break;
+ 
+-               if (paper_jam) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Paper Jam"));
+-               }
+-               else if (paper_out) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Out of Paper"));
+-               }
+-               else if (line_status == OFFLINE) {
+-                       if (strcmp (errmsg, "POWERSAVE ON") != 0) {
+-                               result = STATE_WARNING;
+-                               strcpy (errmsg, _("Printer Offline"));
+-                       }
+-               }
+-               else if (peripheral_error) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Peripheral Error"));
+-               }
+-               else if (intervention_required) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Intervention Required"));
+-               }
+-               else if (toner_low) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Toner Low"));
+-               }
+-               else if (memory_out) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Insufficient Memory"));
+-               }
+-               else if (door_open) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("A Door is Open"));
+-               }
+-               else if (paper_output) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Output Tray is Full"));
+-               }
+-               else if (page_punt) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Data too Slow for Engine"));
+-               }
+-               else if (paper_status) {
+-                       result = STATE_WARNING;
+-                       strcpy (errmsg, _("Unknown Paper Error"));
++               case 2:         /* paper status */
++               case 3:         /* intervention required */
++               case 4:         /* peripheral error */
++               case 5:         /* paper jam */
++               case 6:         /* paper out */
++               case 7:         /* toner low */
++               case 8:         /* data came too slow for engine */
++               case 9:         /* out of memory */
++               case 10:        /* door open */
++               case 11:        /* output tray full */
++                       break;
+                }
+        }
+ 
+-       if (result == STATE_OK)
+-               printf (_("Printer ok - (%s)\n"), display_message);
+-
+-       else if (result == STATE_UNKNOWN) {
++       /* if some error occurred, print a starting line and all the errors */
++       if(errorflag) {
++               printf ("%s (%s)", chld_err.buflen != 0 ? chld_err.buf : "",
++                       chld_out.line[0]);
+ 
+-               printf ("%s\n", errmsg);
++               for(i = 0; i < SNMP_VARS; i++) { /* loop the error flags */
++                       if((errorflag >> i) & 1) /* only print if flag is set */
++                               printf(" :: %s", errmsg_strings[i++]);
++               }
+ 
+-               /* if printer could not be reached, escalate to critical */
+-               if (strstr (errmsg, "Timeout"))
+-                       result = STATE_CRITICAL;
++               return STATE_CRITICAL;
+        }
+ 
+-       else if (result == STATE_WARNING)
+-               printf ("%s (%s)\n", errmsg, display_message);
++       /* set WARNING if output on stderr */
++       if (chld_err.buflen) {
++               printf("WARNING - Printer seems ok, but %s printed to stderr (%s)",
++                      PATH_TO_SNMPGET, chld_err.line[0]);
++               return STATE_WARNING;
++       }
+ 
+-       return result;
++       /* all is well if we end up here */
++       printf (_("Printer ok - (%s)\n"), chld_out.line[0]);
++       return STATE_OK;
+ }
+ 
+ 
+ /* process command-line arguments */
+-int
++static int
+ process_arguments (int argc, char **argv)
+ {
+        int c;
+@@ -296,9 +195,6 @@
+        static struct option longopts[] = {
+                {"hostname", required_argument, 0, 'H'},
+                {"community", required_argument, 0, 'C'},
+-/*             {"critical",       required_argument,0,'c'}, */
+-/*             {"warning",        required_argument,0,'w'}, */
+-/*             {"port",           required_argument,0,'P'}, */
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {0, 0, 0, 0}
+@@ -307,7 +203,6 @@
+        if (argc < 2)
+                return ERROR;
+ 
+-       
+        while (1) {
+                c = getopt_long (argc, argv, "+hVH:C:", longopts, &option);
+ 
+@@ -317,7 +212,7 @@
+                switch (c) {
+                case 'H':                                                                       /* hostname */
+                        if (is_host (optarg)) {
+-                               address = strscpy(address, optarg) ;
++                               address = strdup(optarg) ;
+                        }
+                        else {
+                                usage2 (_("Invalid hostname/address"), optarg);
+@@ -346,26 +241,26 @@
+                        usage2 (_("Invalid hostname/address"), argv[c]);
+                }
+        }
+-       
++
+        if (community == NULL) {
+                if (argv[c] != NULL )
+                        community = argv[c];
+                else
+-                       community = strdup (DEFAULT_COMMUNITY);
++                       community = DEFAULT_COMMUNITY;
+        }
+ 
+        return validate_arguments ();
+ }
+ 
+ 
+-int
++static int
+ validate_arguments (void)
+ {
+        return OK;
+ }
+ 
+ 
+-void
++static void
+ print_help (void)
+ {
+        print_revision (progname, revision);
+@@ -389,7 +284,6 @@
+ }
+ 
+ 
+-
+ void
+ print_usage (void)
+ {
+diff -urN ../nplg/plugins/check_load.c ./plugins/check_load.c
+--- ../nplg/plugins/check_load.c        2005-05-30 17:44:13.000000000 +0200
++++ ./plugins/check_load.c      2005-06-10 15:01:26.000000000 +0200
+@@ -14,18 +14,18 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  
+- $Id: check_load.c,v 1.28 2005/05/28 01:21:54 seanius Exp $
++ $Id: check_load.c,v 1.3 2005/06/05 21:55:26 exon Exp $
+ 
+ ******************************************************************************/
+ 
+ const char *progname = "check_load";
+-const char *revision = "$Revision: 1.28 $";
++const char *revision = "$Revision: 1.3 $";
+ const char *copyright = "1999-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ 
+ #ifdef HAVE_SYS_LOADAVG_H
+ #include <sys/loadavg.h>
+@@ -47,12 +47,8 @@
+ /* strictly for pretty-print usage in loops */
+ static const int nums[3] = { 1, 5, 15 };
+ 
+-/* provide some fairly sane defaults */
+ double wload[3] = { 0.0, 0.0, 0.0 };
+ double cload[3] = { 0.0, 0.0, 0.0 };
+-#define la1 la[0]
+-#define la5 la[1]
+-#define la15 la[2]
+ 
+ char *status_line;
+ 
+@@ -86,14 +82,16 @@
+ main (int argc, char **argv)
+ {
+        int result;
+-       int i;
++       size_t i; /* size_t so we can match against chld_out.lines if need be */
+ 
+        double la[3] = { 0.0, 0.0, 0.0 };       /* NetBSD complains about unitialized arrays */
+ #ifndef HAVE_GETLOADAVG
+-       char input_buffer[MAX_INPUT_BUFFER];
+ # ifdef HAVE_PROC_LOADAVG
++       char input_buffer[MAX_INPUT_BUFFER];
+        FILE *fp;
+        char *str, *next;
++# else
++       output chld_out, chld_err;
+ # endif
+ #endif
+ 
+@@ -126,23 +124,11 @@
+ 
+        fclose (fp);
+ # else
+-       child_process = spopen (PATH_TO_UPTIME);
+-       if (child_process == NULL) {
+-               printf (_("Error opening %s\n"), PATH_TO_UPTIME);
+-               return STATE_UNKNOWN;
+-       }
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), PATH_TO_UPTIME);
+-       }
+-       fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+-       sscanf (input_buffer, "%*[^l]load average: %f, %f, %f", &la1, &la5, &la15);
++       if((result = np_runcmd(PATH_TO_UPTIME, &chld_out, &chld_err, 0)) || chld_err.buflen)
++               die(STATE_UNKNOWN, _("Error code %d returned in %s\n"),
++                   result, PATH_TO_UPTIME);
+ 
+-       result = spclose (child_process);
+-       if (result) {
+-               printf (_("Error code %d returned in %s\n"), result, PATH_TO_UPTIME);
+-               return STATE_UNKNOWN;
+-       }
++       sscanf (chld_out.buf, "%*[^l]load average: %f, %f, %f", &la[0], &la[1], &la[2]);
+ # endif
+ #endif
+ 
+@@ -162,17 +148,17 @@
+        /* we got this far, so assume OK until we've measured */
+        result = STATE_OK;
+ 
+-       asprintf(&status_line, _("load average: %.2f, %.2f, %.2f"), la1, la5, la15);
+-
+        for(i = 0; i < 3; i++) {
+                if(la[i] > cload[i]) {
+                        result = STATE_CRITICAL;
+                        break;
+                }
+-               else if(la[i] > wload[i]) result = STATE_WARNING;
++
++               if(la[i] > wload[i]) result = STATE_WARNING;
+        }
+ 
+-       printf("%s - %s|", state_text(result), status_line);
++       printf(_("%s - load average: %.2f, %.2f, %.2f|"),
++              state_text(result), la[0], la[1], la[2]);
+        for(i = 0; i < 3; i++)
+                printf("load%d=%.3f;%.3f;%.3f;0; ", nums[i], la[i], wload[i], cload[i]);
+ 
+@@ -248,14 +234,13 @@
+        int i = 0;
+ 
+        /* match cload first, as it will give the most friendly error message
+-        * if user hasn't given the -c switch properly */
++        * if user hasn't given the -c switch properly. Don't make sure wload[i]
++        * < cload[i] as it prevents users from forcing a critical state */
+        for(i = 0; i < 3; i++) {
+-               if(cload[i] < 0)
++               if(cload[i] == 0.0)
+                        die (STATE_UNKNOWN, _("Critical threshold for %d-minute load average is not specified\n"), nums[i]);
+-               if(wload[i] < 0)
++               if(wload[i] == 0.0)
+                        die (STATE_UNKNOWN, _("Warning threshold for %d-minute load average is not specified\n"), nums[i]);
+-               if(wload[i] > cload[i])
+-                       die (STATE_UNKNOWN, _("Parameter inconsistency: %d-minute \"warning load\" is greater than \"critical load\"\n"), nums[i]);
+        }
+ 
+        return OK;
+diff -urN ../nplg/plugins/check_nagios.c ./plugins/check_nagios.c
+--- ../nplg/plugins/check_nagios.c      2005-05-26 14:12:21.000000000 +0200
++++ ./plugins/check_nagios.c    2005-06-10 15:01:26.000000000 +0200
+@@ -14,17 +14,17 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_nagios.c,v 1.26 2005/05/25 00:43:20 seanius Exp $
++ $Id: check_nagios.c,v 1.3 2005/06/06 11:37:06 exon Exp $
+  
+ ******************************************************************************/
+ 
+ const char *progname = "check_nagios";
+-const char *revision = "$Revision: 1.26 $";
++const char *revision = "$Revision: 1.3 $";
+ const char *copyright = "1999-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
++#include "runcmd.h"
+ #include "utils.h"
+ 
+ int process_arguments (int, char **);
+@@ -55,6 +55,8 @@
+        int procrss = 0;
+        float procpcpu = 0;
+        char procstat[8];
++       /* procetime is unused in most configurations, but may be in PS_VAR_LIST
++        * so it must be here in spite of it producing compiler warnings */
+        char procetime[MAX_INPUT_BUFFER];
+        char procprog[MAX_INPUT_BUFFER];
+        char *procargs;
+@@ -62,6 +64,8 @@
+        int expected_cols = PS_COLS - 1;
+        const char *zombie = "Z";
+        char *temp_string;
++       output chld_out, chld_err;
++       size_t i;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -99,40 +103,30 @@
+                printf(_("command: %s\n"), PS_COMMAND);
+ 
+        /* run the command to check for the Nagios process.. */
+-       child_process = spopen (PS_COMMAND);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), PS_COMMAND);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), PS_COMMAND);
+-       }
+-
+-       fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
++       if((result = np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0)) != 0)
++               result = STATE_WARNING;
+ 
+        /* count the number of matching Nagios processes... */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST);
+-                /* Zombie processes do not give a procprog command */
+-                if ( cols == (expected_cols - 1) && strstr(procstat, zombie) ) {
+-                        cols = expected_cols;
+-                        /* Set some value for procargs for the strip command further below
+-                        Seen to be a problem on some Solaris 7 and 8 systems */
+-                        input_buffer[pos] = '\n';
+-                        input_buffer[pos+1] = 0x0;
+-                }
++       for(i = 0; i < chld_out.lines; i++) {
++               cols = sscanf (chld_out.line[i], PS_FORMAT, PS_VARLIST);
++               /* Zombie processes do not give a procprog command */
++               if ( cols == (expected_cols - 1) && strstr(procstat, zombie) ) {
++                       cols = expected_cols;
++                       /* Set some value for procargs for the strip command further below
++                        * Seen to be a problem on some Solaris 7 and 8 systems */
++                       chld_out.line[i][pos] = '\n';
++                       chld_out.line[i][pos+1] = 0x0;
++               }
+                if ( cols >= expected_cols ) {
+-                       asprintf (&procargs, "%s", input_buffer + pos);
++                       asprintf (&procargs, "%s", chld_out.line[i] + pos);
+                        strip (procargs);
+-                       
++
+                        /* Some ps return full pathname for command. This removes path */
+-                        temp_string = strtok ((char *)procprog, "/");
+-                        while (temp_string) {
+-                                strcpy(procprog, temp_string);
+-                                temp_string = strtok (NULL, "/");
+-                        }
++                       temp_string = strtok ((char *)procprog, "/");
++                       while (temp_string) {
++                               strcpy(procprog, temp_string);
++                               temp_string = strtok (NULL, "/");
++                       }
+ 
+                        /* May get empty procargs */
+                        if (!strstr(procargs, argv[0]) && strstr(procargs, process_string) && strcmp(procargs,"")) {
+@@ -145,14 +139,7 @@
+        }
+ 
+        /* If we get anything on stderr, at least set warning */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+-               result = max_state (result, STATE_WARNING);
+-
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process))
++       if(chld_err.buflen)
+                result = max_state (result, STATE_WARNING);
+ 
+        /* reset the alarm handler */
+diff -urN ../nplg/plugins/check_ping.c ./plugins/check_ping.c
+--- ../nplg/plugins/check_ping.c        2005-05-26 14:12:21.000000000 +0200
++++ ./plugins/check_ping.c      2005-06-10 15:01:26.000000000 +0200
+@@ -14,18 +14,18 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_ping.c,v 1.44 2005/05/25 14:25:55 sghosh Exp $
++ $Id: check_ping.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+  
+ ******************************************************************************/
+ 
+ const char *progname = "check_ping";
+-const char *revision = "$Revision: 1.44 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+ #include "netutils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ #include "utils.h"
+ 
+ #define WARN_DUPLICATES "DUPLICATES FOUND! "
+@@ -40,7 +40,7 @@
+ int get_threshold (char *, float *, int *);
+ int validate_arguments (void);
+ int run_ping (const char *cmd, const char *addr);
+-int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr);
++int error_scan (const char *buf, const char *addr);
+ void print_usage (void);
+ void print_help (void);
+ 
+@@ -58,7 +58,7 @@
+ float rta = UNKNOWN_TRIP_TIME;
+ int pl = UNKNOWN_PACKET_LOSS;
+ 
+-char *warn_text;
++char *warn_text = NULL;
+ 
+ 
+ 
+@@ -95,10 +95,8 @@
+                if (is_inet6_addr(addresses[i]) && address_family != AF_INET)
+                        rawcmd = strdup(PING6_COMMAND);
+                else
+-                       rawcmd = strdup(PING_COMMAND);
+-#else
+-               rawcmd = strdup(PING_COMMAND);
+ #endif
++                       rawcmd = strdup(PING_COMMAND);
+ 
+                /* does the host address of number of packets argument come first? */
+ #ifdef PING_PACKETS_FIRST
+@@ -119,8 +117,7 @@
+ 
+                if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) {
+                        printf ("%s\n", cmd);
+-                       die (STATE_UNKNOWN,
+-                                  _("CRITICAL - Could not interpret output from ping command\n"));
++                       die (STATE_UNKNOWN, _("CRITICAL - Could not interpret output from ping command\n"));
+                }
+ 
+                if (pl >= cpl || rta >= crta || rta < 0)
+@@ -136,11 +133,11 @@
+                if (display_html == TRUE)
+                        printf ("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, addresses[i]);
+                if (pl == 100)
+-                       printf (_("PING %s - %sPacket loss = %d%%"), state_text (this_result), warn_text,
+-                                                       pl);
++                       printf (_("PING %s - %sPacket loss = %d%%"),
++                               state_text(this_result), warn_text ? warn_text : " ", pl);
+                else
+                        printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"),
+-                                                       state_text (this_result), warn_text, pl, rta);
++                               state_text (this_result), warn_text ? warn_text : " ", pl, rta);
+                if (display_html == TRUE)
+                        printf ("</A>");
+                printf ("\n");
+@@ -399,42 +396,42 @@
+ int
+ run_ping (const char *cmd, const char *addr)
+ {
+-       char buf[MAX_INPUT_BUFFER];
+        int result = STATE_UNKNOWN;
+-
+-       if ((child_process = spopen (cmd)) == NULL)
+-               die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Cannot open stderr for %s\n"), cmd);
+-
+-       while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+-
+-               result = max_state (result, error_scan (buf, addr));
+-
+-               /* get the percent loss statistics */
+-               if(sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss",&pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss",&pl)==1   ||
+-                        sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time",&pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time", &pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time", &pl)==1 ||
+-                  sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss", &pl) == 1 ||
+-                        sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss", &pl) == 1
+-                        )
++       output chld_out, chld_err;
++       char *p;
++       size_t mult = 1, i;
++
++       if((result = np_runcmd(cmd, &chld_out, &chld_err, 0)) != 0)
++               result = STATE_WARNING;
++
++       for(i = 0; i < chld_out.lines; i++) {
++               /* get the packet loss. Find the % sign and count backwards */
++               if((p = memchr(chld_out.line[i], '%', chld_out.lens[i]))) {
++                       p--;
++                       pl = 0;
++                       while(p != chld_out.line[i] && isdigit(*p)) {
++                               pl += *p - '0' * mult;
++                               mult *= 10;
++                               p--;
++                       }
+                        continue;
+-
++               }
+                /* get the round trip average */
+-               else
+-                       if(sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms",&rta)==1)
+-                       continue;
++               else {
++                       if(sscanf(chld_out.line[i], "round-trip min/avg/max = %*f/%f/%*f", &rta) == 1 ||
++                          sscanf(chld_out.line[i], "round-trip min/avg/max/mdev = %*f/%f/%*f/%*f", &rta) == 1 ||
++               sscanf(chld_out.line[i], "round-trip min/avg/max/sdev = %*f/%f/%*f/%*f", &rta) == 1 ||
++                          sscanf(chld_out.line[i], "round-trip min/avg/max/stddev = %*f/%f/%*f/%*f", &rta) == 1 ||
++                          sscanf(chld_out.line[i], "round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f", &rta) == 1 ||
++                          sscanf(chld_out.line[i], "round-trip (ms) min/avg/max = %*f/%f/%*f", &rta) == 1 ||
++                          sscanf(chld_out.line[i], "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f", &rta) == 1 ||
++                          sscanf(chld_out.line[i], "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms", &rta) == 1)
++                       {
++                               continue;
++                       }
++
++                       result = max_state (result, error_scan (chld_out.line[i], addr));
++               }
+        }
+ 
+        /* this is needed because there is no rta if all packets are lost */
+@@ -442,19 +439,10 @@
+                rta = crta;
+ 
+        /* check stderr, setting at least WARNING if there is output here */
+-       while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
+-               if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP"))
+-                       result = max_state (STATE_WARNING, error_scan (buf, addr));
+-
+-       (void) fclose (child_stderr);
+-
+-
+-       /* close the pipe - WARNING if status is set */
+-       if (spclose (child_process))
+-               result = max_state (result, STATE_WARNING);
+-
+-       if (warn_text == NULL)
+-               warn_text = strdup("");
++       if(chld_err.buflen > 0) {
++               if (! strstr(chld_err.line[0], "WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP"))
++                       result = max_state (STATE_WARNING, error_scan (chld_err.line[0], addr));
++       }
+ 
+        return result;
+ }
+@@ -462,7 +450,7 @@
+ 
+ 
+ int
+-error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
++error_scan (const char *buf, const char *addr)
+ {
+        if (strstr (buf, "Network is unreachable"))
+                die (STATE_CRITICAL, _("CRITICAL - Network unreachable (%s)"), addr);
+diff -urN ../nplg/plugins/check_procs.c ./plugins/check_procs.c
+--- ../nplg/plugins/check_procs.c       2005-06-03 19:35:45.000000000 +0200
++++ ./plugins/check_procs.c     2005-06-10 15:01:26.000000000 +0200
+@@ -14,17 +14,17 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_procs.c,v 1.45 2005/06/03 13:53:43 seanius Exp $
++ $Id: check_procs.c,v 1.3 2005/06/06 11:37:06 exon Exp $
+  
+ ******************************************************************************/
+ 
+ const char *progname = "check_procs";
+-const char *revision = "$Revision: 1.45 $";
++const char *revision = "$Revision: 1.3 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
++#include "runcmd.h"
+ #include "utils.h"
+ 
+ #include <pwd.h>
+@@ -96,7 +96,7 @@
+        char procstat[8];
+        char procetime[MAX_INPUT_BUFFER] = { '\0' };
+        char *procargs;
+-       char *temp_string;
++       output chld_out, chld_err;
+ 
+        const char *zombie = "Z";
+ 
+@@ -118,7 +118,7 @@
+        input_buffer = malloc (MAX_INPUT_BUFFER);
+        procprog = malloc (MAX_INPUT_BUFFER);
+ 
+-       asprintf (&metric_name, "PROCS");
++       metric_name = "PROCS";
+        metric = METRIC_PROCS;
+ 
+        if (process_arguments (argc, argv) == ERROR)
+@@ -136,27 +136,15 @@
+        if (verbose >= 2)
+                printf (_("CMD: %s\n"), PS_COMMAND);
+ 
+-       child_process = spopen (PS_COMMAND);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), PS_COMMAND);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Could not open stderr for %s\n"), PS_COMMAND);
+-
+-       /* flush first line */
+-       fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+-       while ( input_buffer[strlen(input_buffer)-1] != '\n' )
+-               fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+-
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               asprintf (&input_line, "%s", input_buffer);
+-               while ( input_buffer[strlen(input_buffer)-1] != '\n' ) {
+-                       fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+-                       asprintf (&input_line, "%s%s", input_line, input_buffer);
+-               }
++       result = np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0);
++       if(result) {
++               printf (_("System call returned nonzero status\n"));
++               result = max_state (result, STATE_WARNING);
++       }
++
++       /* start parsing on second line */
++       for(i = 1; i < chld_out.lines; i++) {
++               input_line = chld_out.line[i];
+ 
+                if (verbose >= 3)
+                        printf ("%s", input_line);
+@@ -177,8 +165,7 @@
+ 
+                        /* Some ps return full pathname for command. This removes path */
+ #ifdef HAVE_BASENAME
+-                       temp_string = strdup(procprog);
+-                       procprog = basename(temp_string);
++                       procprog = strdup(basename(procprog));
+ #endif /* HAVE_BASENAME */
+ 
+                        /* we need to convert the elapsed time to seconds */
+@@ -248,27 +235,17 @@
+        }
+ 
+        /* If we get anything on STDERR, at least set warning */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               if (verbose)
+-                       printf ("STDERR: %s", input_buffer);
++       if(chld_err.buflen > 0) {
+                result = max_state (result, STATE_WARNING);
+                printf (_("System call sent warnings to stderr\n"));
+        }
+-       
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process)) {
+-               printf (_("System call returned nonzero status\n"));
+-               result = max_state (result, STATE_WARNING);
+-       }
+ 
+        if (found == 0) {                                                       /* no process lines parsed so return STATE_UNKNOWN */
+                printf (_("Unable to read output\n"));
+                return result;
+        }
+ 
+-       if ( result == STATE_UNKNOWN ) 
++       if ( result == STATE_UNKNOWN )
+                result = STATE_OK;
+ 
+        /* Needed if procs found, but none match filter */
+@@ -459,7 +436,7 @@
+                        }
+                        usage4 (_("PCPU must be a float!"));
+                case 'm':
+-                       asprintf (&metric_name, "%s", optarg);
++                       metric_name = optarg;
+                        if ( strcmp(optarg, "PROCS") == 0) {
+                                metric = METRIC_PROCS;
+                                break;
+@@ -494,7 +471,7 @@
+        if (cmax == -1 && argv[c])
+                cmax = atoi (argv[c++]);
+        if (statopts == NULL && argv[c]) {
+-               asprintf (&statopts, "%s", argv[c++]);
++               statopts = argv[c++];
+                asprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts);
+                options |= STAT;
+        }
+diff -urN ../nplg/plugins/check_snmp.c ./plugins/check_snmp.c
+--- ../nplg/plugins/check_snmp.c        2005-06-03 12:07:28.000000000 +0200
++++ ./plugins/check_snmp.c      2005-06-10 15:01:26.000000000 +0200
+@@ -14,18 +14,18 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_snmp.c,v 1.57 2005/06/01 19:41:01 sghosh Exp $
++ $Id: check_snmp.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+  
+ ******************************************************************************/
+ 
+ const char *progname = "check_snmp";
+-const char *revision = "$Revision: 1.57 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "1999-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ 
+ #define DEFAULT_COMMUNITY "public"
+ #define DEFAULT_PORT "161"
+@@ -136,11 +136,12 @@
+        char *command_line = NULL;
+        char *response = NULL;
+        char *outbuff;
+-       char *output;
++       char *msg;
+        char *ptr = NULL;
+        char *p2 = NULL;
+        char *show = NULL;
+        char type[8];
++       output chld_out, chld_err;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -157,7 +158,7 @@
+        units = strdup ("");
+        port = strdup (DEFAULT_PORT);
+        outbuff = strdup ("");
+-       output = strdup ("");
++       msg = strdup ("");
+        delimiter = strdup (" = ");
+        output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
+        /* miblist = strdup (DEFAULT_MIBLIST); */
+@@ -168,41 +169,25 @@
+                usage4 (_("Could not parse arguments"));
+ 
+        /* create the command line to execute */
+-               if(usesnmpgetnext == TRUE) {
+-               asprintf(&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+-                                   PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
+-                                               authpriv, server_address, port, oid);
+-       }else{
+-
+-               asprintf (&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+-                 PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+-                 authpriv, server_address, port, oid);
+-       }
+-       
++       asprintf(&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
++                usesnmpgetnext == TRUE ? PATH_TO_SNMPGETNEXT : PATH_TO_SNMPGET,
++                timeout_interval, retries, miblist, proto,
++                authpriv, server_address, port, oid);
++
+        if (verbose)
+                printf ("%s\n", command_line);
+-       
+ 
+        /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), command_line);
+-               exit (STATE_UNKNOWN);
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), command_line);
+-       }
++       if((np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0 || chld_err.buflen)
++               result = STATE_WARNING;
+ 
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+-               asprintf (&output, "%s%s", output, input_buffer);
++       for(i = 0; (size_t)i < chld_out.lines; i++)
++               asprintf (&msg, "%s%s", msg, input_buffer);
+ 
+        if (verbose)
+-               printf ("%s\n", output);
+-
+-       ptr = output;
++               printf ("%s\n", msg);
+ 
++       ptr = msg;
+        strcat(perfstr, "| ");
+        while (ptr) {
+                char *foo;
+@@ -261,18 +246,11 @@
+                iresult = STATE_DEPENDENT;
+ 
+                /* Process this block for integer comparisons */
+-               if (eval_method[i] & CRIT_GT ||
+-                   eval_method[i] & CRIT_LT ||
+-                   eval_method[i] & CRIT_GE ||
+-                   eval_method[i] & CRIT_LE ||
+-                   eval_method[i] & CRIT_EQ ||
+-                   eval_method[i] & CRIT_NE ||
+-                   eval_method[i] & WARN_GT ||
+-                   eval_method[i] & WARN_LT ||
+-                   eval_method[i] & WARN_GE ||
+-                   eval_method[i] & WARN_LE ||
+-                   eval_method[i] & WARN_EQ ||
+-                   eval_method[i] & WARN_NE) {
++               if (eval_method[i] & (CRIT_GT | CRIT_LT | CRIT_GE |
++                                     CRIT_LE | CRIT_EQ | CRIT_NE |
++                                     WARN_GT | WARN_LT | WARN_GE |
++                                     WARN_LE | WARN_EQ | WARN_NE))
++               {
+                        p2 = strpbrk (p2, "0123456789");
+                        if (p2 == NULL) 
+                                die (STATE_UNKNOWN,_("No valid data returned"));
+@@ -350,20 +328,6 @@
+                     label,
+                     command_line);
+ 
+-       /* WARNING if output found on stderr */
+-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+-               result = max_state (result, STATE_WARNING);
+-
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process))
+-               result = max_state (result, STATE_WARNING);
+-
+-/*     if (nunits == 1 || i == 1) */
+-/*             printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */
+-/*     else */
+        printf ("%s %s -%s %s \n", label, state_text (result), outbuff, perfstr);
+ 
+        return result;
+diff -urN ../nplg/plugins/check_swap.c ./plugins/check_swap.c
+--- ../nplg/plugins/check_swap.c        2005-01-24 08:29:54.000000000 +0100
++++ ./plugins/check_swap.c      2005-06-10 15:01:26.000000000 +0200
+@@ -21,18 +21,18 @@
+  *
+  * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
+  *
+- * $Id: check_swap.c,v 1.47 2005/01/19 21:14:47 tonvoon Exp $
++ * $Id: check_swap.c,v 1.4 2005/06/06 11:37:06 exon Exp $
+  *
+  *****************************************************************************/
+ 
+ const char *progname = "check_swap";
+-const char *revision = "$Revision: 1.47 $";
++const char *revision = "$Revision: 1.4 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
+ #include "utils.h"
++#include "runcmd.h"
+ 
+ int check_swap (int usp, float free_swap);
+ int process_arguments (int argc, char **argv);
+@@ -64,6 +64,8 @@
+        char *temp_buffer;
+        char *swap_command;
+        char *swap_format;
++       output chld_out, chld_err;
++       size_t i = 0;
+ # else
+ #  ifdef HAVE_DECL_SWAPCTL
+        int i=0, nswaps=0, swapctl_res=0;
+@@ -79,14 +81,13 @@
+ # endif
+ #endif
+        char str[32];
+-       char *status, *tmp_status;
++       char *status;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+        status = strdup ("");
+-       tmp_status = strdup ("");
+        perf = strdup ("");
+ 
+        if (process_arguments (argc, argv) == ERROR)
+@@ -146,15 +147,9 @@
+        if (verbose >= 3)
+                printf (_("Format: %s\n"), swap_format);
+ 
+-       child_process = spopen (swap_command);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), swap_command);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Could not open stderr for %s\n"), swap_command);
++       /* run the command. set WARNING if non-zero return or output on stderr */
++       if((np_runcmd(swap_command, &chld_out, &chld_err, 0)) || chld_err.buflen)
++               result = STATE_WARNING;
+ 
+        sprintf (str, "%s", "");
+        /* read 1st line */
+@@ -210,17 +205,6 @@
+ #  ifdef _AIX
+        }
+ #  endif
+-
+-       /* If we get anything on STDERR, at least set warning */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+-               result = max_state (result, STATE_WARNING);
+-
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process))
+-               result = max_state (result, STATE_WARNING);
+ # else
+ #  ifdef CHECK_SWAP_SWAPCTL_SVR4
+ 
+@@ -314,16 +298,19 @@
+        percent_used = 100 * ((double) used_swap) / ((double) total_swap);
+        result = max_state (result, check_swap (percent_used, free_swap));
+        /* broken into two steps because of funkiness with builtin asprintf */
+-       asprintf (&tmp_status, _(" %d%% free (%.0f MB out of %.0f MB)"),
+-                                               (100 - percent_used), free_swap, total_swap);
+-       asprintf (&status, "%s%s", tmp_status, status);
+-
+-       asprintf (&perf, "%s", perfdata ("swap", (long) free_swap, "MB",
+-               TRUE, (long) max (warn_size/1024, warn_percent/100.0*total_swap),
+-               TRUE, (long) max (crit_size/1024, crit_percent/100.0*total_swap),
+-               TRUE, 0,
+-               TRUE, (long) total_swap));
+-       printf ("SWAP %s:%s |%s\n", state_text (result), status, perf);
++       /* the breaking was removed because it was stupid. There's no reason
++        * to concatenate a string using asprintf() just to print it to stdout
++        * in the next statement. */
++       printf (_("SWAP %s - %d%% free (%.0f MB out of %.0f MB) %s|"),
++                       state_text (result),
++                       (100 - percent_used), free_swap, total_swap, status);
++
++       puts (perfdata ("swap", (long) free_swap, "MB",
++                       TRUE, (long) max (warn_size/1024, warn_percent/100.0*total_swap),
++                       TRUE, (long) max (crit_size/1024, crit_percent/100.0*total_swap),
++                       TRUE, 0,
++                       TRUE, (long) total_swap));
++
+        return result;
+ }
+ 
+@@ -383,7 +370,7 @@
+                        }
+                        else if (strstr (optarg, ",") &&
+                                                         strstr (optarg, "%") &&
+-                                                        sscanf (optarg, "%.0f,%d%%", &warn_size, &warn_percent) == 2) {
++                                                        sscanf (optarg, "%f,%d%%", &warn_size, &warn_percent) == 2) {
+                                break;
+                        }
+                        else if (strstr (optarg, "%") &&
+@@ -400,7 +387,7 @@
+                        }
+                        else if (strstr (optarg, ",") &&
+                                                         strstr (optarg, "%") &&
+-                                                        sscanf (optarg, "%.0f,%d%%", &crit_size, &crit_percent) == 2) {
++                                                        sscanf (optarg, "%f,%d%%", &crit_size, &crit_percent) == 2) {
+                                break;
+                        }
+                        else if (strstr (optarg, "%") &&
+diff -urN ../nplg/plugins/check_users.c ./plugins/check_users.c
+--- ../nplg/plugins/check_users.c       2005-01-05 21:53:22.000000000 +0100
++++ ./plugins/check_users.c     2005-06-10 15:01:26.000000000 +0200
+@@ -14,17 +14,17 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_users.c,v 1.19 2004/12/25 23:17:44 opensides Exp $
++ $Id: check_users.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+  
+ *****************************************************************************/
+ 
+ const char *progname = "check_users";
+-const char *revision = "$Revision: 1.19 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
++#include "runcmd.h"
+ #include "utils.h"
+ 
+ #define possibly_set(a,b) ((a) == 0 ? (b) : 0)
+@@ -41,52 +41,28 @@
+ {
+        int users = -1;
+        int result = STATE_UNKNOWN;
+-       char input_buffer[MAX_INPUT_BUFFER];
+-       char *perf;
++       output chld_out, chld_err;
++       size_t i;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       perf = strdup("");
+-
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+        /* run the command */
+-       child_process = spopen (WHO_COMMAND);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), WHO_COMMAND);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Could not open stderr for %s\n"), WHO_COMMAND);
+-
+-       users = 0;
+-
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-
+-               /* increment 'users' on all lines except total user count */
+-               if (input_buffer[0] != '#') {
+-                       users++;
+-                       continue;
+-               }
+-
+-               /* get total logged in users */
+-               if (sscanf (input_buffer, _("# users=%d"), &users) == 1)
+-                       break;
+-
+-       }
++       result = np_runcmd(WHO_COMMAND, &chld_out, &chld_err, 0);
++       if(result != 0)
++               result = STATE_UNKNOWN;
++
++       /* one user is listed per line, except when it begins with '#' */
++       users = chld_out.lines;
++       for(i = 0; i < chld_out.lines; i++)
++               if (chld_out.line[0][0] == '#') users--;
+ 
+        /* check STDERR */
+-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+-               result = possibly_set (result, STATE_UNKNOWN);
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process))
++       if(chld_err.buflen > 0)
+                result = possibly_set (result, STATE_UNKNOWN);
+ 
+        /* else check the user count against warning and critical thresholds */
+@@ -98,16 +74,12 @@
+                result = STATE_OK;
+ 
+        if (result == STATE_UNKNOWN)
+-               printf (_("Unable to read output\n"));
+-       else {
+-               asprintf(&perf, "%s", perfdata ("users", users, "",
+-                 TRUE, wusers,
+-                 TRUE, cusers,
+-                 TRUE, 0,
+-                 FALSE, 0));
+-               printf (_("USERS %s - %d users currently logged in |%s\n"), state_text (result),
+-                 users, perf);
+-       }
++               die (STATE_UNKNOWN, _("Unable to read output\n"));
++
++       printf (_("USERS %s - %d users currently logged in |%s\n"),
++               state_text (result), users,
++               perfdata("users", users, "",
++                        TRUE, wusers, TRUE, cusers, TRUE, 0, FALSE, 0));
+ 
+        return result;
+ }
+@@ -129,8 +101,10 @@
+                {0, 0, 0, 0}
+        };
+ 
+-       if (argc < 2)
+-               usage ("\n");
++       if (argc < 2) {
++               print_usage ();
++               exit(STATE_UNKNOWN);
++       }
+ 
+        while (1) {
+                c = getopt_long (argc, argv, "+hVvc:w:", longopts, &option);
+diff -urN ../nplg/plugins/foo ./plugins/foo
+--- ../nplg/plugins/foo 1970-01-01 01:00:00.000000000 +0100
++++ ./plugins/foo       2005-06-10 15:05:25.000000000 +0200
+@@ -0,0 +1,12 @@
++$Id: check_by_ssh.c,v 1.35 2004/12/25 12:09:19 opensides Exp $
++$Id: check_dig.c,v 1.40 2005/01/26 21:21:01 tonvoon Exp $
++$Id: check_dns.c,v 1.47 2004/12/30 00:41:39 opensides Exp $
++$Id: check_fping.c,v 1.24 2004/12/25 23:17:44 opensides Exp $
++$Id: check_load.c,v 1.28 2005/05/28 01:21:54 seanius Exp $
++$Id: check_nagios.c,v 1.26 2005/05/25 00:43:20 seanius Exp $
++$Id: check_ping.c,v 1.44 2005/05/25 14:25:55 sghosh Exp $
++$Id: check_procs.c,v 1.45 2005/06/03 13:53:43 seanius Exp $
++$Id: check_snmp.c,v 1.57 2005/06/01 19:41:01 sghosh Exp $
++$Id: check_users.c,v 1.19 2004/12/25 23:17:44 opensides Exp $
++$Id: negate.c,v 1.24 2004/12/25 23:17:44 opensides Exp $
++$Id: urlize.c,v 1.17 2004/12/25 23:17:44 opensides Exp $
+diff -urN ../nplg/plugins/Makefile.am ./plugins/Makefile.am
+--- ../nplg/plugins/Makefile.am 2005-02-15 09:28:36.000000000 +0100
++++ ./plugins/Makefile.am       2005-06-10 15:01:26.000000000 +0200
+@@ -24,7 +24,8 @@
+        check_nagios check_by_ssh check_dns check_nt check_ide_smart    \
+        check_procs
+ 
+-EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \
++EXTRA_DIST = t common.h utils.c utils.h netutils.c netutils.h \
++       runcmd.c runcmd.h \
+        getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h
+ 
+ PLUGINHDRS = common.h
+@@ -46,85 +47,85 @@
+ # the actual targets
+ 
+ check_dhcp_LDADD = $(NETLIBS)
+-check_dig_LDADD = $(NETLIBS) popen.o 
+-check_disk_LDADD = $(BASEOBJS) popen.o
+-check_dns_LDADD = $(NETLIBS) popen.o
++check_dig_LDADD = $(NETLIBS) runcmd.o 
++check_disk_LDADD = $(BASEOBJS) runcmd.o
++check_dns_LDADD = $(NETLIBS) runcmd.o
+ check_dummy_LDADD = $(BASEOBJS)
+-check_fping_LDADD = $(NETLIBS) popen.o
+-check_game_LDADD = $(BASEOBJS) popen.o
++check_fping_LDADD = $(NETLIBS) runcmd.o
++check_game_LDADD = $(BASEOBJS) runcmd.o
+ check_http_LDADD = $(NETLIBS) $(SSLLIBS)
+-check_hpjd_LDADD = $(NETLIBS) popen.o
++check_hpjd_LDADD = $(NETLIBS) runcmd.o
+ check_icmp_LDADD = $(SOCKETLIBS)
+ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
+-check_load_LDADD = $(BASEOBJS) popen.o
++check_load_LDADD = $(BASEOBJS) runcmd.o
+ check_mrtg_LDADD = $(BASEOBJS)
+ check_mrtgtraf_LDADD = $(BASEOBJS)
+ check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
+-check_nagios_LDADD = $(BASEOBJS) popen.o
++check_nagios_LDADD = $(BASEOBJS) runcmd.o
+ check_nt_LDADD = $(NETLIBS) 
+ check_nwstat_LDADD = $(NETLIBS)
+ check_overcr_LDADD = $(NETLIBS)
+ check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
+-check_ping_LDADD = $(NETLIBS) popen.o
+-check_procs_LDADD = $(BASEOBJS) popen.o
++check_ping_LDADD = $(NETLIBS) runcmd.o
++check_procs_LDADD = $(BASEOBJS) runcmd.o
+ check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
+ check_real_LDADD = $(NETLIBS)
+-check_snmp_LDADD = $(BASEOBJS) popen.o
++check_snmp_LDADD = $(BASEOBJS) runcmd.o
+ check_smtp_LDADD = $(NETLIBS) $(SSLLIBS)
+ check_ssh_LDADD = $(NETLIBS)
+-check_swap_LDADD = $(BASEOBJS) popen.o
++check_swap_LDADD = $(BASEOBJS) runcmd.o
+ check_tcp_LDADD = $(NETLIBS) $(SSLLIBS)
+ check_time_LDADD = $(NETLIBS)
+ check_udp_LDADD = $(NETLIBS)
+ check_ups_LDADD = $(NETLIBS)
+-check_users_LDADD = $(BASEOBJS) popen.o
+-check_by_ssh_LDADD = $(NETLIBS) popen.o
++check_users_LDADD = $(BASEOBJS) runcmd.o
++check_by_ssh_LDADD = $(NETLIBS) runcmd.o
+ check_ide_smart_LDADD = $(BASEOBJS)
+-negate_LDADD = $(BASEOBJS) popen.o
+-urlize_LDADD = $(BASEOBJS) popen.o
++negate_LDADD = $(BASEOBJS) runcmd.o
++urlize_LDADD = $(BASEOBJS) runcmd.o
+ 
+ check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
+-check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) popen.o $(DEPLIBS)
+-check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS)
+-check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) popen.o $(DEPLIBS)
++check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS)
++check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) runcmd.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_fping_DEPENDENCIES = check_fping.c $(NETOBJS) runcmd.o $(DEPLIBS)
+ check_game_DEPENDENCIES = check_game.c  $(DEPLIBS)
+ check_http_DEPENDENCIES = check_http.c $(NETOBJS) $(DEPLIBS)
+-check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) popen.o $(DEPLIBS)
++check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) runcmd.o $(DEPLIBS)
+ check_icmp_DEPENDENCIES = check_icmp.c
+ 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_load_DEPENDENCIES = check_load.c $(BASEOBJS) runcmd.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_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
++check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) runcmd.o $(DEPLIBS)
+ check_nt_DEPENDENCIES = check_nt.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_ping_DEPENDENCIES = check_ping.c $(NETOBJS) runcmd.o $(DEPLIBS)
++check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) runcmd.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) popen.o $(DEPLIBS)
++check_snmp_DEPENDENCIES = check_snmp.c $(BASEOBJS) runcmd.o $(DEPLIBS)
+ check_smtp_DEPENDENCIES = check_smtp.c $(NETOBJS) $(DEPLIBS)
+ check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
+-check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
++check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) runcmd.o $(DEPLIBS)
+ check_tcp_DEPENDENCIES = check_tcp.c $(NETOBJS) $(DEPLIBS)
+ check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
+ check_udp_DEPENDENCIES = check_udp.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) popen.o $(DEPLIBS)
+-negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS)
+-urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
++check_users_DEPENDENCIES = check_users.c $(BASEOBJS) runcmd.o $(DEPLIBS)
++check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS)
++negate_DEPENDENCIES = negate.c $(BASEOBJS) runcmd.o $(DEPLIBS)
++urlize_DEPENDENCIES = urlize.c $(BASEOBJS) runcmd.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)
+ 
+diff -urN ../nplg/plugins/negate.c ./plugins/negate.c
+--- ../nplg/plugins/negate.c    2005-01-05 21:53:22.000000000 +0100
++++ ./plugins/negate.c  2005-06-10 15:01:26.000000000 +0200
+@@ -14,7 +14,7 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  
+- $Id: negate.c,v 1.24 2004/12/25 23:17:44 opensides Exp $
++ $Id: negate.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+ 
+ @@-<article>
+ 
+@@ -54,7 +54,7 @@
+ ******************************************************************************/
+ 
+ const char *progname = "negate";
+-const char *revision = "$Revision: 1.24 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "2002-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+@@ -62,7 +62,7 @@
+ 
+ #include "common.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ 
+ char *command_line;
+ 
+@@ -76,8 +76,9 @@
+ int
+ main (int argc, char **argv)
+ {
+-       int found = 0, result = STATE_UNKNOWN;
+-       char *buf;
++       int result = STATE_UNKNOWN;
++       output chld_out, chld_err;
++       size_t i;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -92,43 +93,26 @@
+ 
+        (void) alarm ((unsigned) timeout_interval);
+ 
+-       child_process = spopen (command_line);
+-       if (child_process == NULL)
+-               die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), command_line);
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), command_line);
+-       }
+-
+-       buf = malloc(MAX_INPUT_BUFFER);
+-       while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+-               found++;
+-               printf ("%s", buf);
+-       }
+-
+-       if (!found)
++       result = np_runcmd(command_line, &chld_out, &chld_err, 0);
++       if (!chld_out.buflen)
+                die (STATE_UNKNOWN,
+                     _("%s problem - No data received from host\nCMD: %s\n"),\
+                     argv[0], command_line);
+ 
+-       /* close the pipe */
+-       result = spclose (child_process);
++       for(i = 0; i < chld_out.lines; i++)
++               printf("%s", chld_out.line[i]);
+ 
+        /* WARNING if output found on stderr */
+-       if (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
++       if (chld_err.buflen != 0)
+                result = max_state (result, STATE_WARNING);
+ 
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+        if (result == STATE_OK)
+                exit (STATE_CRITICAL);
+-       else if (result == STATE_CRITICAL)
++       
++       if (result == STATE_CRITICAL)
+                exit (EXIT_SUCCESS);
+-       else
+-               exit (result);
++
++       exit (result);
+ }
+ 
+ /******************************************************************************
+diff -urN ../nplg/plugins/runcmd.c ./plugins/runcmd.c
+--- ../nplg/plugins/runcmd.c    1970-01-01 01:00:00.000000000 +0100
++++ ./plugins/runcmd.c  2005-06-10 15:01:26.000000000 +0200
+@@ -0,0 +1,339 @@
++/*
++ * $Id: runcmd.c,v 1.1 2005/06/05 21:55:26 exon Exp $
++ *
++ * A simple interface to executing programs from other programs, using an
++ * optimized and safe popen()-like implementation. It is considered safe
++ * in that no shell needs to be spawned and the environment passed to the
++ * execve()'d program is essentially empty.
++ *
++ *
++ * The code in this file is a derivative of popen.c which in turn was taken
++ * from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
++ *
++ * Care has been taken to make sure the functions are async-safe. The one
++ * function which isn't is np_runcmd_init() which it doesn't make sense to
++ * call twice anyway, so the api as a whole should be considered async-safe.
++ *
++ */
++
++/** includes **/
++#include "runcmd.h"
++#ifdef HAVE_SYS_WAIT_H
++# include <sys/wait.h>
++#endif
++
++/** macros **/
++#ifndef WEXITSTATUS
++# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
++#endif
++
++#ifndef WIFEXITED
++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
++#endif
++
++/* 4.3BSD Reno <signal.h> doesn't define SIG_ERR */
++#if defined(SIG_IGN) && !defined(SIG_ERR)
++# define SIG_ERR ((Sigfunc *)-1)
++#endif
++
++/* This variable must be global, since there's no way the caller
++ * can forcibly slay a dead or ungainly running program otherwise.
++ * Multithreading apps and plugins can initialize it (via NP_RUNCMD_INIT)
++ * in an async safe manner PRIOR to calling np_runcmd() for the first time.
++ *
++ * The check for initialized values is atomic and can
++ * occur in any number of threads simultaneously. */
++static pid_t *np_pids = NULL;
++
++/* If OPEN_MAX isn't defined, we try the sysconf syscall first.
++ * If that fails, we fall back to an educated guess which is accurate
++ * on Linux and some other systems. There's no guarantee that our guess is
++ * adequate and the program will die with SIGSEGV if it isn't and the
++ * upper boundary is breached. */
++#ifdef OPEN_MAX
++# define maxfd OPEN_MAX
++#else
++# ifndef _SC_OPEN_MAX /* sysconf macro unavailable, so guess */
++#  define maxfd 256
++# else
++static int maxfd = 0;
++# endif /* _SC_OPEN_MAX */
++#endif /* OPEN_MAX */
++
++
++/** prototypes **/
++static int np_runcmd_open(const char *, int *, int *)
++       __attribute__((__nonnull__(1, 2, 3)));
++
++static int np_fetch_output(int, output *, int)
++       __attribute__((__nonnull__(2)));
++
++static int np_runcmd_close(int);
++
++/* imported from utils.h */
++extern void die (int, const char *, ...)
++       __attribute__((__noreturn__,__format__(__printf__, 2, 3)));
++
++
++/* this function is NOT async-safe. It is exported so multithreaded
++ * plugins (or other apps) can call it prior to running any commands
++ * through this api and thus achieve async-safeness throughout the api */
++void np_runcmd_init(void)
++{
++#if !defined(OPEN_MAX) && defined(_SC_OPEN_MAX)
++       if(!maxfd) {
++               if((maxfd = sysconf(_SC_OPEN_MAX)) < 0) {
++                       /* possibly log or emit a warning here, since there's no
++                        * guarantee that our guess at maxfd will be adequate */
++                       maxfd = 256;
++               }
++       }
++#endif
++
++       if(!np_pids) np_pids = calloc(maxfd, sizeof(pid_t));
++}
++
++
++/* Start running a command */
++static int
++np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
++{
++       char *env[2];
++       char *cmd = NULL;
++       char **argv = NULL;
++       char *str;
++       int argc;
++       size_t cmdlen;
++       pid_t pid;
++#ifdef RLIMIT_CORE
++       struct rlimit limit;
++#endif
++
++       int i = 0;
++
++       if(!np_pids) NP_RUNCMD_INIT;
++
++       env[0] = strdup("LC_ALL=C");
++       env[1] = '\0';
++
++       /* if no command was passed, return with no error */
++       if (cmdstring == NULL)
++               return -1;
++
++       /* make copy of command string so strtok() doesn't silently modify it */
++       /* (the calling program may want to access it later) */
++       cmdlen = strlen(cmdstring);
++       cmd = malloc(cmdlen + 1);
++       if (cmd == NULL) return -1;
++       memcpy(cmd, cmdstring, cmdlen);
++
++       /* This is not a shell, so we don't handle "???" */
++       if (strstr (cmdstring, "\"")) return -1;
++
++       /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
++       if (strstr (cmdstring, " ' ") || strstr (cmdstring, "'''"))
++               return -1;
++
++       /* each arg must be whitespace-separated, so args can be a maximum
++        * of (len / 2) + 1. We add 1 extra to the mix for NULL termination */
++       argc = (cmdlen >> 1) + 2;
++       argv = calloc(sizeof(char *), argc);
++
++       if (argv == NULL) {
++               printf (_("Could not malloc argv array in popen()\n"));
++               return -1;
++       }
++
++       /* get command arguments (stupidly, but fairly quickly) */
++       while (cmd) {
++               str = cmd;
++               str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
++
++               if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
++                       str++;
++                       if (!strstr (str, "'")) return -1;      /* balanced? */
++                       cmd = 1 + strstr (str, "'");
++                       str[strcspn (str, "'")] = 0;
++               }
++               else {
++                       if (strpbrk (str, " \t\r\n")) {
++                               cmd = 1 + strpbrk (str, " \t\r\n");
++                               str[strcspn (str, " \t\r\n")] = 0;
++                       }
++                       else {
++                               cmd = NULL;
++                       }
++               }
++
++               if (cmd && strlen (cmd) == strspn (cmd, " \t\r\n"))
++                       cmd = NULL;
++
++               argv[i++] = str;
++       }
++
++       if (pipe(pfd) < 0 || pipe(pfderr) < 0 || (pid = fork()) < 0)
++               return -1; /* errno set by the failing function */
++
++       /* child runs exceve() and _exit. */
++       if (pid == 0) {
++#ifdef         RLIMIT_CORE
++               /* the program we execve shouldn't leave core files */
++               getrlimit (RLIMIT_CORE, &limit);
++               limit.rlim_cur = 0;
++               setrlimit (RLIMIT_CORE, &limit);
++#endif
++               close (pfd[0]);
++               if (pfd[1] != STDOUT_FILENO) {
++                       dup2 (pfd[1], STDOUT_FILENO);
++                       close (pfd[1]);
++               }
++               close (pfderr[0]);
++               if (pfderr[1] != STDERR_FILENO) {
++                       dup2 (pfderr[1], STDERR_FILENO);
++                       close (pfderr[1]);
++               }
++
++               /* close all descriptors in np_pids[]
++                * This is executed in a separate address space (pure child),
++                * so we don't have to worry about async safety */
++               for (i = 0; i < maxfd; i++)
++                       if(np_pids[i] > 0)
++                               close (i);
++
++               execve (argv[0], argv, env);
++               _exit (0);
++       }
++
++       /* parent picks up execution here */
++       /* close childs descriptors in our address space */
++       close(pfd[1]);
++       close(pfderr[1]);
++
++       /* tag our file's entry in the pid-list and return it */
++       np_pids[pfd[0]] = pid;
++
++       return pfd[0];
++}
++
++
++static int
++np_runcmd_close(int fd)
++{
++       int status;
++       pid_t pid;
++
++       /* make sure this fd was opened by popen() */
++       if(fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0)
++               return -1;
++
++       np_pids[fd] = 0;
++       if (close (fd) == -1) return -1;
++
++       /* EINTR is ok (sort of), everything else is bad */
++       while (waitpid (pid, &status, 0) < 0)
++               if (errno != EINTR) return -1;
++
++       /* return child's termination status */
++       return (WIFEXITED(status)) ? WEXITSTATUS(status) : -1;
++}
++
++
++void
++popen_timeout_alarm_handler (int signo)
++{
++       size_t i;
++
++       if (signo == SIGALRM)
++               puts(_("CRITICAL - Plugin timed out while executing system call\n"));
++
++       if(np_pids) for(i = 0; i < maxfd; i++) {
++               if(np_pids[i] != 0) kill(np_pids[i], SIGKILL);
++       }
++
++       exit (STATE_CRITICAL);
++}
++
++
++static int
++np_fetch_output(int fd, output *op, int flags)
++{
++       size_t len = 0, i = 0;
++       size_t rsf = 6, ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */
++       char *buf = NULL;
++       int ret;
++       char tmpbuf[4096];
++
++       op->buf = NULL;
++       op->buflen = 0;
++       while((ret = read(fd, tmpbuf, sizeof(tmpbuf))) > 0) {
++               len = (size_t)ret;
++               op->buf = realloc(op->buf, op->buflen + len + 1);
++               memcpy(op->buf + op->buflen, tmpbuf, len);
++               op->buflen += len;
++               i++;
++       }
++
++       if(ret < 0) {
++               printf("read() returned %d: %s\n", ret, strerror(errno));
++               return ret;
++       }
++
++       if(!op->buf || !op->buflen) return 0;
++
++       /* some plugins may want to keep output unbroken */
++       if(flags & RUNCMD_NO_ARRAYS)
++               return op->buflen;
++
++       /* and some may want both (*sigh*) */
++       if(flags & RUNCMD_NO_ASSOC) {
++               buf = malloc(op->buflen);
++               memcpy(buf, op->buf, op->buflen);
++       }
++       else buf = op->buf;
++
++       op->line = NULL;
++       op->lens = NULL;
++       len = i = 0;
++       while(i < op->buflen) {
++               /* make sure we have enough memory */
++               if(len >= ary_size) {
++                       ary_size = op->buflen >> --rsf;
++                       op->line = realloc(op->line, ary_size * sizeof(char *));
++                       op->lens = realloc(op->lens, ary_size * sizeof(size_t));
++               }
++
++               /* set the pointer to the string */
++               op->line[len] = &buf[i];
++
++               /* hop to next newline or end of buffer */
++               while(buf[i] != '\n' && i < op->buflen) i++;
++               buf[i] = '\0';
++
++               /* calculate the string length using pointer difference */
++               op->lens[len] = (size_t)&buf[i] - (size_t)op->line[len];
++               
++               len++;
++               i++;
++       }
++
++       return len;
++}
++
++
++int
++np_runcmd(const char *cmd, output *out, output *err, int flags)
++{
++       int fd, pfd_out[2], pfd_err[2];
++
++       /* initialize the structs */
++       if(out) memset(out, 0, sizeof(output));
++       if(err) memset(err, 0, sizeof(output));
++
++       if((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1)
++               die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
++
++       if(out) out->lines = np_fetch_output(pfd_out[0], out, flags);
++       if(err) err->lines = np_fetch_output(pfd_err[0], err, flags);
++
++       return np_runcmd_close(fd);
++}
+diff -urN ../nplg/plugins/runcmd.h ./plugins/runcmd.h
+--- ../nplg/plugins/runcmd.h    1970-01-01 01:00:00.000000000 +0100
++++ ./plugins/runcmd.h  2005-06-10 15:01:26.000000000 +0200
+@@ -0,0 +1,39 @@
++/*
++ * $Id: runcmd.h,v 1.1 2005/06/05 21:55:26 exon Exp $
++ * 
++ * Author: Andreas Ericsson <ae@op5.se>
++ *
++ * Copyright: GNU GPL v2 or any later version.
++ * 
++ */
++
++#ifndef NAGIOSPLUG_RUNCMD_H
++#define NAGIOSPLUG_RUNCMD_H
++
++#include "common.h"
++
++/** types **/
++struct output {
++       char *buf;     /* output buffer */
++       size_t buflen; /* output buffer content length */
++       char **line;   /* array of lines (points to buf) */
++       size_t *lens;  /* string lengths */
++       size_t lines;  /* lines of output */
++};
++
++typedef struct output output;
++
++/** prototypes **/
++int np_runcmd(const char *, output *, output *, int);
++void popen_timeout_alarm_handler(int)
++       __attribute__((__noreturn__));
++
++/* only multi-threaded plugins need to bother with this */
++void np_runcmd_init(void);
++#define NP_RUNCMD_INIT np_runcmd_init()
++
++/* possible flags for np_runcmd()'s fourth argument */
++#define RUNCMD_NO_ARRAYS 0x01 /* don't populate arrays at all */
++#define RUNCMD_NO_ASSOC 0x02  /* output.line won't point to buf */
++
++#endif /* NAGIOSPLUG_RUNCMD_H */
+diff -urN ../nplg/plugins/urlize.c ./plugins/urlize.c
+--- ../nplg/plugins/urlize.c    2005-01-05 21:53:23.000000000 +0100
++++ ./plugins/urlize.c  2005-06-10 15:01:26.000000000 +0200
+@@ -14,18 +14,18 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: urlize.c,v 1.17 2004/12/25 23:17:44 opensides Exp $
++ $Id: urlize.c,v 1.2 2005/06/05 21:55:26 exon Exp $
+  
+ ******************************************************************************/
+ 
+ const char *progname = "urlize";
+-const char *revision = "$Revision: 1.17 $";
++const char *revision = "$Revision: 1.2 $";
+ const char *copyright = "2000-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "runcmd.h"
+ 
+ void print_help (void);
+ void print_usage (void);
+@@ -33,10 +33,11 @@
+ int
+ main (int argc, char **argv)
+ {
+-       int found = 0, result = STATE_UNKNOWN;
++       int result = STATE_UNKNOWN;
+        char *url = NULL;
+        char *cmd;
+-       char *buf;
++       output chld_out, chld_err;
++       size_t i;
+ 
+        int c;
+        int option = 0;
+@@ -67,55 +68,37 @@
+                        exit (EXIT_SUCCESS);
+                        break;
+                case 'u':
+-                       url = strdup (argv[optind]);
++                       url = optarg;
+                        break;
+                case '?':
+                default:
+-                       usage2 (_("Unknown argument"), optarg);
++                       usage3 (_("Unknown argument"), c);
+                }
+        }
+ 
+-       if (url == NULL)
+-               url = strdup (argv[optind++]);
++       if (url == NULL && optind < argc - 1)
++               url = argv[optind++];
+ 
+        cmd = strdup (argv[optind++]);
+        for (c = optind; c < argc; c++) {
+                asprintf (&cmd, "%s %s", cmd, argv[c]);
+        }
+ 
+-       child_process = spopen (cmd);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), cmd);
+-               exit (STATE_UNKNOWN);
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), cmd);
+-       }
++       result = np_runcmd(cmd, &chld_out, &chld_err, 0);
++       printf ("<A href=\"%s\">", url);
+ 
+-       buf = malloc(MAX_INPUT_BUFFER);
+-       printf ("<A href=\"%s\">", argv[1]);
+-       while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+-               found++;
+-               printf ("%s", buf);
+-       }
+-
+-       if (!found)
++       if (!chld_out.lines)
+                die (STATE_UNKNOWN,
+                     _("%s UNKNOWN - No data received from host\nCMD: %s</A>\n"),
+                     argv[0], cmd);
+ 
+-       /* close the pipe */
+-       result = spclose (child_process);
++       for(i = 0; i < chld_out.lines; i++)
++               printf("%s", chld_out.line[i]);
+ 
+        /* WARNING if output found on stderr */
+-       if (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
++       if (chld_err.buflen)
+                result = max_state (result, STATE_WARNING);
+ 
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+        printf ("</A>\n");
+        return result;
+ }
diff --git a/web/attachments/137903-nagiosplug-check_dhcp-unicast.diff b/web/attachments/137903-nagiosplug-check_dhcp-unicast.diff
new file mode 100644
index 0000000..693de0f
--- /dev/null
+++ b/web/attachments/137903-nagiosplug-check_dhcp-unicast.diff
@@ -0,0 +1,1894 @@
+--- ../nplg/plugins/check_dhcp.c        2005-01-28 15:00:58.000000000 +0100
++++ ./plugins/check_dhcp.c      2005-06-08 15:28:58.000000000 +0200
+@@ -22,12 +22,18 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+-* $Id: check_dhcp.c,v 1.7 2005/01/25 18:11:21 harpermann Exp $
++*--------------------------------------------------------------------------
++* Unicast mode was originally implemented by Heiti of Boras Kommun with
++* general improvements as well as usability fixes and "forward"-porting by
++* Andreas Ericsson of OP5 AB.
++*--------------------------------------------------------------------------
++*
++* $Id: check_dhcp.c,v 1.9 2005/06/07 15:57:53 exon Exp $
+ *
+ *****************************************************************************/
+ 
+ const char *progname = "check_dhcp";
+-const char *revision = "$Revision: 1.7 $";
++const char *revision = "$Revision: 1.9 $";
+ const char *copyright = "2001-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+@@ -64,8 +70,8 @@
+ 
+ #elif defined(__sun__) || defined(__solaris__) || defined(__hpux__)
+ 
+-#define INSAP 22 
+-#define OUTSAP 24 
++#define INSAP 22
++#define OUTSAP 24
+ 
+ #include <signal.h>
+ #include <ctype.h>
+@@ -73,19 +79,17 @@
+ #include <sys/poll.h>
+ #include <sys/dlpi.h>
+ 
+-#define bcopy(source, destination, length) memcpy(destination, source, length)
+-
+-#define AREA_SZ 5000           /* buffer length in bytes */ 
++#define AREA_SZ 5000                   /* buffer length in bytes */
+ static u_long ctl_area[AREA_SZ];
+ static u_long dat_area[AREA_SZ];
+-static struct strbuf ctl = {AREA_SZ, 0, (char *)ctl_area};
+-static struct strbuf dat = {AREA_SZ, 0, (char *)dat_area};
++static struct strbuf ctl = { AREA_SZ, 0, (char *)ctl_area };
++static struct strbuf dat = { AREA_SZ, 0, (char *)dat_area };
+ 
+-#define GOT_CTRL 1 
+-#define GOT_DATA 2 
+-#define GOT_BOTH 3 
+-#define GOT_INTR 4 
+-#define GOT_ERR 128 
++#define GOT_CTRL 1
++#define GOT_DATA 2
++#define GOT_BOTH 3
++#define GOT_INTR 4
++#define GOT_ERR 128
+ 
+ #define u_int8_t        uint8_t
+ #define u_int16_t      uint16_t
+@@ -97,26 +101,11 @@
+ static int put_both(int, int, int, int);
+ static int dl_open(const char *, int, int *);
+ static int dl_bind(int, int, u_char *);
+-long mac_addr_dlpi( const char *, int, u_char *);
++static long mac_addr_dlpi(const char *, int, u_char *);
+ 
+ #endif
+ 
+-#define HAVE_GETOPT_H
+-
+-
+-/**** Common definitions ****/
+-
+-#define STATE_OK          0
+-#define STATE_WARNING     1
+-#define STATE_CRITICAL    2
+-#define STATE_UNKNOWN     -1
+-
+-#define OK                0
+-#define ERROR             -1
+-
+-#define FALSE             0
+-#define TRUE              1
+-
++static int add_requested_server(struct in_addr server_address);
+ 
+ /**** DHCP definitions ****/
+ 
+@@ -126,39 +115,39 @@
+ #define MAX_DHCP_OPTIONS_LENGTH          312
+ 
+ 
+-typedef struct dhcp_packet_struct{
+-        u_int8_t  op;                   /* packet type */
+-        u_int8_t  htype;                /* type of hardware address for this machine (Ethernet, etc) */
+-        u_int8_t  hlen;                 /* length of hardware address (of this machine) */
+-        u_int8_t  hops;                 /* hops */
+-        u_int32_t xid;                  /* random transaction id number - chosen by this machine */
+-        u_int16_t secs;                 /* seconds used in timing */
+-        u_int16_t flags;                /* flags */
+-        struct in_addr ciaddr;          /* IP address of this machine (if we already have one) */
+-        struct in_addr yiaddr;          /* IP address of this machine (offered by the DHCP server) */
+-        struct in_addr siaddr;          /* IP address of DHCP server */
+-        struct in_addr giaddr;          /* IP address of DHCP relay */
+-        unsigned char chaddr [MAX_DHCP_CHADDR_LENGTH];      /* hardware address of this machine */
+-        char sname [MAX_DHCP_SNAME_LENGTH];    /* name of DHCP server */
+-        char file [MAX_DHCP_FILE_LENGTH];      /* boot file name (used for diskless booting?) */
+-       char options[MAX_DHCP_OPTIONS_LENGTH];  /* options */
+-        }dhcp_packet;
+-
+-
+-typedef struct dhcp_offer_struct{
+-       struct in_addr server_address;   /* address of DHCP server that sent this offer */
+-       struct in_addr offered_address;  /* the IP address that was offered to us */
+-       u_int32_t lease_time;            /* lease time in seconds */
+-       u_int32_t renewal_time;          /* renewal time in seconds */
+-       u_int32_t rebinding_time;        /* rebinding time in seconds */
++typedef struct dhcp_packet_struct {
++       u_int8_t op;                            /* packet type */
++       u_int8_t htype;                         /* type of hardware address for this machine (Ethernet, etc) */
++       u_int8_t hlen;                          /* length of hardware address (of this machine) */
++       u_int8_t hops;                          /* hops */
++       u_int32_t xid;                          /* random transaction id number - chosen by this machine */
++       u_int16_t secs;                         /* seconds used in timing */
++       u_int16_t flags;                        /* flags */
++       struct in_addr ciaddr;          /* IP address of this machine (if we already have one) */
++       struct in_addr yiaddr;          /* IP address of this machine (offered by the DHCP server) */
++       struct in_addr siaddr;          /* IP address of DHCP server */
++       struct in_addr giaddr;          /* IP address of DHCP relay */
++       unsigned char chaddr[MAX_DHCP_CHADDR_LENGTH];   /* hardware address of this machine */
++       char sname[MAX_DHCP_SNAME_LENGTH];      /* name of DHCP server */
++       char file[MAX_DHCP_FILE_LENGTH];        /* boot file name (used for diskless booting?) */
++       char options[MAX_DHCP_OPTIONS_LENGTH];  /* options */
++} dhcp_packet;
++
++
++typedef struct dhcp_offer_struct {
++       struct in_addr server_address;  /* address of DHCP server that sent this offer */
++       struct in_addr offered_address; /* the IP address that was offered to us */
++       u_int32_t lease_time;           /* lease time in seconds */
++       u_int32_t renewal_time;         /* renewal time in seconds */
++       u_int32_t rebinding_time;       /* rebinding time in seconds */
+        struct dhcp_offer_struct *next;
+-        }dhcp_offer;
++} dhcp_offer;
+ 
+ 
+-typedef struct requested_server_struct{
++typedef struct requested_server_struct {
+        struct in_addr server_address;
+        struct requested_server_struct *next;
+-        }requested_server;
++} requested_server;
+ 
+ 
+ #define BOOTREQUEST     1
+@@ -183,35 +172,40 @@
+ #define DHCP_INFINITE_TIME              0xFFFFFFFF
+ 
+ #define DHCP_BROADCAST_FLAG 32768
++#define DHCP_UNICAST_FLAG   0
+ 
+ #define DHCP_SERVER_PORT   67
+ #define DHCP_CLIENT_PORT   68
+ 
+-#define ETHERNET_HARDWARE_ADDRESS            1     /* used in htype field of dhcp packet */
+-#define ETHERNET_HARDWARE_ADDRESS_LENGTH     6     /* length of Ethernet hardware addresses */
++#define ETH_HW_ADDR            1       /* used in htype field of dhcp packet */
++#define ETH_HW_ADDR_LEN     6  /* length of Ethernet hardware addresses */
+ 
+-unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH]="";
++u_int8_t unicast_hops = 0;   /* number of hops for unicast dhcp */
++struct in_addr my_ip;        /* our address (required for relay) */
++struct in_addr dhcp_ip;      /* server to query (if in unicast mode) */
++struct sockaddr_in *my_addr; /* used to obtain our address */
++unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH] = "";
+ 
+-char network_interface_name[8]="eth0";
++char network_interface_name[8] = "eth0";
+ 
+-u_int32_t packet_xid=0;
++u_int32_t packet_xid = 0;
+ 
+-u_int32_t dhcp_lease_time=0;
+-u_int32_t dhcp_renewal_time=0;
+-u_int32_t dhcp_rebinding_time=0;
++u_int32_t dhcp_lease_time = 0;
++u_int32_t dhcp_renewal_time = 0;
++u_int32_t dhcp_rebinding_time = 0;
+ 
+-int dhcpoffer_timeout=2;
++int dhcpoffer_timeout = 2;
+ 
+-dhcp_offer *dhcp_offer_list=NULL;
+-requested_server *requested_server_list=NULL;
++dhcp_offer *dhcp_offer_list = NULL;
++requested_server *requested_server_list = NULL;
+ 
+-int valid_responses=0;     /* number of valid DHCPOFFERs we received */
+-int requested_servers=0;   
+-int requested_responses=0;
++int valid_responses = 0;               /* number of valid DHCPOFFERs we received */
++int requested_servers = 0;
++int requested_responses = 0;
+ 
+-int request_specific_address=FALSE;
+-int received_requested_address=FALSE;
+-int verbose=0;
++int request_specific_address = FALSE;
++int received_requested_address = FALSE;
++int verbose = 0;
+ struct in_addr requested_address;
+ 
+ 
+@@ -221,41 +215,42 @@
+ void print_usage(void);
+ void print_help(void);
+ 
+-int get_hardware_address(int,char *);
++int get_hardware_address(int, char *);
+ 
+ int send_dhcp_discover(int);
+ int get_dhcp_offer(int);
+ 
+ int get_results(void);
+ 
+-int add_dhcp_offer(struct in_addr,dhcp_packet *);
++int add_dhcp_offer(struct in_addr, dhcp_packet *);
+ int free_dhcp_offer_list(void);
+ int free_requested_server_list(void);
+ 
+ int create_dhcp_socket(void);
+-int close_dhcp_socket(int);
+-int send_dhcp_packet(void *,int,int,struct sockaddr_in *);
+-int receive_dhcp_packet(void *,int,int,int,struct sockaddr_in *);
++int send_dhcp_packet(void *, int, int, struct sockaddr_in *);
++int receive_dhcp_packet(void *, int, int, int, struct sockaddr_in *);
+ 
+ 
+ 
+-int main(int argc, char **argv){
++int
++main(int argc, char **argv)
++{
+        int dhcp_socket;
+        int result;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-       
+-       if(process_arguments(argc,argv)!=OK){
+-               usage4 (_("Could not parse arguments"));
+-               }
++       setlocale(LC_ALL, "");
++       bindtextdomain(PACKAGE, LOCALEDIR);
++       textdomain(PACKAGE);
++
++       if(process_arguments(argc, argv) != OK) {
++               usage4(_("Could not parse arguments"));
++       }
+ 
+        /* create socket for DHCP communications */
+-       dhcp_socket=create_dhcp_socket();
++       dhcp_socket = create_dhcp_socket();
+ 
+        /* get hardware address of client machine */
+-       get_hardware_address(dhcp_socket,network_interface_name);
++       get_hardware_address(dhcp_socket, network_interface_name);
+ 
+        /* send DHCPDISCOVER packet */
+        send_dhcp_discover(dhcp_socket);
+@@ -264,930 +259,967 @@
+        get_dhcp_offer(dhcp_socket);
+ 
+        /* close socket we created */
+-       close_dhcp_socket(dhcp_socket);
++       close(dhcp_socket);
+ 
+        /* determine state/plugin output to return */
+-       result=get_results();
++       result = get_results();
+ 
+        /* free allocated memory */
+        free_dhcp_offer_list();
+        free_requested_server_list();
+ 
+        return result;
+-        }
+-
++}
+ 
+ 
+ /* determines hardware address on client machine */
+-int get_hardware_address(int sock,char *interface_name){
+-
++int
++get_hardware_address(int sock, char *interface_name)
++{
+        int i;
+ 
+ #if defined(__linux__)
+        struct ifreq ifr;
+ 
+-       strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name));
+-       
++       strncpy((char *)&ifr.ifr_name, interface_name, sizeof(ifr.ifr_name));
++
+        /* try and grab hardware address of requested interface */
+-       if(ioctl(sock,SIOCGIFHWADDR,&ifr)<0){
+-                printf(_("Error: Could not get hardware address of interface '%s'\n"),interface_name);
++       if(ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
++               printf(_("Error: Could not get hardware address of interface '%s'\n"),
++                          interface_name);
+                exit(STATE_UNKNOWN);
+-               }
++       }
++       memcpy(&client_hardware_address[0], &ifr.ifr_hwaddr.sa_data, 6);
++
++       /* get the IP of the interface we're using if this is a unicast request */
++       if(unicast_hops) {
++               if(ioctl(sock, SIOCGIFADDR, &ifr) < 0) {
++                       printf(_("Error: Could not determine IP-address of interface '%s'\n"),
++                                  interface_name);
++                       exit(STATE_UNKNOWN);
++               }
+ 
+-       memcpy(&client_hardware_address[0],&ifr.ifr_hwaddr.sa_data,6);
++               /* cast it to avoid black pointer magic */
++               my_addr = (struct sockaddr_in *)&ifr.ifr_addr;
++               my_ip.s_addr = my_addr->sin_addr.s_addr;
++               if(verbose)
++                       printf("Pretending to be relay client %s\n", inet_ntoa(my_ip));
++       }
+ 
+ #elif defined(__bsd__)
+-                                               /* King 2004    see ACKNOWLEDGEMENTS */
++       /* King 2004    see ACKNOWLEDGEMENTS */
+ 
+-        int                     mib[6], len;
+-        char                    *buf;
+-        unsigned char           *ptr;
+-        struct if_msghdr        *ifm;
+-        struct sockaddr_dl      *sdl;
+-
+-        mib[0] = CTL_NET;
+-        mib[1] = AF_ROUTE;
+-        mib[2] = 0;
+-        mib[3] = AF_LINK;
+-        mib[4] = NET_RT_IFLIST;
+-
+-        if ((mib[5] = if_nametoindex(interface_name)) == 0) {
+-                printf(_("Error: if_nametoindex error - %s.\n"), strerror(errno));
+-                exit(STATE_UNKNOWN);
+-        }
+-
+-        if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
+-                printf(_("Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"), interface_name, strerror(errno));
+-                exit(STATE_UNKNOWN);
+-        }
+-
+-        if ((buf = malloc(len)) == NULL) {
+-                printf(_("Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"), interface_name, strerror(errno));
+-                exit(4);
+-        }
+-
+-        if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
+-                printf(_("Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"), interface_name, strerror(errno));
+-                exit(STATE_UNKNOWN);
+-        }
+-
+-        ifm = (struct if_msghdr *)buf;
+-        sdl = (struct sockaddr_dl *)(ifm + 1);
+-        ptr = (unsigned char *)LLADDR(sdl);
+-        memcpy(&client_hardware_address[0], ptr, 6) ;
+-                                               /* King 2004 */
++       int mib[6], len;
++       char *buf;
++       unsigned char *ptr;
++       struct if_msghdr *ifm;
++       struct sockaddr_dl *sdl;
++
++       mib[0] = CTL_NET;
++       mib[1] = AF_ROUTE;
++       mib[2] = 0;
++       mib[3] = AF_LINK;
++       mib[4] = NET_RT_IFLIST;
++
++       if((mib[5] = if_nametoindex(interface_name)) == 0) {
++               printf(_("Error: if_nametoindex error - %s.\n"), strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++
++       if(sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
++               printf(_("Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"),
++                      interface_name, strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++
++       if((buf = malloc(len)) == NULL) {
++               printf(_("Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"),
++                      interface_name, strerror(errno));
++               exit(4);
++       }
++
++       if(sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
++               printf(_("Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"),
++                      interface_name, strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++
++       ifm = (struct if_msghdr *)buf;
++       sdl = (struct sockaddr_dl *)(ifm + 1);
++       ptr = (unsigned char *)LLADDR(sdl);
++       memcpy(&client_hardware_address[0], ptr, 6);
++       /* King 2004 */
+ 
+ #elif defined(__sun__) || defined(__solaris__)
+ 
+-                                               /* Kompf 2000-2003      see ACKNOWLEDGEMENTS */
++       /* Kompf 2000-2003  see ACKNOWLEDGEMENTS */
+        long stat;
+        char dev[20] = "/dev/";
+        char *p;
+        int unit;
+ 
+-       for (p = interface_name; *p && isalpha(*p); p++)
+-               /* no-op */ ;
+-       if ( p != '\0' ) {
+-               unit = atoi(p) ;
+-               *p = '\0' ;
+-               strncat(dev, interface_name, 6) ;
+-       } else {
+-               printf(_("Error: can't find unit number in interface_name (%s) - expecting TypeNumber eg lnc0.\n"), interface_name);
++       for(p = interface_name; *p && isalpha(*p); p++) /* no-op */ ;
++
++       if(p != '\0') {
++               unit = atoi(p);
++               *p = '\0';
++               strncat(dev, interface_name, 6);
++       }
++       else {
++               printf(_("Error: can't find unit number in interface_name (%s) - expecting TypeNumber eg lnc0.\n"),
++                      interface_name);
+                exit(STATE_UNKNOWN);
+        }
+        stat = mac_addr_dlpi(dev, unit, client_hardware_address);
+-       if (stat != 0) {
+-               printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
++       if(stat != 0) {
++               printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"),
++                      dev, unit);
+                exit(STATE_UNKNOWN);
+        }
+ 
+ #elif defined(__hpux__)
+ 
+        long stat;
+-       char dev[20] = "/dev/dlpi" ;
++       char dev[20] = "/dev/dlpi";
+        int unit = 0;
+ 
+        stat = mac_addr_dlpi(dev, unit, client_hardware_address);
+-       if (stat != 0) {
+-               printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
++       if(stat != 0) {
++               printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"),
++                      dev, unit);
+                exit(STATE_UNKNOWN);
+        }
+-                                               /* Kompf 2000-2003 */
++       /* Kompf 2000-2003 */
+ 
+ #else
+        printf(_("Error: can't get MAC address for this architecture.\n"));
+        exit(STATE_UNKNOWN);
+ #endif
+ 
+-       if (verbose) { 
++       if(verbose) {
+                printf(_("Hardware address: "));
+-               for (i=0; i<6; ++i)
++               for(i = 0; i < 6; ++i)
+                        printf("%2.2x", client_hardware_address[i]);
+-               printf( "\n");
++               printf("\n");
+        }
+ 
+        return OK;
+-        }
++}
+ 
+ 
+ /* sends a DHCPDISCOVER broadcast message in an attempt to find DHCP servers */
+-int send_dhcp_discover(int sock){
++int
++send_dhcp_discover(int sock)
++{
+        dhcp_packet discover_packet;
+        struct sockaddr_in sockaddr_broadcast;
+ 
+ 
+        /* clear the packet data structure */
+-       bzero(&discover_packet,sizeof(discover_packet));
+-
++       memset(&discover_packet, 0, sizeof(discover_packet));
+ 
+        /* boot request flag (backward compatible with BOOTP servers) */
+-       discover_packet.op=BOOTREQUEST;
++       discover_packet.op = BOOTREQUEST;
+ 
+        /* hardware address type */
+-       discover_packet.htype=ETHERNET_HARDWARE_ADDRESS;
++       discover_packet.htype = ETH_HW_ADDR;
+ 
+        /* length of our hardware address */
+-       discover_packet.hlen=ETHERNET_HARDWARE_ADDRESS_LENGTH;
+-
+-       discover_packet.hops=0;
++       discover_packet.hlen = ETH_HW_ADDR_LEN;
+ 
+-       /* transaction id is supposed to be random */
++       /* transaction id is supposed to be random. We won't use the address so
++        * we don't care about high entropy here. time() is good enough */
+        srand(time(NULL));
+-       packet_xid=random();
+-       discover_packet.xid=htonl(packet_xid);
++       packet_xid = random();
++       discover_packet.xid = htonl(packet_xid);
+ 
+        /**** WHAT THE HECK IS UP WITH THIS?!?  IF I DON'T MAKE THIS CALL, ONLY ONE SERVER RESPONSE IS PROCESSED!!!! ****/
+        /* downright bizzarre... */
+        ntohl(discover_packet.xid);
+ 
+-       /*discover_packet.secs=htons(65535);*/
+-       discover_packet.secs=0xFF;
++       /*discover_packet.secs=htons(65535); */
++       discover_packet.secs = 0xFF;
+ 
+-       /* tell server it should broadcast its response */ 
+-       discover_packet.flags=htons(DHCP_BROADCAST_FLAG);
++       /* server needs to know if it should broadcast or unicast its response.
++        * 0x8000L == 32768 == 1 << 15 == broadcast, 0 == unicast */
++       discover_packet.flags = unicast_hops == 0 ? htons(DHCP_BROADCAST_FLAG) : 0;
+ 
+        /* our hardware address */
+-       memcpy(discover_packet.chaddr,client_hardware_address,ETHERNET_HARDWARE_ADDRESS_LENGTH);
++       memcpy(discover_packet.chaddr, client_hardware_address, ETH_HW_ADDR_LEN);
+ 
+        /* first four bytes of options field is magic cookie (as per RFC 2132) */
+-       discover_packet.options[0]='\x63';
+-       discover_packet.options[1]='\x82';
+-       discover_packet.options[2]='\x53';
+-       discover_packet.options[3]='\x63';
++       discover_packet.options[0] = '\x63';
++       discover_packet.options[1] = '\x82';
++       discover_packet.options[2] = '\x53';
++       discover_packet.options[3] = '\x63';
+ 
+        /* DHCP message type is embedded in options field */
+-       discover_packet.options[4]=DHCP_OPTION_MESSAGE_TYPE;    /* DHCP message type option identifier */
+-       discover_packet.options[5]='\x01';               /* DHCP message option length in bytes */
+-       discover_packet.options[6]=DHCPDISCOVER;
++       discover_packet.options[4] = DHCP_OPTION_MESSAGE_TYPE;  /* DHCP message type option identifier */
++       discover_packet.options[5] = '\x01';    /* DHCP message option length in bytes */
++       discover_packet.options[6] = DHCPDISCOVER;
+ 
+        /* the IP address we're requesting */
+-       if(request_specific_address==TRUE){
+-               discover_packet.options[7]=DHCP_OPTION_REQUESTED_ADDRESS;
+-               discover_packet.options[8]='\x04';
+-               memcpy(&discover_packet.options[9],&requested_address,sizeof(requested_address));
+-               }
+-       
+-       /* send the DHCPDISCOVER packet to broadcast address */
+-        sockaddr_broadcast.sin_family=AF_INET;
+-        sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
+-        sockaddr_broadcast.sin_addr.s_addr=INADDR_BROADCAST;
+-       bzero(&sockaddr_broadcast.sin_zero,sizeof(sockaddr_broadcast.sin_zero));
++       if(request_specific_address == TRUE) {
++               discover_packet.options[7] = DHCP_OPTION_REQUESTED_ADDRESS;
++               discover_packet.options[8] = '\x04';
++               memcpy(&discover_packet.options[9], &requested_address,
++                      sizeof(requested_address));
++       }
++
++       /* unicast mods goes here */
++       if(unicast_hops)
++               discover_packet.giaddr.s_addr = my_ip.s_addr;
+ 
++       discover_packet.hops = unicast_hops;
+ 
+-       if (verbose) {
+-               printf(_("DHCPDISCOVER to %s port %d\n"),inet_ntoa(sockaddr_broadcast.sin_addr),ntohs(sockaddr_broadcast.sin_port));
+-               printf("DHCPDISCOVER XID: %lu (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));
+-               printf("DHCDISCOVER ciaddr:  %s\n",inet_ntoa(discover_packet.ciaddr));
+-               printf("DHCDISCOVER yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));
+-               printf("DHCDISCOVER siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));
+-               printf("DHCDISCOVER giaddr:  %s\n",inet_ntoa(discover_packet.giaddr));
++       /* send the DHCPDISCOVER packet to broadcast address */
++       sockaddr_broadcast.sin_family = AF_INET;
++       sockaddr_broadcast.sin_port = htons(DHCP_SERVER_PORT);
++       sockaddr_broadcast.sin_addr.s_addr = unicast_hops == 0 ? INADDR_BROADCAST : dhcp_ip.s_addr;
++       memset(&sockaddr_broadcast.sin_zero, 0, sizeof(sockaddr_broadcast.sin_zero));
++
++
++       if(verbose) {
++               printf(_("DHCPDISCOVER to %s port %d\n"),
++                          inet_ntoa(sockaddr_broadcast.sin_addr),
++                          ntohs(sockaddr_broadcast.sin_port));
++               printf("DHCPDISCOVER XID: %u (0x%X)\n", ntohl(discover_packet.xid),
++                          ntohl(discover_packet.xid));
++               printf("DHCDISCOVER ciaddr:  %s\n", inet_ntoa(discover_packet.ciaddr));
++               printf("DHCDISCOVER yiaddr:  %s\n", inet_ntoa(discover_packet.yiaddr));
++               printf("DHCDISCOVER siaddr:  %s\n", inet_ntoa(discover_packet.siaddr));
++               printf("DHCDISCOVER giaddr:  %s\n", inet_ntoa(discover_packet.giaddr));
+        }
+ 
+        /* send the DHCPDISCOVER packet out */
+-       send_dhcp_packet(&discover_packet,sizeof(discover_packet),sock,&sockaddr_broadcast);
++       send_dhcp_packet(&discover_packet, sizeof(discover_packet), sock,
++                                        &sockaddr_broadcast);
+ 
+-       if (verbose) 
+-               printf("\n\n");
++       if(verbose) printf("\n\n");
+ 
+        return OK;
+-        }
+-
+-
++}
+ 
+ 
+ /* waits for a DHCPOFFER message from one or more DHCP servers */
+-int get_dhcp_offer(int sock){
++int
++get_dhcp_offer(int sock)
++{
+        dhcp_packet offer_packet;
+        struct sockaddr_in source;
+-       int result=OK;
+-       int timeout=1;
+-       int responses=0;
++       int result = OK;
++       int responses = 0;
+        int x;
+-       time_t start_time;
++       time_t dhcp_start_time;
+        time_t current_time;
+ 
+-       time(&start_time);
++       time(&dhcp_start_time);
+ 
+        /* receive as many responses as we can */
+-       for(responses=0,valid_responses=0;;){
++       for(responses = 0, valid_responses = 0;;) {
+ 
+                time(&current_time);
+-               if((current_time-start_time)>=dhcpoffer_timeout)
++               if((current_time - dhcp_start_time) >= dhcpoffer_timeout)
+                        break;
+ 
+-               if (verbose) 
+-                       printf("\n\n");
++               if(verbose) printf("\n\n");
+ 
+-               bzero(&source,sizeof(source));
+-               bzero(&offer_packet,sizeof(offer_packet));
++               memset(&source, 0, sizeof(source));
++               memset(&offer_packet, 0, sizeof(offer_packet));
+ 
+-               result=OK;
+-               result=receive_dhcp_packet(&offer_packet,sizeof(offer_packet),sock,dhcpoffer_timeout,&source);
+-               
+-               if(result!=OK){
+-                       if (verbose)
+-                               printf(_("Result=ERROR\n"));
++               result = OK;
++               result = receive_dhcp_packet(&offer_packet, sizeof(offer_packet), sock,
++                                            dhcpoffer_timeout, &source);
+ 
++               if(result != OK) {
++                       if(verbose) printf(_("Result=ERROR\n"));
+                        continue;
+-                       }
+-               else{
+-                       if (verbose) 
+-                               printf(_("Result=OK\n"));
+-
++               }
++               else {
++                       if(verbose) printf(_("Result=OK\n"));
+                        responses++;
+-                       }
++               }
+ 
+-               if (verbose) {
+-                       printf(_("DHCPOFFER from IP address %s\n"),inet_ntoa(source.sin_addr));
+-                       printf("DHCPOFFER XID: %lu (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));
++               if(verbose) {
++                       printf(_("DHCPOFFER from IP address %s\n"), inet_ntoa(source.sin_addr));
++                       printf("DHCPOFFER XID: %u (0x%X)\n", ntohl(offer_packet.xid),
++                              ntohl(offer_packet.xid));
+                }
+ 
+                /* check packet xid to see if its the same as the one we used in the discover packet */
+-               if(ntohl(offer_packet.xid)!=packet_xid){
+-                       if (verbose)
+-                               printf(_("DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);
+-
++               if(ntohl(offer_packet.xid) != packet_xid) {
++                       if(verbose)
++                               printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),
++                                      ntohl(offer_packet.xid), packet_xid);
+                        continue;
+-                       }
++               }
+ 
+                /* check hardware address */
+-               result=OK;
+-               if (verbose)
+-                       printf("DHCPOFFER chaddr: ");
+-
+-               for(x=0;x<ETHERNET_HARDWARE_ADDRESS_LENGTH;x++){
+-                       if (verbose)
+-                               printf("%02X",(unsigned char)offer_packet.chaddr[x]);
++               result = OK;
++               if(verbose) printf("DHCPOFFER chaddr: ");
+ 
+-                       if(offer_packet.chaddr[x]!=client_hardware_address[x])
+-                               result=ERROR;
++               for(x = 0; x < ETH_HW_ADDR_LEN; x++) {
++                       if(verbose) printf("%02X", (unsigned char)offer_packet.chaddr[x]);
++                       if(offer_packet.chaddr[x] != client_hardware_address[x])
++                               result = ERROR;
+                }
+-               if (verbose)
+-                       printf("\n");
++               if(verbose) printf("\n");
+ 
+-               if(result==ERROR){
+-                       if (verbose) 
++               if(result == ERROR) {
++                       if(verbose)
+                                printf(_("DHCPOFFER hardware address did not match our own - ignoring packet\n"));
+-
+                        continue;
+-                       }
++               }
+ 
+-               if (verbose) {
+-                       printf("DHCPOFFER ciaddr: %s\n",inet_ntoa(offer_packet.ciaddr));
+-                       printf("DHCPOFFER yiaddr: %s\n",inet_ntoa(offer_packet.yiaddr));
+-                       printf("DHCPOFFER siaddr: %s\n",inet_ntoa(offer_packet.siaddr));
+-                       printf("DHCPOFFER giaddr: %s\n",inet_ntoa(offer_packet.giaddr));
++               if(verbose) {
++                       printf("DHCPOFFER ciaddr: %s\n", inet_ntoa(offer_packet.ciaddr));
++                       printf("DHCPOFFER yiaddr: %s\n", inet_ntoa(offer_packet.yiaddr));
++                       printf("DHCPOFFER siaddr: %s\n", inet_ntoa(offer_packet.siaddr));
++                       printf("DHCPOFFER giaddr: %s\n", inet_ntoa(offer_packet.giaddr));
+                }
+ 
+-               add_dhcp_offer(source.sin_addr,&offer_packet);
++               add_dhcp_offer(source.sin_addr, &offer_packet);
+ 
+                valid_responses++;
+-               }
++       }
+ 
+-       if (verbose) {
+-               printf(_("Total responses seen on the wire: %d\n"),responses);
+-               printf(_("Valid responses for this machine: %d\n"),valid_responses);
++       if(verbose) {
++               printf(_("Total responses seen on the wire: %d\n"), responses);
++               printf(_("Valid responses for this machine: %d\n"), valid_responses);
+        }
+ 
+        return OK;
+-        }
+-
++}
+ 
+ 
+ /* sends a DHCP packet */
+-int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest){
+-       struct sockaddr_in myname;
++int
++send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest)
++{
+        int result;
+ 
+-       result=sendto(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)dest,sizeof(*dest));
++       result = sendto(sock, (char *)buffer, buffer_size, 0, (struct sockaddr *)dest,
++                                       sizeof(*dest));
+ 
+-       if (verbose) 
+-               printf(_("send_dhcp_packet result: %d\n"),result);
++       if(verbose) printf(_("send_dhcp_packet result: %d\n"), result);
+ 
+-       if(result<0)
+-               return ERROR;
++       if(result < 0) return ERROR;
+ 
+        return OK;
+-        }
+-
++}
+ 
+ 
+ /* receives a DHCP packet */
+-int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, struct sockaddr_in *address){
+-        struct timeval tv;
+-        fd_set readfds;
++int
++receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout,
++                                       struct sockaddr_in *address)
++{
++       struct timeval tv;
++       fd_set readfds;
++       fd_set oobfds;
+        int recv_result;
+        socklen_t address_size;
+        struct sockaddr_in source_address;
++       int nfound;
+ 
++       /* wait for data to arrive (up time timeout) */
++       tv.tv_sec = timeout;
++       tv.tv_usec = 0;
++       FD_ZERO(&readfds);
++       FD_ZERO(&oobfds);
++       FD_SET(sock, &readfds);
++       FD_SET(sock, &oobfds);
++       nfound = select(sock + 1, &readfds, NULL, &oobfds, &tv);
++
++       /* make sure some data has arrived */
++       if(!FD_ISSET(sock, &readfds)) {
++               if(verbose)
++                       printf(_("nfound: %d, No (more) data received\n"), nfound);
++               return ERROR;
++       }
+ 
+-        /* wait for data to arrive (up time timeout) */
+-        tv.tv_sec=timeout;
+-        tv.tv_usec=0;
+-        FD_ZERO(&readfds);
+-        FD_SET(sock,&readfds);
+-        select(sock+1,&readfds,NULL,NULL,&tv);
+-
+-        /* make sure some data has arrived */
+-        if(!FD_ISSET(sock,&readfds)){
+-               if (verbose)
+-                       printf(_("No (more) data received\n"));
+-                return ERROR;
+-                }
+-
+-        else{
+-
+-               /* why do we need to peek first?  i don't know, its a hack.  without it, the source address of the first packet received was
+-                  not being interpreted correctly.  sigh... */
+-               bzero(&source_address,sizeof(source_address));
+-               address_size=sizeof(source_address);
+-                recv_result=recvfrom(sock,(char *)buffer,buffer_size,MSG_PEEK,(struct sockaddr *)&source_address,&address_size);
+-               if (verbose)
+-                       printf("recv_result_1: %d\n",recv_result);
+-                recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size);
+-               if (verbose)
+-                       printf("recv_result_2: %d\n",recv_result);
+-
+-                if(recv_result==-1){
+-                       if (verbose) {
+-                               printf(_("recvfrom() failed, "));
+-                               printf("errno: (%d) -> %s\n",errno,strerror(errno));
+-                       }
+-                        return ERROR;
+-                        }
+-               else{
+-                       if (verbose) {
+-                               printf(_("receive_dhcp_packet() result: %d\n"),recv_result);
+-                               printf(_("receive_dhcp_packet() source: %s\n"),inet_ntoa(source_address.sin_addr));
+-                       }
++       /* why do we need to peek first?  i don't know, its a hack.  without it,
++        * the source address of the first packet received was not being
++        * interpreted correctly.  sigh... */
++       memset(&source_address, 0, sizeof(source_address));
++       address_size = sizeof(source_address);
++       recv_result = recvfrom(sock, (char *)buffer, buffer_size, MSG_PEEK,
++                              (struct sockaddr *)&source_address, &address_size);
++
++       if(verbose) printf("recv_result_1: %d\n", recv_result);
++       recv_result = recvfrom(sock, (char *)buffer, buffer_size, 0,
++                              (struct sockaddr *)&source_address, &address_size);
++       
++       if(verbose) printf("recv_result_2: %d\n", recv_result);
++
++       if(recv_result == -1) {
++               if(verbose) printf("errno: (%d) -> %s\n", errno, strerror(errno));
++               return ERROR;
++       }
++
++       if(verbose) {
++               printf(_("receive_dhcp_packet() result: %d\n"), recv_result);
++               printf(_("receive_dhcp_packet() source: %s\n"),
++                      inet_ntoa(source_address.sin_addr));
++       }
+ 
+-                       memcpy(address,&source_address,sizeof(source_address));
+-                       return OK;
+-                       }
+-                }
++       memcpy(address, &source_address, sizeof(source_address));
+ 
+        return OK;
+-        }
++}
+ 
+ 
+ /* creates a socket for DHCP communication */
+-int create_dhcp_socket(void){
+-        struct sockaddr_in myname;
++int
++create_dhcp_socket(void)
++{
++       struct sockaddr_in myname;
+        struct ifreq interface;
+-        int sock;
+-        int flag=1;
++       int sock;
++       int flag = 1;
+ 
+-        /* Set up the address we're going to bind to. */
+-       bzero(&myname,sizeof(myname));
+-        myname.sin_family=AF_INET;
+-        myname.sin_port=htons(DHCP_CLIENT_PORT);
+-        myname.sin_addr.s_addr=INADDR_ANY;                 /* listen on any address */
+-        bzero(&myname.sin_zero,sizeof(myname.sin_zero));
+-
+-        /* create a socket for DHCP communications */
+-       sock=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
+-        if(sock<0){
++       /* Set up the address we're going to bind to. */
++       memset(&myname, 0, sizeof(myname));
++       memset(&myname.sin_zero, 0, sizeof(myname.sin_zero));
++       myname.sin_family = AF_INET;
++       /* listen to dhcp server port if we're in unicast mode */
++       myname.sin_port = htons(unicast_hops == 0 ? DHCP_CLIENT_PORT : DHCP_SERVER_PORT);
++       myname.sin_addr.s_addr = unicast_hops == 0 ? INADDR_ANY : my_ip.s_addr;
++
++       /* create a socket for DHCP communications */
++       sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
++       if(sock < 0) {
+                printf(_("Error: Could not create socket!\n"));
+                exit(STATE_UNKNOWN);
+-               }
+-
+-       if (verbose)
+-               printf("DHCP socket: %d\n",sock);
++       }
+ 
+-        /* set the reuse address flag so we don't get errors when restarting */
+-        flag=1;
+-        if(setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(char *)&flag,sizeof(flag))<0){
++       /* set the reuse address flag so we don't get errors when restarting */
++       flag = 1;
++       if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&flag, sizeof(flag)) < 0) {
+                printf(_("Error: Could not set reuse address option on DHCP socket!\n"));
+                exit(STATE_UNKNOWN);
+-               }
++       }
+ 
+-        /* set the broadcast option - we need this to listen to DHCP broadcast messages */
+-        if(setsockopt(sock,SOL_SOCKET,SO_BROADCAST,(char *)&flag,sizeof flag)<0){
++       /* set the broadcast option - we need this to listen to DHCP broadcast messages */
++       if(setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char *)&flag, sizeof flag) < 0) {
+                printf(_("Error: Could not set broadcast option on DHCP socket!\n"));
+                exit(STATE_UNKNOWN);
+-               }
++       }
+ 
+        /* bind socket to interface */
+ #if defined(__linux__)
+-       strncpy(interface.ifr_ifrn.ifrn_name,network_interface_name,IFNAMSIZ);
+-       if(setsockopt(sock,SOL_SOCKET,SO_BINDTODEVICE,(char *)&interface,sizeof(interface))<0){
+-               printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"),network_interface_name);
++       strncpy(interface.ifr_ifrn.ifrn_name, network_interface_name, IFNAMSIZ);
++       if(setsockopt
++          (sock, SOL_SOCKET, SO_BINDTODEVICE, (char *)&interface,
++               sizeof(interface)) < 0) {
++               printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"),
++                      network_interface_name);
+                exit(STATE_UNKNOWN);
+-               }
++       }
+ 
+ #else
+-       strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ);
++       strncpy(interface.ifr_name, network_interface_name, IFNAMSIZ);
+ #endif
+ 
+-        /* bind the socket */
+-        if(bind(sock,(struct sockaddr *)&myname,sizeof(myname))<0){
+-               printf(_("Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"),DHCP_CLIENT_PORT);
++       /* bind the socket */
++       if(bind(sock, (struct sockaddr *)&myname, sizeof(myname)) < 0) {
++               printf(_("Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"),
++                      DHCP_CLIENT_PORT);
+                exit(STATE_UNKNOWN);
+-               }
+-
+-        return sock;
+-        }
+-
+-
+-/* closes DHCP socket */
+-int close_dhcp_socket(int sock){
+-
+-       close(sock);
++       }
+ 
+-       return OK;
+-        }
++       return sock;
++}
+ 
+ 
+ /* adds a requested server address to list in memory */
+-int add_requested_server(struct in_addr server_address){
++static int
++add_requested_server(struct in_addr server_address)
++{
+        requested_server *new_server;
+ 
+-       new_server=(requested_server *)malloc(sizeof(requested_server));
+-       if(new_server==NULL)
++       new_server = (requested_server *) malloc(sizeof(requested_server));
++       if(new_server == NULL)
+                return ERROR;
+ 
+-       new_server->server_address=server_address;
++       new_server->server_address = server_address;
+ 
+-       new_server->next=requested_server_list;
+-       requested_server_list=new_server;
++       new_server->next = requested_server_list;
++       requested_server_list = new_server;
+ 
+        requested_servers++;
+ 
+-       if (verbose)
+-               printf(_("Requested server address: %s\n"),inet_ntoa(new_server->server_address));
++       if(verbose)
++               printf(_("Requested server address: %s\n"),
++                          inet_ntoa(new_server->server_address));
+ 
+        return OK;
+-        }
++}
+ 
+ 
+ 
+ 
+ /* adds a DHCP OFFER to list in memory */
+-int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
++int
++add_dhcp_offer(struct in_addr source, dhcp_packet * offer_packet)
++{
+        dhcp_offer *new_offer;
+        int x;
+        int y;
+        unsigned option_type;
+        unsigned option_length;
+ 
+-       if(offer_packet==NULL)
+-               return ERROR;
++       if(offer_packet == NULL) return ERROR;
+ 
+        /* process all DHCP options present in the packet */
+-       for(x=4;x<MAX_DHCP_OPTIONS_LENGTH;){
++       for(x = 4; x < MAX_DHCP_OPTIONS_LENGTH;) {
+ 
+                /* end of options (0 is really just a pad, but bail out anyway) */
+-               if((int)offer_packet->options[x]==-1 || (int)offer_packet->options[x]==0)
++               if((int)offer_packet->options[x] == -1 || (int)offer_packet->options[x] == 0)
+                        break;
+ 
+                /* get option type */
+-               option_type=offer_packet->options[x++];
++               option_type = offer_packet->options[x++];
+ 
+                /* get option length */
+-               option_length=offer_packet->options[x++];
++               option_length = offer_packet->options[x++];
+ 
+-               if (verbose) 
+-                       printf("Option: %d (0x%02X)\n",option_type,option_length);
++               if(verbose)
++                       printf("Option: %d (0x%02X)\n", option_type, option_length);
+ 
+                /* get option data */
+-        if(option_type==DHCP_OPTION_LEASE_TIME) {
+-            memcpy(&dhcp_lease_time, &offer_packet->options[x],
+-                sizeof(dhcp_lease_time));
+-            dhcp_lease_time = ntohl(dhcp_lease_time);
+-        }
+-        if(option_type==DHCP_OPTION_RENEWAL_TIME) {
+-            memcpy(&dhcp_renewal_time, &offer_packet->options[x],
+-                sizeof(dhcp_renewal_time));
+-            dhcp_renewal_time = ntohl(dhcp_renewal_time);
+-        }
+-        if(option_type==DHCP_OPTION_REBINDING_TIME) {
+-            memcpy(&dhcp_rebinding_time, &offer_packet->options[x],
+-                sizeof(dhcp_rebinding_time));
+-            dhcp_rebinding_time = ntohl(dhcp_rebinding_time);
+-        }
++               if(option_type == DHCP_OPTION_LEASE_TIME) {
++                       memcpy(&dhcp_lease_time, &offer_packet->options[x],
++                              sizeof(dhcp_lease_time));
++                       dhcp_lease_time = ntohl(dhcp_lease_time);
++               }
++               if(option_type == DHCP_OPTION_RENEWAL_TIME) {
++                       memcpy(&dhcp_renewal_time, &offer_packet->options[x],
++                              sizeof(dhcp_renewal_time));
++                       dhcp_renewal_time = ntohl(dhcp_renewal_time);
++               }
++               if(option_type == DHCP_OPTION_REBINDING_TIME) {
++                       memcpy(&dhcp_rebinding_time, &offer_packet->options[x],
++                              sizeof(dhcp_rebinding_time));
++                       dhcp_rebinding_time = ntohl(dhcp_rebinding_time);
++               }
+ 
+                /* skip option data we're ignoring */
+-               else
+-                       for(y=0;y<option_length;y++,x++);
+-               }
++               else for(y = 0; y < option_length; y++, x++) ;
++       }
+ 
+-       if (verbose) {
+-               if(dhcp_lease_time==DHCP_INFINITE_TIME)
++       if(verbose) {
++               if(dhcp_lease_time == DHCP_INFINITE_TIME)
+                        printf(_("Lease Time: Infinite\n"));
+                else
+-                       printf(_("Lease Time: %lu seconds\n"),(unsigned long)dhcp_lease_time);
+-               if(dhcp_renewal_time==DHCP_INFINITE_TIME)
++                       printf(_("Lease Time: %lu seconds\n"), (unsigned long)dhcp_lease_time);
++               if(dhcp_renewal_time == DHCP_INFINITE_TIME)
+                        printf(_("Renewal Time: Infinite\n"));
+                else
+-                       printf(_("Renewal Time: %lu seconds\n"),(unsigned long)dhcp_renewal_time);
+-               if(dhcp_rebinding_time==DHCP_INFINITE_TIME)
++                       printf(_("Renewal Time: %lu seconds\n"),
++                              (unsigned long)dhcp_renewal_time);
++               if(dhcp_rebinding_time == DHCP_INFINITE_TIME)
+                        printf(_("Rebinding Time: Infinite\n"));
+-               printf(_("Rebinding Time: %lu seconds\n"),(unsigned long)dhcp_rebinding_time);
++               printf(_("Rebinding Time: %lu seconds\n"),
++                      (unsigned long)dhcp_rebinding_time);
+        }
+ 
+-       new_offer=(dhcp_offer *)malloc(sizeof(dhcp_offer));
++       new_offer = (dhcp_offer *) malloc(sizeof(dhcp_offer));
+ 
+-       if(new_offer==NULL)
+-               return ERROR;
++       if(new_offer == NULL) return ERROR;
+ 
+-       new_offer->server_address=source;
+-       new_offer->offered_address=offer_packet->yiaddr;
+-       new_offer->lease_time=dhcp_lease_time;
+-       new_offer->renewal_time=dhcp_renewal_time;
+-       new_offer->rebinding_time=dhcp_rebinding_time;
++       new_offer->server_address = source;
++       new_offer->offered_address = offer_packet->yiaddr;
++       new_offer->lease_time = dhcp_lease_time;
++       new_offer->renewal_time = dhcp_renewal_time;
++       new_offer->rebinding_time = dhcp_rebinding_time;
+ 
+ 
+-       if (verbose) {
+-               printf(_("Added offer from server @ %s"),inet_ntoa(new_offer->server_address));
+-               printf(_(" of IP address %s\n"),inet_ntoa(new_offer->offered_address));
++       if(verbose) {
++               printf(_("Added offer from server @ %s"),
++                      inet_ntoa(new_offer->server_address));
++               printf(_(" of IP address %s\n"), inet_ntoa(new_offer->offered_address));
+        }
+ 
+        /* add new offer to head of list */
+-       new_offer->next=dhcp_offer_list;
+-       dhcp_offer_list=new_offer;
++       new_offer->next = dhcp_offer_list;
++       dhcp_offer_list = new_offer;
+ 
+        return OK;
+-        }
++}
+ 
+ 
+ /* frees memory allocated to DHCP OFFER list */
+-int free_dhcp_offer_list(void){
++int
++free_dhcp_offer_list(void)
++{
+        dhcp_offer *this_offer;
+        dhcp_offer *next_offer;
+ 
+-       for(this_offer=dhcp_offer_list;this_offer!=NULL;this_offer=next_offer){
+-               next_offer=this_offer->next;
++       for(this_offer = dhcp_offer_list; this_offer != NULL; this_offer = next_offer) {
++               next_offer = this_offer->next;
+                free(this_offer);
+-               }
++       }
+ 
+        return OK;
+-        }
++}
+ 
+ 
+ /* frees memory allocated to requested server list */
+-int free_requested_server_list(void){
++int
++free_requested_server_list(void)
++{
+        requested_server *this_server;
+        requested_server *next_server;
+ 
+-       for(this_server=requested_server_list;this_server!=NULL;this_server=next_server){
+-               next_server=this_server->next;
++       for(this_server = requested_server_list; this_server != NULL;
++               this_server = next_server) {
++               next_server = this_server->next;
+                free(this_server);
+-               }
+-       
++       }
++
+        return OK;
+-        }
++}
+ 
+ 
+ /* gets state and plugin output to return */
+-int get_results(void){
++int
++get_results(void)
++{
+        dhcp_offer *temp_offer;
+        requested_server *temp_server;
+        int result;
+-       u_int32_t max_lease_time=0;
++       u_int32_t max_lease_time = 0;
+ 
+-       received_requested_address=FALSE;
++       received_requested_address = FALSE;
+ 
+        /* checks responses from requested servers */
+-       requested_responses=0;
+-       if(requested_servers>0){
++       requested_responses = 0;
++       if(requested_servers > 0) {
+ 
+-               for(temp_server=requested_server_list;temp_server!=NULL;temp_server=temp_server->next){
++               for(temp_server = requested_server_list; temp_server != NULL;
++                       temp_server = temp_server->next) {
+ 
+-                       for(temp_offer=dhcp_offer_list;temp_offer!=NULL;temp_offer=temp_offer->next){
++                       for(temp_offer = dhcp_offer_list; temp_offer != NULL;
++                               temp_offer = temp_offer->next) {
+ 
+                                /* get max lease time we were offered */
+-                               if(temp_offer->lease_time>max_lease_time || temp_offer->lease_time==DHCP_INFINITE_TIME)
+-                                       max_lease_time=temp_offer->lease_time;
+-                               
++                               if(temp_offer->lease_time > max_lease_time
++                                  || temp_offer->lease_time == DHCP_INFINITE_TIME)
++                                       max_lease_time = temp_offer->lease_time;
++
+                                /* see if we got the address we requested */
+-                               if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
+-                                       received_requested_address=TRUE;
++                               if(!memcmp(&requested_address, &temp_offer->offered_address,
++                                          sizeof(requested_address)))
++                                       received_requested_address = TRUE;
+ 
+                                /* see if the servers we wanted a response from talked to us or not */
+-                               if(!memcmp(&temp_offer->server_address,&temp_server->server_address,sizeof(temp_server->server_address))){
+-       if (verbose) {
+-                                       printf(_("DHCP Server Match: Offerer=%s"),inet_ntoa(temp_offer->server_address));
+-                                       printf(_(" Requested=%s\n"),inet_ntoa(temp_server->server_address));
+-       }                                      
++                               if(!memcmp(&temp_offer->server_address, &temp_server->server_address,
++                                                  sizeof(temp_server->server_address)))
++                               {
++                                       if(verbose) {
++                                               printf(_("DHCP Server Match: Offerer=%s"),
++                                                          inet_ntoa(temp_offer->server_address));
++                                               printf(_(" Requested=%s\n"),
++                                                          inet_ntoa(temp_server->server_address));
++                                       }
+                                        requested_responses++;
+-                                       }
+-                               }
+-                       }
+-
+-               }
++                               }
++                       }
++               }
++       }
+ 
+        /* else check and see if we got our requested address from any server */
+-       else{
+-
+-               for(temp_offer=dhcp_offer_list;temp_offer!=NULL;temp_offer=temp_offer->next){
+-
++       else {
++               for(temp_offer = dhcp_offer_list; temp_offer != NULL;
++                       temp_offer = temp_offer->next)
++               {
+                        /* get max lease time we were offered */
+-                       if(temp_offer->lease_time>max_lease_time || temp_offer->lease_time==DHCP_INFINITE_TIME)
+-                               max_lease_time=temp_offer->lease_time;
+-                               
++                       if(temp_offer->lease_time > max_lease_time
++                          || temp_offer->lease_time == DHCP_INFINITE_TIME)
++                               max_lease_time = temp_offer->lease_time;
++
+                        /* see if we got the address we requested */
+-                       if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
+-                               received_requested_address=TRUE;
+-                       }
+-               }
+-
+-       result=STATE_OK;
+-       if(valid_responses==0)
+-               result=STATE_CRITICAL;
+-       else if(requested_servers>0 && requested_responses==0)
+-               result=STATE_CRITICAL;
+-       else if(requested_responses<requested_servers)
+-               result=STATE_WARNING;
+-       else if(request_specific_address==TRUE && received_requested_address==FALSE)
+-               result=STATE_WARNING;
++                       if(!memcmp(&requested_address, &temp_offer->offered_address,
++                                  sizeof(requested_address)))
++                               received_requested_address = TRUE;
++               }
++       }
+ 
++       result = STATE_OK;
++       if(valid_responses == 0)
++               result = STATE_CRITICAL;
++       else if(requested_servers > 0 && requested_responses == 0)
++               result = STATE_CRITICAL;
++       else if(requested_responses < requested_servers)
++               result = STATE_WARNING;
++       else if(request_specific_address == TRUE && received_requested_address == FALSE)
++               result = STATE_WARNING;
+ 
+-       printf("DHCP %s: ",(result==STATE_OK)?"ok":"problem");
++       printf("DHCP %s: ", (result == STATE_OK) ? "ok" : "problem");
+ 
+        /* we didn't receive any DHCPOFFERs */
+-       if(dhcp_offer_list==NULL){
++       if(dhcp_offer_list == NULL) {
+                printf(_("No DHCPOFFERs were received.\n"));
+                return result;
+-               }
+-
+-       printf(_("Received %d DHCPOFFER(s)"),valid_responses);
++       }
+ 
+-       if(requested_servers>0)
+-               printf(_(", %s%d of %d requested servers responded"),((requested_responses<requested_servers) && requested_responses>0)?"only ":"",requested_responses,requested_servers);
++       printf(_("Received %d DHCPOFFER(s)"), valid_responses);
+ 
+-       if(request_specific_address==TRUE)
+-               printf(_(", requested address (%s) was %soffered"),inet_ntoa(requested_address),(received_requested_address==TRUE)?"":_("not "));
++       if(requested_servers > 0)
++               printf(_(", %s%d of %d requested servers responded"),
++                      ((requested_responses < requested_servers)
++                       && requested_responses > 0) ? "only " : "",
++                      requested_responses,
++                      requested_servers);
++
++       if(request_specific_address == TRUE)
++               printf(_(", requested address (%s) was %soffered"),
++                      inet_ntoa(requested_address),
++                      (received_requested_address == TRUE) ? "" : _("not "));
+ 
+        printf(_(", max lease time = "));
+-       if(max_lease_time==DHCP_INFINITE_TIME)
++       if(max_lease_time == DHCP_INFINITE_TIME)
+                printf(_("Infinity"));
+        else
+-               printf("%lu sec",(unsigned long)max_lease_time);
++               printf("%lu sec", (unsigned long)max_lease_time);
+ 
+-       printf(".\n");
++       puts(".");
+ 
+        return result;
+-        }
++}
+ 
+ 
+ /* process command-line arguments */
+-int process_arguments(int argc, char **argv){
+-       int c;
+-
+-       if(argc<1)
+-               return ERROR;
+-
+-       c=0;
+-       while((c+=(call_getopt(argc-c,&argv[c])))<argc){
+-
+-               /*
+-               if(is_option(argv[c]))
+-                       continue;
+-               */
+-               }
+-
+-       return validate_arguments();
+-        }
+-
+-
+-
+-int call_getopt(int argc, char **argv){
+-       int c=0;
+-       int i=0;
++int
++process_arguments(int argc, char **argv)
++{
++       int c = 0;
+        struct in_addr ipaddress;
+-
+-#ifdef HAVE_GETOPT_H
+        int option_index = 0;
+-       static struct option long_options[] =
+-       { 
+-               {"serverip",       required_argument,0,'s'},
+-               {"requestedip",    required_argument,0,'r'},
+-               {"timeout",        required_argument,0,'t'},
+-               {"interface",      required_argument,0,'i'},
+-               {"verbose",        no_argument,      0,'v'},
+-               {"version",        no_argument,      0,'V'},
+-               {"help",           no_argument,      0,'h'},
+-               {0,0,0,0}
+-       };
+-#endif
+ 
+-       while(1){
+-#ifdef HAVE_GETOPT_H
+-               c=getopt_long(argc,argv,"+hVvt:s:r:t:i:",long_options,&option_index);
+-#else
+-               c=getopt(argc,argv,"+?hVvt:s:r:t:i:");
+-#endif
++       static struct option long_options[] = {
++               {"host", required_argument, 0, 'H'},
++               {"serverip", required_argument, 0, 's'},
++               {"requestedip", required_argument, 0, 'r'},
++               {"timeout", required_argument, 0, 't'},
++               {"interface", required_argument, 0, 'i'},
++               {"unicast", required_argument, 0, 'u'},
++               {"verbose", no_argument, 0, 'v'},
++               {"version", no_argument, 0, 'V'},
++               {"help", no_argument, 0, 'h'},
++               {0, 0, 0, 0}
++       };
+ 
+-               i++;
++       while(1) {
++               c = getopt_long(argc, argv, "+hVvt:s:r:t:i:u:", long_options, &option_index);
+ 
+-               if(c==-1||c==EOF||c==1)
++               if(c == -1 || c == EOF || c == 1)
+                        break;
+ 
+-               switch(c){
+-               case 'w':
+-               case 'r':
+-               case 't':
+-               case 'i':
+-                       i++;
++               switch (c) {
++               case 'u':
++                       unicast_hops = (u_int8_t)strtoul(optarg, NULL, 0);
+                        break;
+-               default:
+-                       break;
+-                       }
+-
+-               switch(c){
+-
+-               case 's': /* DHCP server address */
+-                       if(inet_aton(optarg,&ipaddress))
++               case 's': case 'H': /* DHCP server address */
++                       if(inet_aton(optarg, &ipaddress))
+                                add_requested_server(ipaddress);
+                        /*
+-                       else
+-                               usage("Invalid server IP address\n");
+-                       */
++                          else
++                          usage("Invalid server IP address\n");
++                        */
++                       inet_aton(optarg, &dhcp_ip);
++                       if(verbose)
++                               printf("querying %s\n", inet_ntoa(dhcp_ip));
+                        break;
+ 
+-               case 'r': /* address we are requested from DHCP servers */
+-                       if(inet_aton(optarg,&ipaddress)){
+-                               requested_address=ipaddress;
+-                               request_specific_address=TRUE;
+-                               }
++               case 'r':                       /* address we are requested from DHCP servers */
++                       if(inet_aton(optarg, &ipaddress)) {
++                               requested_address = ipaddress;
++                               request_specific_address = TRUE;
++                       }
+                        /*
+-                       else
+-                               usage("Invalid requested IP address\n");
+-                       */
++                          else
++                          usage("Invalid requested IP address\n");
++                        */
+                        break;
+ 
+-               case 't': /* timeout */
+-
++               case 't':                       /* timeout */
+                        /*
+-                       if(is_intnonneg(optarg))
+-                       */
+-                       if(atoi(optarg)>0)
+-                               dhcpoffer_timeout=atoi(optarg);
++                          if(is_intnonneg(optarg))
++                        */
++                       if(atoi(optarg) > 0)
++                               dhcpoffer_timeout = atoi(optarg);
+                        /*
+-                       else
+-                               usage("Time interval must be a nonnegative integer\n");
+-                       */
++                          else
++                          usage("Time interval must be a nonnegative integer\n");
++                        */
+                        break;
+ 
+-               case 'i': /* interface name */
+-
+-                       strncpy(network_interface_name,optarg,sizeof(network_interface_name)-1);
+-                       network_interface_name[sizeof(network_interface_name)-1]='\x0';
+-
++               case 'i':                       /* interface name */
++                       strncpy(network_interface_name, optarg,
++                               sizeof(network_interface_name) - 1);
++                       network_interface_name[sizeof(network_interface_name) - 1] = '\x0';
+                        break;
+ 
+-               case 'V': /* version */
+-                       print_revision(progname,revision);
++               case 'V':                       /* version */
++                       print_revision(progname, revision);
+                        exit(STATE_OK);
+ 
+-               case 'h': /* help */
++               case 'h':                       /* help */
+                        print_help();
+                        exit(STATE_OK);
+ 
+-               case 'v': /* verbose */
+-                       verbose=1;
++               case 'v':                       /* verbose */
++                       verbose++;
+                        break;
+ 
+-               case '?': /* help */
+-                       usage2 (_("Unknown argument"), optarg);
++               case '?':                       /* help */
++                       usage2(_("Unknown argument"), optarg);
+                        break;
+ 
+                default:
+                        break;
+-                       }
+-               }
+-
+-       return i;
+-        }
++               }
++       }
++       
++       return validate_arguments();
++}
+ 
+ 
+-int validate_arguments(void){
++int
++validate_arguments(void)
++{
+ 
+        return OK;
+-        }
++}
+ 
+ #if defined(__sun__) || defined(__solaris__) || defined(__hpux__)
+ 
+-                                               /* Kompf 2000-2003      see ACKNOWLEDGEMENTS */
++                                               /* Kompf 2000-2003  see ACKNOWLEDGEMENTS */
+ 
+ /* get a message from a stream; return type of message */
+-static int get_msg(int fd)
++static int
++get_msg(int fd)
+ {
+-    int flags = 0;
+-    int res, ret;
+-    ctl_area[0] = 0;
+-    dat_area[0] = 0;
+-    ret = 0;
+-    res = getmsg(fd, &ctl, &dat, &flags);
+-
+-    if(res < 0) {
+-        if(errno == EINTR) {
+-            return(GOT_INTR);
+-        } else {
+-           printf("%s\n", "get_msg FAILED.");
+-            return(GOT_ERR);
+-        }
+-    }
+-    if(ctl.len > 0) {
+-        ret |= GOT_CTRL;
+-    }
+-    if(dat.len > 0) {
+-        ret |= GOT_DATA;
+-    }
+-    return(ret);
++       int flags = 0;
++       int res, ret;
++
++       ctl_area[0] = 0;
++       dat_area[0] = 0;
++       ret = 0;
++       res = getmsg(fd, &ctl, &dat, &flags);
++
++       if(res < 0) {
++               if(errno == EINTR) {
++                       return (GOT_INTR);
++               }
++               else {
++                       printf("%s\n", "get_msg FAILED.");
++                       return (GOT_ERR);
++               }
++       }
++       if(ctl.len > 0) {
++               ret |= GOT_CTRL;
++       }
++       if(dat.len > 0) {
++               ret |= GOT_DATA;
++       }
++       return (ret);
+ }
+ 
+ /* verify that dl_primitive in ctl_area = prim */
+-static int check_ctrl(int prim)
++static int
++check_ctrl(int prim)
+ {
+-    dl_error_ack_t *err_ack = (dl_error_ack_t *)ctl_area;
+-    if(err_ack->dl_primitive != prim) {
+-       printf(_("Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"), strerror(errno));
+-        exit(STATE_UNKNOWN);
+-    }
+-    return 0;
++       dl_error_ack_t *err_ack = (dl_error_ack_t *) ctl_area;
++
++       if(err_ack->dl_primitive != prim) {
++               printf(_("Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"),
++                      strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++       return 0;
+ }
+ 
+ /* put a control message on a stream */
+-static int put_ctrl(int fd, int len, int pri)
++static int
++put_ctrl(int fd, int len, int pri)
+ {
+-    ctl.len = len;
+-    if(putmsg(fd, &ctl, 0, pri) < 0) {
+-       printf(_("Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"), strerror(errno));
+-        exit(STATE_UNKNOWN);
+-    }
+-    return  0;
++       ctl.len = len;
++       if(putmsg(fd, &ctl, 0, pri) < 0) {
++               printf(_("Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"),
++                      strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++
++       return 0;
+ }
+ 
++
+ /* put a control + data message on a stream */
+-static int put_both(int fd, int clen, int dlen, int pri)
++static int
++put_both(int fd, int clen, int dlen, int pri)
+ {
+-    ctl.len = clen;
+-    dat.len = dlen;
+-    if(putmsg(fd, &ctl, &dat, pri) < 0) {
+-       printf(_("Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"), strerror(errno));
+-        exit(STATE_UNKNOWN);
+-    }
+-    return  0;
++       ctl.len = clen;
++       dat.len = dlen;
++       if(putmsg(fd, &ctl, &dat, pri) < 0) {
++               printf(_("Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"),
++                          strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++
++       return 0;
+ }
+ 
++
+ /* open file descriptor and attach */
+-static int dl_open(const char *dev, int unit, int *fd)
++static int
++dl_open(const char *dev, int unit, int *fd)
+ {
+-    dl_attach_req_t *attach_req = (dl_attach_req_t *)ctl_area;
+-    if((*fd = open(dev, O_RDWR)) == -1) {
+-       printf(_("Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"), dev, strerror(errno));
+-        exit(STATE_UNKNOWN);
+-    }
+-    attach_req->dl_primitive = DL_ATTACH_REQ;
+-    attach_req->dl_ppa = unit;
+-    put_ctrl(*fd, sizeof(dl_attach_req_t), 0);
+-    get_msg(*fd);
+-    return check_ctrl(DL_OK_ACK);
++       dl_attach_req_t *attach_req = (dl_attach_req_t *) ctl_area;
++
++       if((*fd = open(dev, O_RDWR)) == -1) {
++               printf(_
++                          ("Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"),
++                          dev, strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++       attach_req->dl_primitive = DL_ATTACH_REQ;
++       attach_req->dl_ppa = unit;
++       put_ctrl(*fd, sizeof(dl_attach_req_t), 0);
++       get_msg(*fd);
++       return check_ctrl(DL_OK_ACK);
+ }
+ 
++
+ /* send DL_BIND_REQ */
+-static int dl_bind(int fd, int sap, u_char *addr)
++static int
++dl_bind(int fd, int sap, u_char * addr)
+ {
+-    dl_bind_req_t *bind_req = (dl_bind_req_t *)ctl_area;
+-    dl_bind_ack_t *bind_ack = (dl_bind_ack_t *)ctl_area;
+-    bind_req->dl_primitive = DL_BIND_REQ;
+-    bind_req->dl_sap = sap;
+-    bind_req->dl_max_conind = 1;
+-    bind_req->dl_service_mode = DL_CLDLS;
+-    bind_req->dl_conn_mgmt = 0;
+-    bind_req->dl_xidtest_flg = 0;
+-    put_ctrl(fd, sizeof(dl_bind_req_t), 0);
+-    get_msg(fd);
+-    if (GOT_ERR == check_ctrl(DL_BIND_ACK)) {
+-       printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno));
+-        exit(STATE_UNKNOWN);
+-    }
+-    bcopy((u_char *)bind_ack + bind_ack->dl_addr_offset, addr,
+-        bind_ack->dl_addr_length);
+-    return 0;
++       dl_bind_req_t *bind_req = (dl_bind_req_t *) ctl_area;
++       dl_bind_ack_t *bind_ack = (dl_bind_ack_t *) ctl_area;
++
++       bind_req->dl_primitive = DL_BIND_REQ;
++       bind_req->dl_sap = sap;
++       bind_req->dl_max_conind = 1;
++       bind_req->dl_service_mode = DL_CLDLS;
++       bind_req->dl_conn_mgmt = 0;
++       bind_req->dl_xidtest_flg = 0;
++       put_ctrl(fd, sizeof(dl_bind_req_t), 0);
++       get_msg(fd);
++       if(GOT_ERR == check_ctrl(DL_BIND_ACK)) {
++               printf(_
++                          ("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"),
++                          strerror(errno));
++               exit(STATE_UNKNOWN);
++       }
++       memcpy(addr, (u_char *) bind_ack + bind_ack->dl_addr_offset,
++                  bind_ack->dl_addr_length);
++       return 0;
+ }
+ 
++
+ /***********************************************************************
+  * interface:
+  * function mac_addr_dlpi - get the mac address of the interface with 
+@@ -1197,37 +1229,39 @@
+  *
+  * return: 0 if OK, -1 if the address could not be determined
+  *
+- *
+  ***********************************************************************/
+ 
+-long mac_addr_dlpi( const char *dev, int unit, u_char  *addr) {
++long
++mac_addr_dlpi(const char *dev, int unit, u_char * addr)
++{
+ 
+        int fd;
+        u_char mac_addr[25];
+ 
+-       if (GOT_ERR != dl_open(dev, unit, &fd)) {
+-               if (GOT_ERR != dl_bind(fd, INSAP, mac_addr)) {
+-                       bcopy( mac_addr, addr, 6);
+-                       return 0;
+-                }
++       if(GOT_ERR != dl_open(dev, unit, &fd)) {
++               if(GOT_ERR != dl_bind(fd, INSAP, mac_addr)) {
++                       memcpy(addr, mac_addr, 6);
++                       return 0;
++               }
+        }
+-        close(fd);
++       close(fd);
+        return -1;
+ }
+ 
+                                                /* Kompf 2000-2003 */
+-
+ #endif
+ 
+ 
+ /* print usage help */
+-void print_help(void){
++void
++print_help(void)
++{
+ 
+-       print_revision(progname,revision);
++       print_revision(progname, revision);
+ 
+        printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n\n");
+-       printf (COPYRIGHT, copyright, email);
+-       
++       printf(COPYRIGHT, copyright, email);
++
+        printf(_("This plugin tests the availability of DHCP servers on a network.\n\n"));
+ 
+        print_usage();
+@@ -1241,6 +1275,8 @@
+    Seconds to wait for DHCPOFFER before timeout occurs\n\
+  -i, --interface=STRING\n\
+    Interface to to use for listening (i.e. eth0)\n\
++ -u, --unicast=INTEGER\n\
++   Unicast testing. Requires -s. Useful for testing servers on remote networks.
+  -v, --verbose\n\
+    Print extra information (command-line use only)\n\
+  -h, --help\n\
+@@ -1250,12 +1286,10 @@
+ }
+ 
+ 
+-void print_usage(void)
++void
++print_usage(void)
+ {
+        printf("\
+ Usage: %s [-s serverip] [-r requestedip] [-t timeout] [-i interface]\n\
+-                  [-v]",progname);
++                  [-v]", progname);
+ }
+-
+-
+-
diff --git a/web/attachments/140951-radiusclient.h b/web/attachments/140951-radiusclient.h
new file mode 100644
index 0000000..9ce2a39
--- /dev/null
+++ b/web/attachments/140951-radiusclient.h
@@ -0,0 +1,496 @@
+/*
+ * $Id: radiusclient.h,v 1.9 2002/11/13 18:19:26 fcusack Exp $
+ *
+ * Copyright (C) 1995,1996,1997,1998 Lars Fenneberg
+ *
+ * Copyright 1992 Livingston Enterprises, Inc.
+ *
+ * Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan
+ * and Merit Network, Inc. All Rights Reserved
+ *
+ * See the file COPYRIGHT for the respective terms and conditions.
+ * If the file is missing contact me at lf@elemental.net
+ * and I'll send you a copy.
+ *
+ */
+
+#ifndef RADIUSCLIENT_H
+#define RADIUSCLIENT_H
+
+#include        <sys/types.h>
+#include        <stdio.h>
+#include        <time.h>
+
+#undef __BEGIN_DECLS
+#undef __END_DECLS
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS /* empty */
+# define __END_DECLS /* empty */
+#endif
+
+#undef __P
+#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
+# define __P(protos) protos
+#else
+# define __P(protos) ()
+#endif
+
+#ifndef _UINT4_T
+#ifdef _LP64
+typedef unsigned int UINT4;
+typedef int          INT4;
+#else
+typedef unsigned long UINT4;
+typedef long          INT4;
+#endif
+#endif
+
+#define AUTH_VECTOR_LEN         16
+#define AUTH_PASS_LEN           (3 * 16) /* multiple of 16 */
+#define AUTH_ID_LEN             64
+#define AUTH_STRING_LEN         128      /* maximum of 253 */
+
+#define BUFFER_LEN              8192
+
+#define NAME_LENGTH             32
+#define GETSTR_LENGTH           128     /* must be bigger than AUTH_PASS_LEN */
+
+/* codes for radius_buildreq, radius_getport, etc. */
+#define AUTH                    0
+#define ACCT                    1
+
+/* defines for config.c */
+
+#define SERVER_MAX 8
+
+#define AUTH_LOCAL_FST  (1<<0)
+#define AUTH_RADIUS_FST (1<<1)
+#define AUTH_LOCAL_SND  (1<<2)
+#define AUTH_RADIUS_SND (1<<3)
+
+typedef struct server {
+        int max;
+        char *name[SERVER_MAX];
+        unsigned short port[SERVER_MAX];
+} SERVER;
+
+typedef struct pw_auth_hdr
+{
+        u_char          code;
+        u_char          id;
+        u_short         length;
+        u_char          vector[AUTH_VECTOR_LEN];
+        u_char          data[2];
+} AUTH_HDR;
+
+#define AUTH_HDR_LEN                    20
+#define MAX_SECRET_LENGTH               (3 * 16) /* MUST be multiple of 16 */
+#define CHAP_VALUE_LENGTH               16
+
+#define PW_AUTH_UDP_PORT                1812
+#define PW_ACCT_UDP_PORT                1813
+
+#define PW_TYPE_STRING                  0
+#define PW_TYPE_INTEGER                 1
+#define PW_TYPE_IPADDR                  2
+#define PW_TYPE_DATE                    3
+
+/* standard RADIUS codes */
+
+#define PW_ACCESS_REQUEST               1
+#define PW_ACCESS_ACCEPT                2
+#define PW_ACCESS_REJECT                3
+#define PW_ACCOUNTING_REQUEST           4
+#define PW_ACCOUNTING_RESPONSE          5
+#define PW_ACCOUNTING_STATUS            6
+#define PW_PASSWORD_REQUEST             7
+#define PW_PASSWORD_ACK                 8
+#define PW_PASSWORD_REJECT              9
+#define PW_ACCOUNTING_MESSAGE           10
+#define PW_ACCESS_CHALLENGE             11
+#define PW_STATUS_SERVER                12
+#define PW_STATUS_CLIENT                13
+
+
+/* standard RADIUS attribute-value pairs */
+
+#define PW_USER_NAME                    1       /* string */
+#define PW_USER_PASSWORD                2       /* string */
+#define PW_CHAP_PASSWORD                3       /* string */
+#define PW_NAS_IP_ADDRESS               4       /* ipaddr */
+#define PW_NAS_PORT                     5       /* integer */
+#define PW_SERVICE_TYPE                 6       /* integer */
+#define PW_FRAMED_PROTOCOL              7       /* integer */
+#define PW_FRAMED_IP_ADDRESS            8       /* ipaddr */
+#define PW_FRAMED_IP_NETMASK            9       /* ipaddr */
+#define PW_FRAMED_ROUTING               10      /* integer */
+#define PW_FILTER_ID                    11      /* string */
+#define PW_FRAMED_MTU                   12      /* integer */
+#define PW_FRAMED_COMPRESSION           13      /* integer */
+#define PW_LOGIN_IP_HOST                14      /* ipaddr */
+#define PW_LOGIN_SERVICE                15      /* integer */
+#define PW_LOGIN_PORT                   16      /* integer */
+#define PW_OLD_PASSWORD                 17      /* string */ /* deprecated */
+#define PW_REPLY_MESSAGE                18      /* string */
+#define PW_LOGIN_CALLBACK_NUMBER        19      /* string */
+#define PW_FRAMED_CALLBACK_ID           20      /* string */
+#define PW_EXPIRATION                   21      /* date */ /* deprecated */
+#define PW_FRAMED_ROUTE                 22      /* string */
+#define PW_FRAMED_IPX_NETWORK           23      /* integer */
+#define PW_STATE                        24      /* string */
+#define PW_CLASS                        25      /* string */
+#define PW_VENDOR_SPECIFIC              26      /* string */
+#define PW_SESSION_TIMEOUT              27      /* integer */
+#define PW_IDLE_TIMEOUT                 28      /* integer */
+#define PW_TERMINATION_ACTION           29      /* integer */
+#define PW_CALLED_STATION_ID            30      /* string */
+#define PW_CALLING_STATION_ID           31      /* string */
+#define PW_NAS_IDENTIFIER               32      /* string */
+#define PW_PROXY_STATE                  33      /* string */
+#define PW_LOGIN_LAT_SERVICE            34      /* string */
+#define PW_LOGIN_LAT_NODE               35      /* string */
+#define PW_LOGIN_LAT_GROUP              36      /* string */
+#define PW_FRAMED_APPLETALK_LINK        37      /* integer */
+#define PW_FRAMED_APPLETALK_NETWORK     38      /* integer */
+#define PW_FRAMED_APPLETALK_ZONE        39      /* string */
+#define PW_CHAP_CHALLENGE               60      /* string */
+#define PW_NAS_PORT_TYPE                61      /* integer */
+#define PW_PORT_LIMIT                   62      /* integer */
+#define PW_LOGIN_LAT_PORT               63      /* string */
+
+/* Vendor RADIUS attribute-value pairs */
+#define PW_MS_CHAP_CHALLENGE            11      /* string */
+#define PW_MS_CHAP_RESPONSE             1       /* string */
+#define PW_MS_CHAP2_RESPONSE            25      /* string */
+#define PW_MS_CHAP2_SUCCESS             26      /* string */
+#define PW_MS_MPPE_ENCRYPTION_POLICY    7       /* string */
+#define PW_MS_MPPE_ENCRYPTION_TYPE      8       /* string */
+#define PW_MS_MPPE_ENCRYPTION_TYPES PW_MS_MPPE_ENCRYPTION_TYPE
+#define PW_MS_CHAP_MPPE_KEYS            12      /* string */
+#define PW_MS_MPPE_SEND_KEY             16      /* string */
+#define PW_MS_MPPE_RECV_KEY             17      /* string */
+
+/*      Accounting */
+
+#define PW_ACCT_STATUS_TYPE             40      /* integer */
+#define PW_ACCT_DELAY_TIME              41      /* integer */
+#define PW_ACCT_INPUT_OCTETS            42      /* integer */
+#define PW_ACCT_OUTPUT_OCTETS           43      /* integer */
+#define PW_ACCT_SESSION_ID              44      /* string */
+#define PW_ACCT_AUTHENTIC               45      /* integer */
+#define PW_ACCT_SESSION_TIME            46      /* integer */
+#define PW_ACCT_INPUT_PACKETS           47      /* integer */
+#define PW_ACCT_OUTPUT_PACKETS          48      /* integer */
+#define PW_ACCT_TERMINATE_CAUSE         49      /* integer */
+#define PW_ACCT_MULTI_SESSION_ID        50      /* string */
+#define PW_ACCT_LINK_COUNT              51      /* integer */
+
+/* From RFC 2869 */
+#define PW_ACCT_INTERIM_INTERVAL        85      /* integer */
+
+/*      Merit Experimental Extensions */
+
+#define PW_USER_ID                      222     /* string */
+#define PW_USER_REALM                   223     /* string */
+
+
+/*      Session limits */
+#define PW_SESSION_OCTETS_LIMIT         227    /* integer */
+#define PW_OCTETS_DIRECTION             228    /* integer */
+
+/*      Integer Translations */
+
+/*      SERVICE TYPES   */
+
+#define PW_LOGIN                        1
+#define PW_FRAMED                       2
+#define PW_CALLBACK_LOGIN               3
+#define PW_CALLBACK_FRAMED              4
+#define PW_OUTBOUND                     5
+#define PW_ADMINISTRATIVE               6
+#define PW_NAS_PROMPT                   7
+#define PW_AUTHENTICATE_ONLY            8
+#define PW_CALLBACK_NAS_PROMPT          9
+
+/*      FRAMED PROTOCOLS        */
+
+#define PW_PPP                          1
+#define PW_SLIP                         2
+#define PW_ARA                          3
+#define PW_GANDALF                      4
+#define PW_XYLOGICS                     5
+
+/*      FRAMED ROUTING VALUES   */
+
+#define PW_NONE                         0
+#define PW_BROADCAST                    1
+#define PW_LISTEN                       2
+#define PW_BROADCAST_LISTEN             3
+
+/*      FRAMED COMPRESSION TYPES        */
+
+#define PW_VAN_JACOBSON_TCP_IP          1
+#define PW_IPX_HEADER_COMPRESSION       2
+
+/*      LOGIN SERVICES  */
+
+#define PW_TELNET                       0
+#define PW_RLOGIN                       1
+#define PW_TCP_CLEAR                    2
+#define PW_PORTMASTER                   3
+#define PW_LAT                          4
+#define PW_X25_PAD                      5
+#define PW_X25_T3POS                    6
+
+/*      TERMINATION ACTIONS     */
+
+#define PW_DEFAULT                      0
+#define PW_RADIUS_REQUEST               1
+
+/*      PROHIBIT PROTOCOL  */
+
+#define PW_DUMB         0       /* 1 and 2 are defined in FRAMED PROTOCOLS */
+#define PW_AUTH_ONLY    3
+#define PW_ALL          255
+
+/*      ACCOUNTING STATUS TYPES    */
+
+#define PW_STATUS_START         1
+#define PW_STATUS_STOP          2
+#define PW_STATUS_ALIVE         3
+#define PW_STATUS_MODEM_START   4
+#define PW_STATUS_MODEM_STOP    5
+#define PW_STATUS_CANCEL        6
+#define PW_ACCOUNTING_ON        7
+#define PW_ACCOUNTING_OFF       8
+
+/*      ACCOUNTING TERMINATION CAUSES   */
+
+#define PW_USER_REQUEST         1
+#define PW_LOST_CARRIER         2
+#define PW_LOST_SERVICE         3
+#define PW_ACCT_IDLE_TIMEOUT    4
+#define PW_ACCT_SESSION_TIMEOUT 5
+#define PW_ADMIN_RESET          6
+#define PW_ADMIN_REBOOT         7
+#define PW_PORT_ERROR           8
+#define PW_NAS_ERROR            9
+#define PW_NAS_REQUEST          10
+#define PW_NAS_REBOOT           11
+#define PW_PORT_UNNEEDED        12
+#define PW_PORT_PREEMPTED       13
+#define PW_PORT_SUSPENDED       14
+#define PW_SERVICE_UNAVAILABLE  15
+#define PW_CALLBACK             16
+#define PW_USER_ERROR           17
+#define PW_HOST_REQUEST         18
+
+/*     NAS PORT TYPES    */
+
+#define PW_ASYNC                0
+#define PW_SYNC                 1
+#define PW_ISDN_SYNC            2
+#define PW_ISDN_SYNC_V120       3
+#define PW_ISDN_SYNC_V110       4
+#define PW_VIRTUAL              5
+
+/*         AUTHENTIC TYPES */
+#define PW_RADIUS       1
+#define PW_LOCAL        2
+#define PW_REMOTE       3
+
+/*    Session-Octets-Limit    */
+#define PW_OCTETS_DIRECTION_SUM 0
+#define PW_OCTETS_DIRECTION_IN  1
+#define PW_OCTETS_DIRECTION_OUT 2
+#define PW_OCTETS_DIRECTION_MAX 3
+
+
+/* Vendor codes */
+#define VENDOR_NONE     (-1)
+#define VENDOR_MICROSOFT        311
+
+/* Server data structures */
+
+typedef struct dict_attr
+{
+        char              name[NAME_LENGTH + 1];        /* attribute name */
+        int               value;                        /* attribute index */
+        int               type;                         /* string, int, etc. */
+        int               vendorcode;                   /* vendor code */
+        struct dict_attr *next;
+} DICT_ATTR;
+
+typedef struct dict_value
+{
+        char               attrname[NAME_LENGTH +1];
+        char               name[NAME_LENGTH + 1];
+        int                value;
+        struct dict_value *next;
+} DICT_VALUE;
+
+typedef struct vendor_dict
+{
+    char vendorname[NAME_LENGTH + 1];
+    int vendorcode;
+    DICT_ATTR *attributes;
+    struct vendor_dict *next;
+} VENDOR_DICT;
+
+typedef struct value_pair
+{
+        char               name[NAME_LENGTH + 1];
+        int                attribute;
+        int                vendorcode;
+        int                type;
+        UINT4              lvalue;
+        u_char             strvalue[AUTH_STRING_LEN + 1];
+        struct value_pair *next;
+} VALUE_PAIR;
+
+/* don't change this, as it has to be the same as in the Merit radiusd code */
+#define MGMT_POLL_SECRET        "Hardlyasecret"
+
+/*      Define return codes from "SendServer" utility */
+
+#define BADRESP_RC      -2
+#define ERROR_RC        -1
+#define OK_RC           0
+#define TIMEOUT_RC      1
+
+typedef struct send_data /* Used to pass information to sendserver() function */
+{
+        u_char          code;           /* RADIUS packet code */
+        u_char          seq_nbr;        /* Packet sequence number */
+        char           *server;         /* Name/addrress of RADIUS server */
+        int             svc_port;       /* RADIUS protocol destination port */
+        int             timeout;        /* Session timeout in seconds */
+        int             retries;
+        VALUE_PAIR     *send_pairs;     /* More a/v pairs to send */
+        VALUE_PAIR     *receive_pairs;  /* Where to place received a/v pairs */
+} SEND_DATA;
+
+typedef struct request_info
+{
+        char            secret[MAX_SECRET_LENGTH + 1];
+        u_char          request_vector[AUTH_VECTOR_LEN];
+} REQUEST_INFO;
+
+#ifndef MIN
+#define MIN(a, b)     ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b)     ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX        1024
+#endif
+
+typedef struct env
+{
+        int maxsize, size;
+        char **env;
+} ENV;
+
+#define ENV_SIZE        128
+
+__BEGIN_DECLS
+
+/*      Function prototypes     */
+
+/*      avpair.c                */
+
+VALUE_PAIR *rc_avpair_add __P((VALUE_PAIR **, int, void *, int, int));
+int rc_avpair_assign __P((VALUE_PAIR *, void *, int));
+VALUE_PAIR *rc_avpair_new __P((int, void *, int, int));
+VALUE_PAIR *rc_avpair_gen __P((AUTH_HDR *));
+VALUE_PAIR *rc_avpair_get __P((VALUE_PAIR *, UINT4));
+VALUE_PAIR *rc_avpair_copy __P((VALUE_PAIR *));
+void rc_avpair_insert __P((VALUE_PAIR **, VALUE_PAIR *, VALUE_PAIR *));
+void rc_avpair_free __P((VALUE_PAIR *));
+int rc_avpair_parse __P((char *, VALUE_PAIR **));
+int rc_avpair_tostr __P((VALUE_PAIR *, char *, int, char *, int));
+VALUE_PAIR *rc_avpair_readin __P((FILE *));
+
+/*      buildreq.c              */
+
+void rc_buildreq __P((SEND_DATA *, int, char *, unsigned short, int, int));
+unsigned char rc_get_seqnbr __P((void));
+int rc_auth __P((UINT4, VALUE_PAIR *, VALUE_PAIR **, char *, REQUEST_INFO *));
+int rc_auth_using_server __P((SERVER *, UINT4, VALUE_PAIR *, VALUE_PAIR **,
+                              char *, REQUEST_INFO *));
+int rc_auth_proxy __P((VALUE_PAIR *, VALUE_PAIR **, char *));
+int rc_acct __P((UINT4, VALUE_PAIR *));
+int rc_acct_using_server __P((SERVER *, UINT4, VALUE_PAIR *));
+int rc_acct_proxy __P((VALUE_PAIR *));
+int rc_check __P((char *, unsigned short, char *));
+
+/*      clientid.c              */
+
+int rc_read_mapfile __P((char *));
+UINT4 rc_map2id __P((char *));
+
+/*      config.c                */
+
+int rc_read_config __P((char *));
+char *rc_conf_str __P((char *));
+int rc_conf_int __P((char *));
+SERVER *rc_conf_srv __P((char *));
+int rc_find_server __P((char *, UINT4 *, char *));
+
+/*      dict.c                  */
+
+int rc_read_dictionary __P((char *));
+DICT_ATTR *rc_dict_getattr __P((int, int));
+DICT_ATTR *rc_dict_findattr __P((char *));
+DICT_VALUE *rc_dict_findval __P((char *));
+DICT_VALUE * rc_dict_getval __P((UINT4, char *));
+VENDOR_DICT * rc_dict_findvendor __P((char *));
+VENDOR_DICT * rc_dict_getvendor __P((int));
+
+/*      ip_util.c               */
+
+UINT4 rc_get_ipaddr __P((char *));
+int rc_good_ipaddr __P((char *));
+const char *rc_ip_hostname __P((UINT4));
+unsigned short rc_getport __P((int));
+int rc_own_hostname __P((char *, int));
+UINT4 rc_own_ipaddress __P((void));
+
+
+/*      log.c                   */
+
+void rc_openlog __P((char *));
+void rc_log __P((int, const char *, ...));
+
+/*      sendserver.c            */
+
+int rc_send_server __P((SEND_DATA *, char *, REQUEST_INFO *));
+
+/*      util.c                  */
+
+void rc_str2tm __P((char *, struct tm *));
+char *rc_mksid __P((void));
+char *rc_getifname __P((char *));
+char *rc_getstr __P((char *, int));
+void rc_mdelay __P((int));
+char *rc_mksid __P((void));
+
+/*      env.c                   */
+
+struct env *rc_new_env __P((int));
+void rc_free_env __P((struct env *));
+int rc_add_env __P((struct env *, char *, char *));
+int rc_import_env __P((struct env *, char **));
+
+/* md5.c                        */
+
+void rc_md5_calc __P((unsigned char *, unsigned char *, unsigned int));
+
+__END_DECLS
+
+#endif /* RADIUSCLIENT_H */
diff --git a/web/attachments/141582-diff b/web/attachments/141582-diff
new file mode 100644
index 0000000..f956a50
--- /dev/null
+++ b/web/attachments/141582-diff
@@ -0,0 +1,106 @@
+--- check_nwstat.c      2005-07-11 08:08:39.000000000 +0000
++++ check_nwstat_patched.c      2005-07-11 08:07:02.000000000 +0000
+@@ -169,6 +169,10 @@
+                if (result!=STATE_OK)
+                        return result;
+                utilization=strtoul(recv_buffer,NULL,10);
++
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++
+                send_buffer = strdup ("UPTIME\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -325,20 +329,24 @@
+ 
+                        free_disk_space=strtoul(recv_buffer,NULL,10);
+ 
++                       close(sd);
++                       my_tcp_connect (server_address, server_port, &sd);
++
+                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
+                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+                                return result;
+                        total_disk_space=strtoul(recv_buffer,NULL,10);
+ 
+-                       percent_free_space=(int)(((double)free_disk_space/(double)total_disk_space)*100.0);
++                       percent_free_space=(unsigned long)(((double)free_disk_space/(double)total_disk_space)*100.0);
+ 
+                        if (check_critical_value==TRUE && percent_free_space <= critical_value)
+                                result=STATE_CRITICAL;
+                        else if (check_warning_value==TRUE && percent_free_space <= warning_value)
+                                result=STATE_WARNING;
+                        free_disk_space/=1024;
+-                       asprintf (&output_message,_("%lu MB (%lu%%) free on volume %s"),free_disk_space,percent_free_space,volume_name);
++                       total_disk_space/=1024;
++                       asprintf (&output_message,_("%lu MB (%lu%%) free on volume %s - total %lu MB"),free_disk_space,percent_free_space,volume_name,total_disk_space);
+                }
+ 
+                /* check to see if DS Database is open or closed */
+@@ -353,6 +361,9 @@
+                else
+                        result=STATE_WARNING;
+  
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++
+                send_buffer = strdup ("S13\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                temp_buffer=strtok(recv_buffer,"\r\n");
+@@ -472,7 +483,7 @@
+                                return result;
+                        total_disk_space=strtoul(recv_buffer,NULL,10);
+ 
+-                       percent_purgeable_space=(int)(((double)purgeable_disk_space/(double)total_disk_space)*100.0);
++                       percent_purgeable_space=(unsigned long)(((double)purgeable_disk_space/(double)total_disk_space)*100.0);
+ 
+                        if (check_critical_value==TRUE && percent_purgeable_space >= critical_value)
+                                result=STATE_CRITICAL;
+@@ -525,7 +536,7 @@
+                                return result;
+                        total_disk_space=strtoul(recv_buffer,NULL,10);
+ 
+-                       percent_non_purgeable_space=(int)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0);
++                       percent_non_purgeable_space=(unsigned long)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0);
+ 
+                        if (check_critical_value==TRUE && percent_non_purgeable_space >= critical_value)
+                                result=STATE_CRITICAL;
+@@ -579,6 +590,9 @@
+  
+                max_service_processes=atoi(recv_buffer);
+  
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++
+                asprintf (&send_buffer,"S21\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -671,12 +685,15 @@
+                asprintf (&output_message,_("NDS Version %s"),recv_buffer);
+ 
+        } else if (vars_to_check==UPTIME) {
++               asprintf (&send_buffer,"UPTIME\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+ 
+-               recv_buffer[strlen(recv_buffer)-1]=0;
+ 
++               recv_buffer[sizeof(recv_buffer)-1]=0;
++               recv_buffer[strlen(recv_buffer)-1]=0;
++       
+                asprintf (&output_message,_("Up %s"),recv_buffer);
+ 
+        } else if (vars_to_check==NLM) {
+@@ -865,8 +882,9 @@
+                                        vars_to_check=TSYNC;
+                                else if (!strcmp(optarg,"DSVER"))
+                                        vars_to_check=DSVER;
+-                               else if (!strcmp(optarg,"UPTIME"))
++                               else if (!strcmp(optarg,"UPTIME")) {
+                                        vars_to_check=UPTIME;
++                               }
+                                else if (strncmp(optarg,"NLM:",4)==0) {
+                                        vars_to_check=NLM;
+                                        nlm_name=strdup (optarg+4);
diff --git a/web/attachments/144080-check_disk_smb.smbclient-args-patch b/web/attachments/144080-check_disk_smb.smbclient-args-patch
new file mode 100644
index 0000000..8886e03
--- /dev/null
+++ b/web/attachments/144080-check_disk_smb.smbclient-args-patch
@@ -0,0 +1,99 @@
+*** check_disk_smb      2005-06-08 11:09:01.720711352 -0500
+--- check_disk_smb.ultra        2005-06-08 11:05:52.927412296 -0500
+***************
+*** 15,22 ****
+  #  allow setting of limits in MBytes or GBytes.  Percentage settings for large
+  #  drives is a pain in the butt
+  # 2-May-2002 - SGhosh fix for embedded perl
+  #
+! # $Id: check_disk_smb.pl,v 1.8.2.1 2003/07/02 15:52:23 tonvoon Exp $
+  #
+  
+  require 5.004;
+--- 15,24 ----
+  #  allow setting of limits in MBytes or GBytes.  Percentage settings for large
+  #  drives is a pain in the butt
+  # 2-May-2002 - SGhosh fix for embedded perl
++ # 8-Jun-2005 - Andrey Warkentin
++ #  Fixed the way smbclient gets called. The share path was malformed.
+  #
+! # $Id: check_disk_smb.pl,v 1.8.2.1 2005/06/08 10:44:21 root Exp $
+  #
+  
+  require 5.004;
+***************
+*** 60,67 ****
+  my $smbclient= "$utils::PATH_TO_SMBCLIENT " ;
+  my $smbclientoptions="";
+  
+! # Options checking
+! 
+  ($opt_H) || ($opt_H = shift) || usage("Host name not specified\n");
+  my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9]+\$?)$/);
+  ($host) || usage("Invalid host: $opt_H\n");
+--- 62,68 ----
+  my $smbclient= "$utils::PATH_TO_SMBCLIENT " ;
+  my $smbclientoptions="";
+  
+! # Options checking.
+  ($opt_H) || ($opt_H = shift) || usage("Host name not specified\n");
+  my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9]+\$?)$/);
+  ($host) || usage("Invalid host: $opt_H\n");
+***************
+*** 105,111 ****
+  
+  # end of options checking
+  
+- 
+  my $state = "OK";
+  my $answer = undef;
+  my $res = undef;
+--- 106,111 ----
+***************
+*** 118,130 ****
+  };
+  alarm($TIMEOUT);
+  
+  # Execute an "ls" on the share using smbclient program
+  # get the results into $res
+  if (defined($workgroup)) {
+!       $res = qx/$smbclient \/\/$host\/$share $pass -W $workgroup -U $user $smbclientoptions -c ls/;
+  } else {
+!       print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
+!       $res = qx/$smbclient \/\/$host\/$share $pass -U $user $smbclientoptions -c ls/;
+  }
+  #Turn off alarm
+  alarm(0);
+--- 118,149 ----
+  };
+  alarm($TIMEOUT);
+  
++ # Check Samba version. Version 3 changed the way we pass the server path.
++ my $samba_ver = qx/$smbclient --version 2>&1/;
++ if($samba_ver =~ /Version (\d)/)
++ {
++       $samba_ver = $1;
++ }
++ 
++ # Version 3 broke it all.
++ my $smbclient_part_cmd;
++ if($samba_ver == 3) 
++ {
++       $smbclient_part_cmd = "$smbclient \\\\\\\\$host\\\\$share";
++ }
++ else
++ {
++       $smbclient_part_cmd = "$smbclient \/\/$host\/$share";
++ }
++ 
+  # Execute an "ls" on the share using smbclient program
+  # get the results into $res
+  if (defined($workgroup)) {
+!       print $smbclient_part_cmd . " $pass -W $workgroup -U $user $smbclientoptions -c ls\n" if ($verbose);
+!       $res = qx/$smbclient_part_cmd $pass -W $workgroup -U $user $smbclientoptions -c ls/;
+  } else {
+!       print $smbclient_part_cmd . " $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
+!       $res = qx/$smbclient_part_cmd $pass -U $user $smbclientoptions -c ls/;
+  }
+  #Turn off alarm
+  alarm(0);
diff --git a/web/attachments/144118-nagios-plugins-1.4.1-waitpid.patch b/web/attachments/144118-nagios-plugins-1.4.1-waitpid.patch
new file mode 100644
index 0000000..331da4b
--- /dev/null
+++ b/web/attachments/144118-nagios-plugins-1.4.1-waitpid.patch
@@ -0,0 +1,16 @@
+--- nagios-plugins-1.4.1/plugins/popen.c.orig   2005-08-02 13:44:47.631761141 +0200
++++ nagios-plugins-1.4.1/plugins/popen.c        2005-08-02 13:52:24.589616713 +0200
+@@ -221,8 +221,13 @@
+                return (1);
+ 
+        while (waitpid (pid, &status, 0) < 0)
++       {
++               if (errno == ECHILD)
++                       return (0);                                                     /* Child has already exited */
++
+                if (errno != EINTR)
+                        return (1);                                                     /* error other than EINTR from waitpid() */
++       }
+ 
+        if (WIFEXITED (status))
+                return (WEXITSTATUS (status));  /* return child's termination status */
diff --git a/web/attachments/144263-patch-plugins-scripts_subst_in b/web/attachments/144263-patch-plugins-scripts_subst_in
new file mode 100644
index 0000000..20f6300
--- /dev/null
+++ b/web/attachments/144263-patch-plugins-scripts_subst_in
@@ -0,0 +1,24 @@
+$OpenBSD: patch-plugins-scripts_subst_in,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
+--- plugins-scripts/subst.in.orig       Mon Jul 18 22:56:08 2005
++++ plugins-scripts/subst.in    Mon Jul 18 22:56:30 2005
+@@ -44,10 +44,6 @@ BEGIN {
+ /^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}
+ /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}
+ 
+-# add to libexecdir to INC for perl utils.pm
+-/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
+-
+-
+ # Trusted path mechanism (deprecated)
+ 
+ /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
+@@ -67,6 +63,9 @@ BEGIN {
+        c=substr($0,RSTART,RLENGTH);
+        sub(c,which(c,path));
+ }
++
++# add to libexecdir to INC for perl utils.pm
++/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
+ 
+ {
+        print;
diff --git a/web/attachments/144266-patch-configure b/web/attachments/144266-patch-configure
new file mode 100644
index 0000000..9e7a2a4
--- /dev/null
+++ b/web/attachments/144266-patch-configure
@@ -0,0 +1,61 @@
+$OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
+--- configure.orig      Mon Aug  1 23:34:46 2005
++++ configure   Wed Aug  3 13:59:35 2005
+@@ -8339,13 +8339,13 @@ if test "${with_pgsql+set}" = set; then
+   PGSQL=$withval
+ fi;
+ 
+-echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
+-echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for main in -lcrypto" >&5
++echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6
+ if test "${ac_cv_lib_crypt_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypt  $LIBS"
++LIBS="-lcrypto  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8402,7 +8402,7 @@ if test $ac_cv_lib_crypt_main = yes; the
+ #define HAVE_LIBCRYPT 1
+ _ACEOF
+ 
+-  LIBS="-lcrypt $LIBS"
++  LIBS="-lcrypto $LIBS"
+ 
+ fi
+ 
+@@ -8418,7 +8418,7 @@ if test "${ac_cv_lib_pq_PQsetdbLogin+set
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpq -lcrypt $LIBS"
++LIBS="-lpq -lcrypto $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8937,16 +8937,16 @@ fi
+ done
+ 
+     if [ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]; then
+-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
++      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
+       PGINCLUDE="-I$PGSQL/include"
+     elif test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
+-      PGLIBS="-lpq -lcrypt"
+-      PGINCLUDE="-I/usr/include/pgsql"
++      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
++      PGINCLUDE="-I$PGSQL/include/pgsql"
+     elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
+-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+-      PGINCLUDE="-I/usr/include/postgresql"
++      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
++      PGINCLUDE="-I$PGSQL/include/postgresql"
+     elif test  "$ac_cv_header_libpq_fe_h" = "yes"; then
+-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
++      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
+       PGINCLUDE="-I$PGSQL/include"
+     fi
+     if test -z "$PGINCLUDE"; then
diff --git a/web/attachments/144285-nagios-plugins-1.4.1-check_ntp.patch b/web/attachments/144285-nagios-plugins-1.4.1-check_ntp.patch
new file mode 100644
index 0000000..c50eb65
--- /dev/null
+++ b/web/attachments/144285-nagios-plugins-1.4.1-check_ntp.patch
@@ -0,0 +1,20 @@
+--- nagios-plugins-1.4.1/plugins-scripts/check_ntp.pl.orig      2005-08-03 13:37:36.876820293 +0200
++++ nagios-plugins-1.4.1/plugins-scripts/check_ntp.pl   2005-08-03 13:38:26.845893474 +0200
+@@ -309,7 +309,7 @@
+                                }
+                        } else {
+                                print "No match!\n" if $verbose;
+-                               $jitter = '(not parsed)';
++                               $jitter = -1;
+                        }
+                        
+                }
+@@ -421,7 +421,7 @@
+ foreach my $key (keys %ERRORS) {
+        if ($state==$ERRORS{$key}) {
+ #              print ("NTP $key: $answer");
+-               print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 .     ",peer_stratum=$stratum\n");
++               print ("NTP $key: $answer|offset=$offset, jitter=" . (($jitter) ? $jitter/1000 : '-') . ",peer_stratum=$stratum\n");
+                last;
+        }
+ }
diff --git a/web/attachments/144381-nagios-plugins-1.4.1-check_tcp.patch b/web/attachments/144381-nagios-plugins-1.4.1-check_tcp.patch
new file mode 100644
index 0000000..55a1541
--- /dev/null
+++ b/web/attachments/144381-nagios-plugins-1.4.1-check_tcp.patch
@@ -0,0 +1,53 @@
+--- nagios-plugins-1.4.1/plugins/check_tcp.c.orig       2005-08-04 09:47:34.493447229 +0200
++++ nagios-plugins-1.4.1/plugins/check_tcp.c    2005-08-04 09:48:24.684428631 +0200
+@@ -175,12 +175,12 @@
+                flags |= FLAG_SSL;
+                PORT = 465;
+        }
+-       else if (!strncmp(SERVICE, "JABBER", 6)) {
++       else if (!strncmp(SERVICE, "JABBERS", 7)) {
+                SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
+                EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
+                QUIT = "</stream:stream>\n";
+                flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
+-               PORT = 5222;
++               PORT = 5223;
+        }
+        else if (!strncmp (SERVICE, "NNTPS", 5)) {
+                server_expect_count = 2;
+@@ -191,6 +191,13 @@
+                PORT = 563;
+        }
+ #endif
++       else if (!strncmp(SERVICE, "JABBER", 6)) {
++               SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
++               EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
++               QUIT = "</stream:stream>\n";
++               flags |= FLAG_HIDE_OUTPUT;
++               PORT = 5222;
++       }
+        else if (!strncmp (SERVICE, "NNTP", 4)) {
+                server_expect_count = 2;
+                server_expect = malloc(sizeof(char *) * server_expect_count);
+--- nagios-plugins-1.4.1/configure.in.orig      2005-08-04 10:31:50.608790288 +0200
++++ nagios-plugins-1.4.1/configure.in   2005-08-04 10:32:00.309256197 +0200
+@@ -479,7 +479,7 @@
+ fi
+ 
+ if test "$FOUNDSSL" = "yes"; then
+-  check_tcp_ssl="check_simap check_spop check_jabber check_nntps check_ssmtp"
++  check_tcp_ssl="check_simap check_spop check_jabbers check_nntps check_ssmtp"
+   AC_SUBST(check_tcp_ssl)
+   AC_SUBST(SSLLIBS)
+   AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
+--- nagios-plugins-1.4.1/plugins/Makefile.am.orig       2005-08-04 10:32:17.072877007 +0200
++++ nagios-plugins-1.4.1/plugins/Makefile.am    2005-08-04 10:32:30.926258102 +0200
+@@ -17,7 +17,7 @@
+        check_udp check_ups check_users negate urlize check_icmp\
+        @EXTRAS@
+ 
+-check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
++check_tcp_programs = check_ftp check_imap check_jabber check_nntp check_pop check_udp2 \
+        @check_tcp_ssl@
+ 
+ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
diff --git a/web/attachments/144382-nagios-plugins-1.4.1-check_ntp.patch b/web/attachments/144382-nagios-plugins-1.4.1-check_ntp.patch
new file mode 100644
index 0000000..c50eb65
--- /dev/null
+++ b/web/attachments/144382-nagios-plugins-1.4.1-check_ntp.patch
@@ -0,0 +1,20 @@
+--- nagios-plugins-1.4.1/plugins-scripts/check_ntp.pl.orig      2005-08-03 13:37:36.876820293 +0200
++++ nagios-plugins-1.4.1/plugins-scripts/check_ntp.pl   2005-08-03 13:38:26.845893474 +0200
+@@ -309,7 +309,7 @@
+                                }
+                        } else {
+                                print "No match!\n" if $verbose;
+-                               $jitter = '(not parsed)';
++                               $jitter = -1;
+                        }
+                        
+                }
+@@ -421,7 +421,7 @@
+ foreach my $key (keys %ERRORS) {
+        if ($state==$ERRORS{$key}) {
+ #              print ("NTP $key: $answer");
+-               print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 .     ",peer_stratum=$stratum\n");
++               print ("NTP $key: $answer|offset=$offset, jitter=" . (($jitter) ? $jitter/1000 : '-') . ",peer_stratum=$stratum\n");
+                last;
+        }
+ }
diff --git a/web/attachments/146297-check_http--more_perf_data.diff b/web/attachments/146297-check_http--more_perf_data.diff
new file mode 100644
index 0000000..ffc3dba
--- /dev/null
+++ b/web/attachments/146297-check_http--more_perf_data.diff
@@ -0,0 +1,38 @@
+--- check_http.c.orig   2005-08-19 10:38:29.000000000 -0500
++++ check_http.c        2005-08-19 11:38:29.000000000 -0500
+@@ -20,8 +20,8 @@
+ /* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
+ 
+ const char *progname = "check_http";
+-const char *revision = "$Revision: 1.81 $";
+-const char *copyright = "1999-2004";
++const char *revision = "$Revision: 1.9 $";
++const char *copyright = "1999-2005";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+@@ -1356,20 +1356,20 @@
+                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+ 
+        if (days_left > 0 && days_left <= days_till_exp) {
+-               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
++               printf (_("WARNING - Certificate expires in %d day(s) (%s). | cert_valid=1;1;2\n"), days_left, timestamp);
+                return STATE_WARNING;
+        }
+        if (days_left < 0) {
+-               printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
++               printf (_("CRITICAL - Certificate expired on %s. | cert_valid=2;1;2\n"), timestamp);
+                return STATE_CRITICAL;
+        }
+ 
+        if (days_left == 0) {
+-               printf (_("WARNING - Certificate expires today (%s).\n"), timestamp);
++               printf (_("WARNING - Certificate expires today (%s). | cert_valid=1;1;2\n"), timestamp);
+                return STATE_WARNING;
+        }
+ 
+-       printf (_("OK - Certificate will expire on %s.\n"), timestamp);
++       printf (_("OK - Certificate will expire on %s. | cert_valid=0;1;2\n"), timestamp);
+ 
+        return STATE_OK;
+ }
diff --git a/web/attachments/146541-perl-path.patch b/web/attachments/146541-perl-path.patch
new file mode 100644
index 0000000..35e1718
--- /dev/null
+++ b/web/attachments/146541-perl-path.patch
@@ -0,0 +1,43 @@
+--- plugins-scripts/subst.in.orig       2005-08-12 15:53:26.000000000 -0700
++++ plugins-scripts/subst.in    2005-08-12 15:53:51.000000000 -0700
+@@ -1,24 +1,5 @@
+ #!/usr/bin/awk
+ 
+-function which(c,path) {
+-       cmd = "test -x " c;
+-
+-       if (system(cmd)==0) {
+-               return c;
+-       } 
+-
+-       sub(/\/.*\//,"",c);
+-  for (dir in path) {
+-                       cmd = "test -x " path[dir] "/" c;
+-                       if (system(cmd)==0) {
+-                                       return path[dir] "/" c;
+-                       } 
+-       }
+-
+-
+-       return c;
+-}
+-
+ # used to replace "use lib utils.pm" with "use lib @libexecdir"
+ #
+ function led() {
+@@ -58,15 +39,6 @@
+        sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
+ }
+ 
+-# Specific programs
+-
+-#
+-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
+-       match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
+-       start=RSTART+RLENGTH;
+-       c=substr($0,RSTART,RLENGTH);
+-       sub(c,which(c,path));
+-}
+ 
+ {
+        print;
diff --git a/web/attachments/146722-check_ifoperstatus_cache.diff b/web/attachments/146722-check_ifoperstatus_cache.diff
new file mode 100644
index 0000000..b0e2ae9
--- /dev/null
+++ b/web/attachments/146722-check_ifoperstatus_cache.diff
@@ -0,0 +1,245 @@
+*** check_ifoperstatus.orig     2005-08-19 17:45:13.000000000 -0400
+--- check_ifoperstatus  2005-08-23 16:32:12.000000000 -0400
+*************** my $community = "public";
+*** 64,78 ****
+  my $maxmsgsize = 1472 ; # Net::SNMP default is 1472
+  my ($seclevel, $authproto, $secname, $authpass, $privpass, $auth, $priv, $context);
+  my $port = 161;
+- my @snmpoids;
+  my $sysUptime        = '1.3.6.1.2.1.1.3.0';
+  my $snmpIfDescr      = '1.3.6.1.2.1.2.2.1.2';
+  my $snmpIfAdminStatus = '1.3.6.1.2.1.2.2.1.7';
+  my $snmpIfOperStatus = '1.3.6.1.2.1.2.2.1.8';
+  my $snmpIfName       = '1.3.6.1.2.1.31.1.1.1.1';
+  my $snmpIfLastChange = '1.3.6.1.2.1.2.2.1.9';
+  my $snmpIfAlias      = '1.3.6.1.2.1.31.1.1.1.18';
+  my $snmpLocIfDescr   = '1.3.6.1.4.1.9.2.2.1.1.28';
+  my $hostname;
+  my $ifName;
+  my $session;
+--- 64,84 ----
+  my $maxmsgsize = 1472 ; # Net::SNMP default is 1472
+  my ($seclevel, $authproto, $secname, $authpass, $privpass, $auth, $priv, $context);
+  my $port = 161;
+  my $sysUptime        = '1.3.6.1.2.1.1.3.0';
+  my $snmpIfDescr      = '1.3.6.1.2.1.2.2.1.2';
++ my $snmpIfDescrOid   = $snmpIfDescr;
+  my $snmpIfAdminStatus = '1.3.6.1.2.1.2.2.1.7';
++ my $snmpIfAdminStatusOid = $snmpIfAdminStatus;
+  my $snmpIfOperStatus = '1.3.6.1.2.1.2.2.1.8';
++ my $snmpIfOperStatusOid = $snmpIfOperStatus;
+  my $snmpIfName       = '1.3.6.1.2.1.31.1.1.1.1';
++ my $snmpIfNameOid    = $snmpIfName;
+  my $snmpIfLastChange = '1.3.6.1.2.1.2.2.1.9';
++ my $snmpIfLastChangeOid = $snmpIfLastChange;
+  my $snmpIfAlias      = '1.3.6.1.2.1.31.1.1.1.18';
++ my $snmpIfAliasOid   = $snmpIfAlias;
+  my $snmpLocIfDescr   = '1.3.6.1.4.1.9.2.2.1.1.28';
++ my $snmpLocIfDescrOid = $snmpLocIfDescr;
+  my $hostname;
+  my $ifName;
+  my $session;
+*************** my $lastc;
+*** 88,93 ****
+--- 94,101 ----
+  my $dormantWarn;
+  my $adminWarn;
+  my $name;
++ my $cacheFileChecked = 0;
++ my $cacheFileName = '/tmp/interface_cache.db';
+  
+  ### Validate Arguments
+  
+*************** alarm($timeout);
+*** 106,114 ****
+  ## map ifdescr to ifindex - should look at being able to cache this value
+  
+  if (defined $ifdescr) {
+-       # escape "/" in ifdescr - very common in the Cisco world
+-       $ifdescr =~ s/\//\\\//g;
+- 
+        $status=fetch_ifdescr();  # if using on device with large number of interfaces
+                                                          # recommend use of SNMP v2 (get-bulk)
+        if ($status==0) {
+--- 114,119 ----
+*************** if (defined $ifdescr) {
+*** 122,155 ****
+  
+  ## Main function
+  
+! $snmpIfAdminStatus = $snmpIfAdminStatus . "." . $snmpkey;
+! $snmpIfOperStatus = $snmpIfOperStatus . "." . $snmpkey;
+! $snmpIfDescr = $snmpIfDescr . "." . $snmpkey;
+! $snmpIfName   = $snmpIfName . "." . $snmpkey ;
+! $snmpIfAlias = $snmpIfAlias . "." . $snmpkey ; 
+! 
+! push(@snmpoids,$snmpIfAdminStatus);
+! push(@snmpoids,$snmpIfOperStatus);
+! push(@snmpoids,$snmpIfDescr);
+! push(@snmpoids,$snmpIfName) if (defined $ifXTable) ;
+! push(@snmpoids,$snmpIfAlias) if (defined $ifXTable) ;
+  
+!    if (!defined($response = $session->get_request(@snmpoids))) {
+!       $answer=$session->error;
+!       $session->close;
+!       $state = 'WARNING';
+!       print ("$state: SNMP error: $answer\n");
+!       exit $ERRORS{$state};
+     }
+  
+-    $answer = sprintf("host '%s', %s(%s) is %s\n", 
+-       $hostname, 
+-       $response->{$snmpIfDescr},
+-       $snmpkey, 
+-       $ifOperStatus{$response->{$snmpIfOperStatus}}
+-    );
+- 
+- 
+     ## Check to see if ifName match is requested and it matches - exit if no match
+     ## not the interface we want to monitor
+     if ( defined $name && not ($response->{$snmpIfName} eq $name) ) {
+--- 127,145 ----
+  
+  ## Main function
+  
+!    # moved fetching of information to function to allow it to be recalled if
+!    # bad snmpkey in cache file
+  
+!    fetch_data();
+!    # If using ifDescr check to make sure database didn't return
+!    # stale snmpkey
+!    if (defined $ifdescr) {
+!       if ($response->{$snmpIfDescr} ne $ifdescr) {
+!          fetch_ifdescr();
+!          fetch_data();
+!       }
+     }
+  
+     ## Check to see if ifName match is requested and it matches - exit if no match
+     ## not the interface we want to monitor
+     if ( defined $name && not ($response->{$snmpIfName} eq $name) ) {
+*************** exit $ERRORS{$state};
+*** 225,232 ****
+  
+  ### subroutines
+  
+  sub fetch_ifdescr {
+!       if (!defined ($response = $session->get_table($snmpIfDescr))) {
+                $answer=$session->error;
+                $session->close;
+                $state = 'CRITICAL';
+--- 215,270 ----
+  
+  ### subroutines
+  
++ sub fetch_data {
++    my @snmpoids;
++ 
++    $snmpIfAdminStatus = $snmpIfAdminStatusOid . "." . $snmpkey;
++    $snmpIfOperStatus = $snmpIfOperStatusOid . "." . $snmpkey;
++    $snmpIfDescr = $snmpIfDescrOid . "." . $snmpkey;
++    $snmpIfName = $snmpIfNameOid . "." . $snmpkey ;
++    $snmpIfAlias = $snmpIfAliasOid . "." . $snmpkey ;
++ 
++    push(@snmpoids,$snmpIfAdminStatus);
++    push(@snmpoids,$snmpIfOperStatus);
++    push(@snmpoids,$snmpIfDescr);
++    push(@snmpoids,$snmpIfName) if (defined $ifXTable) ;
++    push(@snmpoids,$snmpIfAlias) if (defined $ifXTable) ;
++ 
++    if (!defined($response = $session->get_request(@snmpoids))) {
++       $answer=$session->error;
++       $session->close;
++       $state = 'WARNING';
++       print ("$state: SNMP error: $answer\n");
++       exit $ERRORS{$state};
++    }
++ 
++    $answer = sprintf("host '%s', %s(%s) is %s\n",
++       $hostname,
++       $response->{$snmpIfDescr},
++       $snmpkey,
++       $ifOperStatus{$response->{$snmpIfOperStatus}}
++    );
++ }
++ 
+  sub fetch_ifdescr {
+!       my %intcache;
+!       dbmopen %intcache, $cacheFileName, 0600 or exit $ERRORS{'CRITICAL'};
+! 
+!       # check if we already checked cache file
+!       if (!$cacheFileChecked) {
+!               # check cache file for interface information, if exists use
+!               # if not then update cache file for the entire host looking
+!               # for this interface
+! 
+!               $cacheFileChecked = 1;
+!               if (exists $intcache{$hostname.$ifdescr}) {
+!                       $snmpkey = $intcache{$hostname.$ifdescr};
+!                       dbmclose %intcache;
+!                       return $snmpkey;
+!               }
+!       }
+! 
+!       if (!defined ($response = $session->get_table($snmpIfDescrOid))) {
+                $answer=$session->error;
+                $session->close;
+                $state = 'CRITICAL';
+*************** sub fetch_ifdescr {
+*** 235,246 ****
+                exit $ERRORS{$state};
+        }
+        
+        foreach $key ( keys %{$response}) {
+                if ($response->{$key} =~ /^$ifdescr$/) {
+!                       $key =~ /.*\.(\d+)$/;
+!                       $snmpkey = $1;
+                        #print "$ifdescr = $key / $snmpkey \n";  #debug
+                }
+        }
+        unless (defined $snmpkey) {
+                $session->close;
+--- 273,297 ----
+                exit $ERRORS{$state};
+        }
+        
++       # snmpwalk succesful, empty cache file for this host
++       # TODO: empty cache file for host
++ 
++         # escape "/" in ifdescr - very common in the Cisco world
++         $ifdescr =~ s/\//\\\//g;
++ 
+        foreach $key ( keys %{$response}) {
++               $key =~ /.*\.(\d+)$/;
++               my $cursnmpkey = $1;
++ 
+                if ($response->{$key} =~ /^$ifdescr$/) {
+!                       #$key =~ /.*\.(\d+)$/;
+!                       #$snmpkey = $1;
+!                       $snmpkey = $cursnmpkey;
+                        #print "$ifdescr = $key / $snmpkey \n";  #debug
+                }
++ 
++               # for each interface update cache file
++               $intcache{$hostname.$response->{$key}} = $cursnmpkey;
+        }
+        unless (defined $snmpkey) {
+                $session->close;
+*************** sub fetch_ifdescr {
+*** 248,254 ****
+                printf "$state: Could not match $ifdescr on $hostname\n";
+                exit $ERRORS{$state};
+        }
+!       
+        return $snmpkey;
+  }
+  
+--- 299,306 ----
+                printf "$state: Could not match $ifdescr on $hostname\n";
+                exit $ERRORS{$state};
+        }
+! 
+!       dbmclose %intcache;
+        return $snmpkey;
+  }
+  
diff --git a/web/attachments/146863-check_http.c.patch b/web/attachments/146863-check_http.c.patch
new file mode 100644
index 0000000..7f340bd
--- /dev/null
+++ b/web/attachments/146863-check_http.c.patch
@@ -0,0 +1,31 @@
+--- check_http.c        2005-08-24 16:08:32.000000000 -0700

++++ check_http.c.patched        2005-08-24 16:08:42.000000000 -0700

+@@ -173,6 +173,9 @@

+                if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {

+                        result = check_certificate (&server_cert);

+                        X509_free (server_cert);

++                       if (result == STATE_OK) {

++                               result = check_http ();

++                       }

+                }

+                else {

+                        printf (_("CRITICAL - Cannot retrieve server certificate.\n"));

+@@ -1369,8 +1372,6 @@

+                return STATE_WARNING;

+        }

+

+-       printf (_("OK - Certificate will expire on %s.\n"), timestamp);

+-

+        return STATE_OK;

+ }

+ #endif

+@@ -1472,8 +1473,7 @@

+  -S, --ssl\n\

+     Connect via SSL\n\

+  -C, --certificate=INTEGER\n\

+-    Minimum number of days a certificate has to be valid.\n\

+-    (when this option is used the url is not checked.)\n"));

++    Minimum number of days a certificate has to be valid.\n"));

+ #endif

+

+        printf (_("\
\ No newline at end of file
diff --git a/web/attachments/147630-check_mysqlhealth.pl b/web/attachments/147630-check_mysqlhealth.pl
new file mode 100644
index 0000000..f0391d5
--- /dev/null
+++ b/web/attachments/147630-check_mysqlhealth.pl
@@ -0,0 +1,159 @@
+#!/usr/bin/perl
+# --
+# Check the health of a mysql server.
+#
+# @author Peter Romianowski / optivo GmbH
+# @version 1.0 2005-08-31
+# --
+use Getopt::Long;
+use DBI;
+
+# --
+# Print out the usage message
+# --
+sub usage {
+    print "usage: check_mysqlhealth.pl -H <host> -u <user> -p <password> \n";
+    print "       Optional parameters:\n";
+    print "       --port <port> \n";
+    print "       --Cc <critical number of connections> \n";
+    print "       --Wc <warning number of connections> \n";
+    print "       --Ca <critical number of ACTIVE connections> \n";
+    print "       --Wa <warning number of ACTIVE connections> \n";
+    print "       --sql <an sql statement that will be executed and that must return at least one row>\n";
+}
+
+$|=1;
+
+# --
+# Parse arguments and read Configuration
+# --
+my ($host, $user, $password, $port, $criticalConnections, $warningConnections, $criticalActive, $warningActive, $sql);
+GetOptions (
+    'host=s' => \$host,
+    'H=s' => \$host,
+    'user=s' => \$user,
+    'u=s' => \$user,
+    'password=s' => \$password,
+    'p:s' => \$password,
+    'port=i' => \$port,
+    'Cc=i' => \$criticalConnections,
+    'Wc=i' => \$warningConnections,
+    'Ca=i' => \$criticalActive,
+    'Wa=i' => \$warningActive,
+    'sql=s'=> \$sql
+);
+
+if (!$host || !$user) {
+    usage();
+    exit(1);
+}
+
+if (!$port) {
+    $port = 3306;
+}
+
+my $totalTime = time();
+
+# --
+# Establish connection
+# --
+my $state = "OK";
+my $dbh;
+eval {
+    $dbh = DBI->connect("DBI:mysql:host=$host;port=$port", $user, $password, {'RaiseError' => 1});
+};
+
+if ($@) {
+    my $status = $@;
+    print 'CRITICAL: Connect failed with reason ' . $status . "\n";
+    exit 2;
+}
+
+# --
+# Count active statements
+# --
+my $connections = 0;
+my $active = 0;
+
+eval {
+    my $sth = $dbh->prepare("SHOW PROCESSLIST");
+    $sth->execute();
+    my $row;
+    do {
+        $row = $sth->fetchrow_hashref();
+        if ($row) {
+            if (!($row->{'Command'} =~ /Sleep/)) {
+                $active++;
+            }
+            $connections++;
+        }
+        
+    } while ($row);
+};
+
+if ($@) {
+    my $status = $@;
+    print 'CRITICAL: Error executing SHOW PROCESSLIST, reason ' . $status . "\n";
+    exit 2;
+}
+
+# --
+# Execute optional sql statement if given
+# --
+$sqlResult;
+if ($sql) {
+    eval {
+        my $sth = $dbh->prepare($sql);
+        $sth->execute();
+        my @row = $sth->fetchrow();
+        if (@row) {
+            $sqlResult = join('|', @row);
+        }
+    };
+    
+    if ($@) {
+        my $status = $@;
+        print 'CRITICAL: Error executing statement "' . $sql . '", reason ' . $status . "\n";
+        exit 2;
+    }
+    
+}
+
+# --
+# Cleanup resources
+# --
+$dbh->disconnect();    
+
+# --
+# Check
+# --
+my $statusString = "$connections connections, $active active connections";
+if ($criticalConnections && $criticalConnections < $connections) {
+    print "CRITICAL: Number of connections higher than $criticalConnections ($statusString)\n";
+    exit 2;
+}
+if ($criticalActive && $criticalActive < $active) {
+    print "CRITICAL: Number of ACTIVE connections higher than $criticalActive ($statusString)\n";
+    exit 2;
+}
+if ($warningConnections && $warningConnections < $connections) {
+    print "WARNING: Number of connections higher than $warningConnections ($statusString)\n";
+    exit 1;
+}
+if ($warningActive && $warningActive < $active) {
+    print "WARNING: Number of ACTIVE connections higher than $warningActive ($statusString)\n";
+    exit 1;
+}
+if ($sql) {
+    if ($sqlResult) {
+        $statusString = "Statement '$sql' returned: '$sqlResult', $statusString";
+    } else {
+        print "CRITICAL: Execution of statement '$sql' did not produce any result ($statusString)\n";
+        exit 2;
+    }
+}
+
+print "OK: $statusString\n";
+exit 0;
+
+    
diff --git a/web/attachments/148122-waitpid.patch b/web/attachments/148122-waitpid.patch
new file mode 100644
index 0000000..dc6c06a
--- /dev/null
+++ b/web/attachments/148122-waitpid.patch
@@ -0,0 +1,54 @@
+--- nagios-plugins-1.4.1/plugins/popen.c.orig   2005-09-05 14:02:00.314775817 +0200
++++ nagios-plugins-1.4.1/plugins/popen.c        2005-09-05 14:16:21.427287267 +0200
+@@ -30,6 +30,7 @@
+ 
+ FILE *spopen (const char *);
+ int spclose (FILE *);
++static RETSIGTYPE popen_sigchld_handler (int);
+ RETSIGTYPE popen_timeout_alarm_handler (int);
+ 
+ #include <stdarg.h>                                                    /* ANSI C header file */
+@@ -66,6 +67,7 @@
+ /*int *childerr = NULL;*//* ptr to array allocated at run-time */
+ /*extern pid_t *childpid = NULL; *//* ptr to array allocated at run-time */
+ static int maxfd;                                                              /* from our open_max(), {Prog openmax} */
++static volatile int childtermd = 0;                            /* set by SIGCHLD handler */
+ 
+ FILE *
+ spopen (const char *cmdstring)
+@@ -171,6 +173,10 @@
+        if (pipe (pfderr) < 0)
+                return (NULL);                                                  /* errno set by pipe() */
+ 
++       if (signal (SIGCHLD, popen_sigchld_handler) == SIG_ERR) {
++               usage4 (_("Cannot catch SIGCHLD"));
++       }
++
+        if ((pid = fork ()) < 0)
+                return (NULL);                                                  /* errno set by fork() */
+        else if (pid == 0) {                                    /* child */
+@@ -220,6 +226,8 @@
+        if (fclose (fp) == EOF)
+                return (1);
+ 
++       while (!childtermd);                                                            /* wait until SIGCHLD */
++
+        while (waitpid (pid, &status, 0) < 0)
+                if (errno != EINTR)
+                        return (1);                                                     /* error other than EINTR from waitpid() */
+@@ -239,8 +247,14 @@
+ #define        OPEN_MAX_GUESS  256                     /* if OPEN_MAX is indeterminate */
+                                /* no guarantee this is adequate */
+ 
++static RETSIGTYPE
++popen_sigchld_handler (int signo)
++{
++       if (signo == SIGCHLD)
++               childtermd = 1;
++}
+ 
+-void
++RETSIGTYPE
+ popen_timeout_alarm_handler (int signo)
+ {
+        int fh;
diff --git a/web/attachments/148408-check_dhcp.c.diff b/web/attachments/148408-check_dhcp.c.diff
new file mode 100644
index 0000000..bd24891
--- /dev/null
+++ b/web/attachments/148408-check_dhcp.c.diff
@@ -0,0 +1,74 @@
+--- check_dhcp.c.orig   2005-09-07 12:33:44.000000000 -0700
++++ check_dhcp.c        2005-09-07 15:35:26.000000000 -0700
+@@ -157,6 +157,7 @@
+ 
+ typedef struct requested_server_struct{
+        struct in_addr server_address;
++       int answered;
+        struct requested_server_struct *next;
+         }requested_server;
+ 
+@@ -479,6 +480,7 @@
+ int get_dhcp_offer(int sock){
+        dhcp_packet offer_packet;
+        struct sockaddr_in source;
++       struct sockaddr_in via;
+        int result=OK;
+        int timeout=1;
+        int responses=0;
+@@ -499,6 +501,7 @@
+                        printf("\n\n");
+ 
+                bzero(&source,sizeof(source));
++               bzero(&via,sizeof(via));
+                bzero(&offer_packet,sizeof(offer_packet));
+ 
+                result=OK;
+@@ -516,9 +519,18 @@
+ 
+                        responses++;
+                        }
++               /* The "source" is either a server or a relay. */
++               /* Save a copy of "source" into "via" even if it's via itself */
++               memcpy(&via,&source,sizeof(source)) ;
++
++               /* If siaddr is non-zero, set "source" to siaddr */
++               if (offer_packet.siaddr.s_addr != 0L) {
++                       source.sin_addr.s_addr = offer_packet.siaddr.s_addr ;
++                       }
+ 
+                if (verbose) {
+-                       printf(_("DHCPOFFER from IP address %s\n"),inet_ntoa(source.sin_addr));
++                       printf(_("DHCPOFFER from IP address %s"),inet_ntoa(source.sin_addr));
++                       printf(_(" via %s\n"),inet_ntoa(via.sin_addr));
+                        printf("DHCPOFFER XID: %lu (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));
+                }
+ 
+@@ -727,6 +739,7 @@
+                return ERROR;
+ 
+        new_server->server_address=server_address;
++       new_server->answered=FALSE;
+ 
+        new_server->next=requested_server_list;
+        requested_server_list=new_server;
+@@ -887,9 +900,17 @@
+                                if(!memcmp(&temp_offer->server_address,&temp_server->server_address,sizeof(temp_server->server_address))){
+        if (verbose) {
+                                        printf(_("DHCP Server Match: Offerer=%s"),inet_ntoa(temp_offer->server_address));
+-                                       printf(_(" Requested=%s\n"),inet_ntoa(temp_server->server_address));
++                                       printf(_(" Requested=%s"),inet_ntoa(temp_server->server_address));
++                                       if (temp_server->answered) 
++                                               printf(_(" (duplicate)"));
++
++                                       printf(_("\n"));
+        }                                      
+-                                       requested_responses++;
++                                       if (temp_server->answered == FALSE){
++                                               requested_responses++;
++                                               temp_server->answered=TRUE;
++                                               }
++                                               
+                                        }
+                                }
+                        }
diff --git a/web/attachments/148493-check_dhcp--standardize.diff b/web/attachments/148493-check_dhcp--standardize.diff
new file mode 100644
index 0000000..4e79f46
--- /dev/null
+++ b/web/attachments/148493-check_dhcp--standardize.diff
@@ -0,0 +1,49 @@
+--- check_dhcp.c.orig   2005-09-08 11:27:25.000000000 -0500
++++ check_dhcp.c        2005-09-08 12:55:15.000000000 -0500
+@@ -27,7 +27,7 @@
+ *****************************************************************************/
+ 
+ const char *progname = "check_dhcp";
+-const char *revision = "$Revision: 1.7 $";
++const char *revision = "$Revision: 1.8 $";
+ const char *copyright = "2001-2004";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+@@ -106,11 +106,6 @@
+ 
+ /**** Common definitions ****/
+ 
+-#define STATE_OK          0
+-#define STATE_WARNING     1
+-#define STATE_CRITICAL    2
+-#define STATE_UNKNOWN     -1
+-
+ #define OK                0
+ #define ERROR             -1
+ 
+@@ -241,7 +236,7 @@
+ 
+ int main(int argc, char **argv){
+        int dhcp_socket;
+-       int result;
++       int result = STATE_UNKNOWN;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -921,8 +916,14 @@
+        else if(request_specific_address==TRUE && received_requested_address==FALSE)
+                result=STATE_WARNING;
+ 
+-
+-       printf("DHCP %s: ",(result==STATE_OK)?"ok":"problem");
++    if(result==0)               /* garrett honeycutt 2005 */
++        printf("OK: ");
++    else if(result==1)
++        printf("WARNING: ");
++    else if(result==2)
++        printf("CRITICAL: ");
++    else if(result==3)
++        printf("UNKNOWN: ");
+ 
+        /* we didn't receive any DHCPOFFERs */
+        if(dhcp_offer_list==NULL){
diff --git a/web/attachments/148805-check_dhcp--standardize.diff b/web/attachments/148805-check_dhcp--standardize.diff
new file mode 100644
index 0000000..3a8a6a2
--- /dev/null
+++ b/web/attachments/148805-check_dhcp--standardize.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378821534" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378821534" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378821534" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378821534" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378821534');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1288725&group_id=29880&atid=397599&file_id=148805"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/149090-pst3.c b/web/attachments/149090-pst3.c
new file mode 100644
index 0000000..3817819
--- /dev/null
+++ b/web/attachments/149090-pst3.c
@@ -0,0 +1,252 @@
+/*      pst3.c

+ *

+ *  Third version to get process arg info; this time by using

+ *  a combination of reading the /proc/<pid>/psinfo structures

+ *  and reading the complete arg vector from kernel memory structures.

+ *

+ *  Developed and tested under Solaris 5.8 (both 32 and 64 bit modes).

+ *

+ *  NOTE:  This program must be setuid-root (or run by root) to work!

+ *

+ *      Written: 2005-04-28     R.W.Ingraham

+ */

+

+

+#define _KMEMUSER       1

+

+#include <kvm.h>

+#include <sys/param.h>

+#include <sys/user.h>

+#include <sys/time.h>

+#include <sys/proc.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <procfs.h>

+#include <fcntl.h>

+#include <dirent.h>

+#include <errno.h>

+

+

+/*

+ *      Constants

+ */

+

+#define PROC_DIR        "/proc"

+#define MAX_PATH        1024

+

+

+/*

+ *      Structures

+ */

+

+

+/*

+ *      Globals

+ */

+

+static char *        szProg;

+static kvm_t *       kd;

+static struct proc * pProc;

+static struct user * pUser;

+static char **       myArgv;

+

+

+/*

+ *      Prototypes

+ */

+

+static int HandleFile (struct dirent *pDent);

+static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo);

+static int GetArgVectors (pid_t pid);

+static void ShowArgVectors (void);

+static void ReleaseArgVectors();

+

+

+/*----------------------------------------------------------------------------*/

+

+int main (int argc, char **argv)

+{

+        DIR *pDir;

+        struct dirent *pDent;

+        int retcode = 0;

+

+

+        /* Set our program name global */

+        if ((szProg = strrchr(argv[0], '/')) != NULL)

+                szProg++;

+        else

+                szProg = argv[0];

+

+        /* Make sure that our euid is root */

+        if (geteuid() != 0)

+        {

+                fprintf(stderr, "%s: This program can only be run by the root user!\n", szProg);

+                exit(1);

+        }

+

+        /* Get a handle to the running kernel image */

+        if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, argv[0])) == NULL)

+        {

+                fprintf(stderr, "%s: Failed to open kernel memory: %s\n", szProg, strerror(errno));

+                exit(2);

+        }

+

+        /* Open the /proc directory */

+        if ((pDir = opendir(PROC_DIR)) != NULL)

+        {

+                /* Display column headings */

+                printf("S   UID  PPID    VSZ    RSS %%CPU COMMAND ARGS\n");

+

+                /* Zip through all of the process entries */

+                while ((pDent = readdir(pDir)) != NULL)

+                {

+                        /* Handle each pid sub-directory */

+                        HandleFile(pDent);

+                }

+

+                /* Close the directory */

+                closedir(pDir);

+        }

+        else    /* ERROR: Failure to open PROC_DIR */

+        {

+                fprintf(stderr, "%s: Failed to open \"%s\": %s\n", szProg, PROC_DIR, strerror(errno));

+                retcode = 3;

+        }

+

+        /* Close the handle to the running kernel image */

+        kvm_close(kd);

+

+        return retcode;

+}

+

+/*----------------------------------------------------------------------------*/

+

+static int HandleFile (struct dirent *pDent)

+{

+        char szPath[MAX_PATH];

+        psinfo_t sPsInfo;

+        int fd, len;

+        int rc = 0;

+

+        /* Skip files beginning with a "." */

+        if (pDent->d_name[0] == '.')

+                return 0;

+

+        /* Cosntruct the path to the psinfo file */

+        len = sprintf(szPath, "%s/%s/psinfo", PROC_DIR, pDent->d_name);

+

+        /* Open the psinfo file for this pid and print out its arg vectors */

+        if ((fd = open(szPath, O_RDONLY)) >= 0)

+        {

+                /* Read the psinfo struct */

+                if ((len = read(fd, &sPsInfo, sizeof(sPsInfo))) != sizeof(sPsInfo))

+                {

+                        rc = errno;

+                        fprintf(stderr, "%s: Read error of psinfo structure (%d)\n", szPath, len);

+                        return rc;

+                }

+

+                /* Close the psinfo file */

+                close(fd);

+

+                /* Pass psinfo struct to reporting function */

+                HandlePsInfo(szPath, &sPsInfo);

+        }

+        else if (errno != ENOENT)

+        {

+                rc = errno;

+                fprintf(stderr, "%s: %s\n", szPath, strerror(errno));

+        }

+

+        return 0;

+}

+

+/*----------------------------------------------------------------------------*/

+

+static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo)

+{

+        int retcode;

+        char *thisProg;

+

+        /* Make sure that the process is still there */

+        if ((retcode = GetArgVectors(pPsInfo->pr_pid)) == 0)

+        {

+                /* We use the program name from the kvm argv[0] instead

+                 * of pr_fname from the psinfo struct because pr_fname

+                 * may be truncated.

+                 *

+                 * Also, strip-off leading path information.

+                 */

+                if ((thisProg = strrchr(myArgv[0], '/')) != NULL)

+                        thisProg++;

+                else

+                        thisProg = myArgv[0];

+ 

+                /* Display the ps columns (except for argv) */

+                printf("%c %5d %5d %6lu %6lu %4.1f %s ",

+                        pPsInfo->pr_lwp.pr_sname,

+                        (int)(pPsInfo->pr_euid),

+                        (int)(pPsInfo->pr_ppid),

+                        (unsigned long)(pPsInfo->pr_size),

+                        (unsigned long)(pPsInfo->pr_rssize),

+                        ((float)(pPsInfo->pr_pctcpu) / 0x8000 * 100.0),

+                        thisProg);

+

+                /* Display the arg vectors associated with this pid */

+                ShowArgVectors();

+

+                /* Release the arg vector buffer memory */

+                ReleaseArgVectors();

+        }

+

+        return retcode;

+}

+

+/*----------------------------------------------------------------------------*/

+

+static int GetArgVectors (pid_t pid)

+{

+        int retcode = 1;

+

+        /* Get the proc structure for the specified PID */

+        if ((pProc = kvm_getproc(kd, pid)) != NULL)

+        {

+                /* Save a copy of the process' u-area */

+                if ((pUser = kvm_getu(kd, pProc)) != NULL)

+                {

+                        /* Reconstruct the process' argv vector array */

+                        if (kvm_getcmd(kd, pProc, pUser, &myArgv, NULL) == 0)

+                        {

+                                retcode = 0;

+                        }

+                }

+        }

+

+        return retcode;

+}

+

+/*----------------------------------------------------------------------------*/

+

+static void ShowArgVectors (void)

+{

+        int i;

+

+        for (i=0; myArgv[i]; i++)

+        {

+                printf(" %s", myArgv[i]);

+        }

+        printf("\n");

+}

+

+/*----------------------------------------------------------------------------*/

+

+static void ReleaseArgVectors()

+{

+        /* NOOP */

+}

+

+/*----------------------------------------------------------------------------*/

diff --git a/web/attachments/149231-check_tcp.diff b/web/attachments/149231-check_tcp.diff
new file mode 100644
index 0000000..e964ddf
--- /dev/null
+++ b/web/attachments/149231-check_tcp.diff
@@ -0,0 +1,41 @@
+--- nagios-plugins-1.4.1-org/plugins/check_tcp.c        2005-06-05 19:43:58.000000000 +0200
++++ nagios-plugins-1.4.1/plugins/check_tcp.c    2005-09-16 00:07:16.000000000 +0200
+@@ -108,6 +108,7 @@
+ {
+        int result = STATE_UNKNOWN;
+        int i;
++       int j;
+        char *status = NULL;
+        struct timeval tv;
+        size_t len, match = -1;
+@@ -221,6 +222,30 @@
+        if(EXPECT && !server_expect_count)
+                server_expect_count++;
+ 
++       j=0;
++       for(i=0; server_send[i]; i++) {
++               if (server_send[i] == '\\') {
++                       switch(server_send[i+1]) {
++                               case 'n':
++                                       server_send[j++] = '\n';
++                                       i++;
++                                       break;
++                               case 'r':
++                                       server_send[j++] = '\r';
++                                       i++;
++                                       break;
++                               case 't':
++                                       server_send[j++] = '\t';
++                                       i++;
++                                       break;
++                       }
++               }
++               else {
++                       server_send[j++] = server_send[i];
++               }
++       }
++       server_send[j] = 0;
++
+        /* set up the timer */
+        signal (SIGALRM, socket_timeout_alarm_handler);
+        alarm (socket_timeout);
diff --git a/web/attachments/149734-check_nwstat.cap b/web/attachments/149734-check_nwstat.cap
new file mode 100644
index 0000000..10745ce
--- /dev/null
+++ b/web/attachments/149734-check_nwstat.cap
diff --git a/web/attachments/149864-check_nwstat.c.diff b/web/attachments/149864-check_nwstat.c.diff
new file mode 100644
index 0000000..cd26b2d
--- /dev/null
+++ b/web/attachments/149864-check_nwstat.c.diff
@@ -0,0 +1,306 @@
+--- check_nwstat.c      2005-07-11 23:15:58.000000000 +0100
++++ /home/sully/check_nwstat.c  2005-09-21 11:55:09.000000000 +0100
+@@ -163,6 +163,9 @@
+                        temp_buffer = strdup ("15");
+                        break;
+                }
++               
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
+ 
+                asprintf (&send_buffer,"UTIL%s\r\n",temp_buffer);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+@@ -195,6 +198,9 @@
+                /* check number of user connections */
+        } else if (vars_to_check==CONNS) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("CONNECT\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -214,6 +220,9 @@
+                /* check % long term cache hits */
+        } else if (vars_to_check==LTCH) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S1\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -233,6 +242,9 @@
+                /* check cache buffers */
+        } else if (vars_to_check==CBUFF) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S2\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -252,6 +264,9 @@
+                /* check dirty cache buffers */
+        } else if (vars_to_check==CDBUFF) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S3\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -271,6 +286,9 @@
+                /* check LRU sitting time in minutes */
+        } else if (vars_to_check==LRUM) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S5\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -291,6 +309,9 @@
+                /* check KB free space on volume */
+        } else if (vars_to_check==VKF) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"VKF%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -315,6 +336,9 @@
+                /* check % free space on volume */
+        } else if (vars_to_check==VPF) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"VKF%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -331,7 +355,7 @@
+ 
+                        close(sd);
+                        my_tcp_connect (server_address, server_port, &sd);
+-
++               
+                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
+                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+@@ -352,6 +376,9 @@
+                /* check to see if DS Database is open or closed */
+        } else if (vars_to_check==DSDB) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S11\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -373,6 +400,9 @@
+                /* check to see if logins are enabled */
+        } else if (vars_to_check==LOGINS) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S12\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -386,7 +416,10 @@
+ 
+                /* check packet receive buffers */
+        } else if (vars_to_check==UPRB || vars_to_check==PUPRB) {
+- 
++
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++                
+                asprintf (&send_buffer,"S15\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -394,6 +427,9 @@
+ 
+                used_packet_receive_buffers=atoi(recv_buffer);
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"S16\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -420,6 +456,9 @@
+                /* check SAP table entries */
+        } else if (vars_to_check==SAPENTRIES) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                if (sap_number==-1)
+                        asprintf (&send_buffer,"S9\r\n");
+                else
+@@ -443,6 +482,9 @@
+                /* check KB purgeable space on volume */
+        } else if (vars_to_check==VKP) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"VKP%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -463,6 +505,9 @@
+                /* check % purgeable space on volume */
+        } else if (vars_to_check==VPP) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"VKP%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -477,6 +522,9 @@
+ 
+                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+ 
++                       close(sd);
++                       my_tcp_connect (server_address, server_port, &sd);
++                       
+                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
+                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+@@ -496,6 +544,9 @@
+                /* check KB not yet purgeable space on volume */
+        } else if (vars_to_check==VKNP) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"VKNP%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -516,6 +567,9 @@
+                /* check % not yet purgeable space on volume */
+        } else if (vars_to_check==VPNP) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"VKNP%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -530,6 +584,9 @@
+ 
+                        non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+ 
++                       close(sd);
++                       my_tcp_connect (server_address, server_port, &sd);
++                       
+                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
+                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+@@ -549,6 +606,9 @@
+                /* check # of open files */
+        } else if (vars_to_check==OFILES) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"S18\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -566,6 +626,9 @@
+                /* check # of abended threads (Netware 5.x only) */
+        } else if (vars_to_check==ABENDS) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"S17\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -583,6 +646,9 @@
+                /* check # of current service processes (Netware 5.x only) */
+        } else if (vars_to_check==CSPROCS) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"S20\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -613,6 +679,9 @@
+                /* check # Timesync Status */
+        } else if (vars_to_check==TSYNC) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"S22\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -631,6 +700,9 @@
+                /* check LRU sitting time in secondss */
+        } else if (vars_to_check==LRUS) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S4\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -647,6 +719,9 @@
+                /* check % dirty cacheobuffers as a percentage of the total*/
+        } else if (vars_to_check==DCB) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S6\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -662,6 +737,9 @@
+                /* check % total cache buffers as a percentage of the original*/
+        } else if (vars_to_check==TCB) {
+ 
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                send_buffer = strdup ("S7\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -675,6 +753,10 @@
+                asprintf (&output_message,_("Total cache buffers = %lu%% of the original"),total_cache_buffers);
+                
+        } else if (vars_to_check==DSVER) {
++
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++
+                asprintf (&send_buffer,"S13\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -685,6 +767,10 @@
+                asprintf (&output_message,_("NDS Version %s"),recv_buffer);
+ 
+        } else if (vars_to_check==UPTIME) {
++
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"UPTIME\r\n");
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+@@ -697,6 +783,10 @@
+                asprintf (&output_message,_("Up %s"),recv_buffer);
+ 
+        } else if (vars_to_check==NLM) {
++
++               close(sd);
++               my_tcp_connect (server_address, server_port, &sd);
++               
+                asprintf (&send_buffer,"S24:%s\r\n",nlm_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
diff --git a/web/attachments/149868-nagiosplug-check_snmp_mgeups.patch b/web/attachments/149868-nagiosplug-check_snmp_mgeups.patch
new file mode 100644
index 0000000..c06bce7
--- /dev/null
+++ b/web/attachments/149868-nagiosplug-check_snmp_mgeups.patch
@@ -0,0 +1,301 @@
+diff -Nru nagiosplug/plugins-scripts/check_snmp_mgeups.pl nagiosplug-check_snmp_mgeups/plugins-scripts/check_snmp_mgeups.pl
+--- nagiosplug/plugins-scripts/check_snmp_mgeups.pl     1970-01-01 01:00:00.000000000 +0100
++++ nagiosplug-check_snmp_mgeups/plugins-scripts/check_snmp_mgeups.pl   2005-09-21 13:51:12.000000000 +0200
+@@ -0,0 +1,271 @@
++#!/usr/bin/perl
++
++#-----------------------------------------------------------------
++#Copyright 2005 Ignacio Barrientos <chipi@criptonita.com>
++#
++#This perl script query an UM_LINK unit via SNMP and grab some
++#useful information applied to determine the status of the UPS 
++#to send it to Nagios.
++#
++#Thanks to Jos� Beites, who gave me access to a MGE COMET S31 UPS 
++#and UM-LINK unit.
++#
++#Thanks to check_snmp_apcups.pl
++#
++#This program is free software; you can redistribute it or modify
++#it under the terms of the GNU General Public License
++#-----------------------------------------------------------------
++
++# READ CAREFULLY BEFORE USE THIS SCRIPT:
++# 
++# Please execute the script before use it with Nagios to test
++# if the oid's are OK, a message will be printed if there are 
++# some problems with the oid's configuration.
++#
++# Thank you.
++
++
++use Net::SNMP;
++use Getopt::Std;
++
++$script_name = "check_snmp_mgeups";
++$script_version = "0.1";
++
++## CONNECTION STUFF ##
++$ipaddress = "";               # there is not default ip address, sorry
++$version = 1;                  # SNMP version, old UM_LINK hw works with version 1!!.
++$timeout = 2;                  # SNMP query timeout
++$defaultcommunity = "public";  # Default community string
++
++$warn_batt_level = 20;         # battery level (%) that set a WARNING status.
++$crit_batt_level = 10;         # battery level (%) that set a CRITICAL status.
++$warn_temp = 30;               # temperature (degrees) that set a WARNING status.
++$warn_overload = 70;           # output overload (%) that set WARNING status.
++
++##################################################
++##                                             ##
++##     DONT CHANGE NOTHING UNDER THIS LINE     ##
++##                                             ##
++##################################################
++
++## INTERESTING DEFINES ##
++my $OK = 0;
++my $WARNING = 1;
++my $CRITICAL = 2;
++
++## RETURN INFO VARIABLES ##
++$status = $OK;
++$returnstring = "";
++
++## OID LIST ##
++$oid_ups_model = ".1.3.6.1.4.1.705.1.1.1.0";
++
++$oid_internal_temp = ".1.3.6.1.4.1.705.1.5.7.0";                       # degrees
++
++$oid_battery_porcentage = ".1.3.6.1.4.1.705.1.5.2.0";
++$oid_battery_fault = ".1.3.6.1.4.1.705.1.5.9.0";                       # 1 yes, 2 no
++
++$oid_input_outage = ".1.3.6.1.4.1.705.1.6.4.0";                                # 1: ok, 2: voltage out tolerance, 3: freq out tolerance, 4: no voltage.
++
++$oid_output_overload = ".1.3.6.1.4.1.705.1.7.2.1.4.1";                 # %
++$oid_output_on_bypass = ".1.3.6.1.4.1.705.1.7.3.0";                     # 1: yes, 2: no
++
++## NOT USED ##
++# $oid_battery_voltage = ".1.3.6.1.4.1.705.1.5.5.0";                      # dV
++# $oid_input_voltage = ".1.3.6.1.4.1.705.1.6.2.1.2.1";                    # dV
++# $oid_output_voltage = ".1.3.6.1.4.1.705.1.7.2.1.2.1";                   # dV
++
++$oid_generic = $oid_ups_model;
++
++## PERSONALIZED DATA VARIABLES ##
++$temp = 0;
++
++$batt_level = 0;
++$batt_fault = 0;
++
++$in_outage = 0;
++
++$out_overload = 0;
++$out_bypass = 0;
++
++## FETCHING ARGS STUFF ##
++if (@ARGV < 1) {
++     print "\nERROR: Too few arguments\n";
++     usage();
++}
++
++getopts("h:H:C:w:c:");
++
++if ($opt_h)
++{
++       usage();
++       exit(0);
++}
++
++$ipaddress = $opt_H;
++
++if ($opt_C)
++{
++       $defaultcommunity = $opt_C;
++}
++
++## MAKING SNMP CONNECTION ##
++my ($s, $e) = Net::SNMP->session(
++     -community  =>  $defaultcommunity,
++     -hostname   =>  $ipaddress,
++     -version    =>  $version,
++     -timeout    =>  $timeout,
++);
++
++## TESTING SNMP CONNECTION WITH A GENERIC QUERY ##
++if (!defined($s->get_request($oid_generic)))
++{
++       $returnstring = "SNMP server not responding, host down?";
++       $status = $CRITICAL;
++}
++else
++{
++       ## DOING ALL WORK ##
++       main();
++}
++
++## CONNECTION TO /DEV/NULL ##
++$s->close();
++
++## STUDYING THE OUTPUT ##
++if ($status == $OK)
++{
++       $returnstring = "- No problems.";
++       print "Status is OK $returnstring\n";
++}
++elsif ($status == $WARNING)
++{
++       print "Status is a WARNING level $returnstring\n";
++}   
++elsif ($status == $CRITICAL)
++{
++       print "Status is CRITICAL $returnstring\n";
++}       
++
++## GOOD BYE ## 
++exit $status;
++
++##
++## getinfo: make a snmp query with OID (arg0) and put it in arg1.
++
++sub getinfo
++{
++       if(!defined($s->get_request(@_[0])))
++       {
++               print "OID ";
++               print @_[0];
++               print " not exists, and can't be checked, skipping\n";
++               $_[1] = undef;
++               return;
++       }
++
++       foreach ($s->var_bind_names()) {
++               $_[1] = $s->var_bind_list()->{$_};
++       }
++}
++
++##
++## main: all queries and sets
++
++sub main
++{
++
++       ## GETTING DATA ##
++
++       getinfo($oid_internal_temp,$temp);
++       getinfo($oid_battery_porcentage,$batt_level);
++       getinfo($oid_battery_fault,$batt_fault);
++       getinfo($oid_input_outage,$in_outage);
++       getinfo($oid_output_overload,$out_overload);
++       getinfo($oid_output_on_bypass,$out_bypass);
++       
++       ## STUDYING STATUS LEVEL LOOKING SOME ISSUES ##
++
++       ## THINGS CAN CHANGE STATUS TO: WARNING ##
++
++       if( defined($batt_level) && ($batt_level < $warn_batt_level) )
++       {
++               $status = $WARNING;
++               $returnstring = " - Battery level is under ";
++               $returnstring = "$returnstring$warn_batt_level";
++               $returnstring = "$returnstring%.";
++       }
++
++       if( defined($temp) && ($temp > $warn_temp) )
++       {
++               $status = $WARNING;
++               $returnstring = "$returnstring - Max temperature exceeded";
++       }
++
++       if( defined($out_overload) && ($out_overload > $warn_overload) )
++       {
++               $status = $WARNING;
++               $returnstring = "$returnstring - Output overloaded";
++       }
++
++       ## THINGS CAN CHANGE STATUS TO: CRITICAL ##
++
++       if( defined($batt_level) && ($batt_level < $crit_batt_level) )
++       {
++               $status = $CRITICAL;
++               $returnstring = " - Battery level is under ";
++               $returnstring = "$returnstring$crit_batt_level";
++               $returnstring = "$returnstring%.";
++       }
++
++       if( defined($batt_fault) && ($batt_fault eq 1) )
++       {
++               $status = $CRITICAL;
++               $returnstring = "$returnstring - Battery fail";
++       }
++
++       if( defined($in_outage) && (! $in_outage eq 1) )
++       {
++               $status = $CRITICAL;
++               $returnstring = "$returnstring - AC input fail";
++       }
++
++       if( defined($out_bypass) && ($out_bypass eq 1) )
++       {
++               $status = $CRITICAL;
++               $returnstring = "$returnstring - System in BY PASS mode";
++       }
++
++}
++
++##
++## usage: self explaining
++
++sub usage {
++    print << "USAGE";
++
++-----------------------------------------------------------------
++$script_name v$script_version
++
++Monitors MGE UPS via SNMP v1.
++
++Usage: $script_name -H <hostname> [-C <community>]
++
++Options: -H     Hostname or IP address
++         -C     Community (default is public)
++
++-----------------------------------------------------------------
++Copyright 2005 Ignacio Barrientos <chipi\@criptonita.com>
++
++Thanks to Jos� Beites, who gave me access to a MGE COMET S31 UPS 
++and UM-LINK unit.
++
++Thanks to check_snmp_apcups.pl
++
++This program is free software; you can redistribute it or modify
++it under the terms of the GNU General Public License
++-----------------------------------------------------------------
++
++USAGE
++     exit 1;
++}
+diff -Nru nagiosplug/plugins-scripts/Makefile.am nagiosplug-check_snmp_mgeups/plugins-scripts/Makefile.am
+--- nagiosplug/plugins-scripts/Makefile.am      2003-07-02 17:01:22.000000000 +0200
++++ nagiosplug-check_snmp_mgeups/plugins-scripts/Makefile.am    2005-09-21 13:56:57.000000000 +0200
+@@ -7,12 +7,12 @@
+ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
+        check_log check_ntp check_oracle check_rpc check_sensors check_wave \
+        check_ifstatus check_ifoperstatus check_mailq check_file_age \
+-       utils.sh utils.pm
++       check_snmp_mgeups utils.sh utils.pm
+ 
+ EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
+        check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
+        check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
+-       utils.sh.in utils.pm.in t
++       check_snmp_mgeups.pl utils.sh.in utils.pm.in t
+ 
+ TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)
+ 
+diff -Nru nagiosplug/THANKS.in nagiosplug-check_snmp_mgeups/THANKS.in
+--- nagiosplug/THANKS.in        2005-09-19 12:58:24.000000000 +0200
++++ nagiosplug-check_snmp_mgeups/THANKS.in      2005-09-21 13:55:43.000000000 +0200
+@@ -166,3 +166,4 @@
+ Sascha Runschke
+ Ronald Tin
+ Chester Hosey
++Ignacio Barrientos
diff --git a/web/attachments/151032-nagios-plugins-1.4.1-check_snmp_c_fix.patch b/web/attachments/151032-nagios-plugins-1.4.1-check_snmp_c_fix.patch
new file mode 100644
index 0000000..babe7fc
--- /dev/null
+++ b/web/attachments/151032-nagios-plugins-1.4.1-check_snmp_c_fix.patch
@@ -0,0 +1,18 @@
+--- plugins/check_snmp.c.orig   Sat Oct  1 13:45:45 2005
++++ plugins/check_snmp.c        Sat Oct  1 13:46:15 2005
+@@ -206,6 +206,7 @@
+        strcat(perfstr, "| ");
+        while (ptr) {
+                char *foo;
++               char *str[MAX_INPUT_BUFFER];
+ 
+                foo = strstr (ptr, delimiter);
+                strncat(perfstr, ptr, foo-ptr);
+@@ -338,7 +339,6 @@
+ 
+                i++;
+ 
+-               char *str[MAX_INPUT_BUFFER];
+                asprintf(str, "=%s%s;;;; ", show, type ? type : "");
+                strcat(perfstr, *str);
+ 
diff --git a/web/attachments/152023-check_http.patch b/web/attachments/152023-check_http.patch
new file mode 100644
index 0000000..fa0b5c6
--- /dev/null
+++ b/web/attachments/152023-check_http.patch
@@ -0,0 +1,100 @@
+*** check_http.c.orig   Mon Oct 10 21:00:43 2005

+--- check_http.c        Mon Oct 10 21:09:02 2005

+***************

+*** 107,112 ****

+--- 107,113 ----

+  double critical_time = 0;

+  int check_critical_time = FALSE;

+  char user_auth[MAX_INPUT_BUFFER] = "";

++ char proxy_auth[MAX_INPUT_BUFFER] = "";

+  int display_html = FALSE;

+  char *http_opt_headers;

+  int onredirect = STATE_OK;

+***************

+*** 220,225 ****

+--- 221,228 ----

+                {"certificate", required_argument, 0, 'C'},

+                {"useragent", required_argument, 0, 'A'},

+                {"header", required_argument, 0, 'k'},

++               {"authorization", required_argument, 0, 'a'},

++               {"proxy-authorization", required_argument, 0, 'b'},

+                {"no-body", no_argument, 0, 'N'},

+                {"max-age", required_argument, 0, 'M'},

+                {"content-type", required_argument, 0, 'T'},

+***************

+*** 246,252 ****

+        }

+  

+        while (1) {

+!               c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);

+                if (c == -1 || c == EOF)

+                        break;

+  

+--- 249,255 ----

+        }

+  

+        while (1) {

+!               c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:b:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);

+                if (c == -1 || c == EOF)

+                        break;

+  

+***************

+*** 355,360 ****

+--- 358,367 ----

+                        strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);

+                        user_auth[MAX_INPUT_BUFFER - 1] = 0;

+                        break;

++               case 'b': /* proxy-authorization info */

++                       strncpy (proxy_auth, optarg, MAX_INPUT_BUFFER - 1);

++                       proxy_auth[MAX_INPUT_BUFFER - 1] = 0;

++                       break;

+                case 'P': /* HTTP POST data in URL encoded format */

+                        if (http_method || http_post_data) break;

+                        http_method = strdup("POST");

+***************

+*** 835,840 ****

+--- 842,854 ----

+                asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);

+        }

+  

++       /* optionally send the proxy authentication info */

++       if (strlen(proxy_auth)) {

++               auth = base64 (proxy_auth, strlen (proxy_auth));

++               asprintf (&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth);

++       }

++ 

++ 

+        /* either send http POST data */

+        if (http_post_data) {

+                if (http_content_type) {

+***************

+*** 1508,1513 ****

+--- 1522,1529 ----

+        printf (_("\

+   -a, --authorization=AUTH_PAIR\n\

+     Username:password on sites with basic authentication\n\

++  -b, --proxy-authorization=AUTH_PAIR\n\

++    Username:password on proxy-servers with basic authentication\n\

+   -A, --useragent=STRING\n\

+     String to be sent in http header as \"User Agent\"\n\

+   -k, --header=STRING\n\

+***************

+*** 1565,1572 ****

+        printf ("\

+  Usage: %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n\

+                    [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\

+!                   [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\

+!                   [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\

+!                   [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] \n\

+                    [-M <age>] [-A string] [-k string]\n", progname);

+  }

+--- 1581,1589 ----

+        printf ("\

+  Usage: %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n\

+                    [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\

+!                   [-a auth] [-b auth] [-f <ok | warn | critcal | follow>] \n\

+!                 [-e <expect>] [-s string] [-l] \n\

+!                 [-r <regex> | -R <case-insensitive regex>] [-P string]\n\

+!                 [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] \n\

+                    [-M <age>] [-A string] [-k string]\n", progname);

+  }

diff --git a/web/attachments/152738-snmpwalk.tgz b/web/attachments/152738-snmpwalk.tgz
new file mode 100644
index 0000000..75057e8
--- /dev/null
+++ b/web/attachments/152738-snmpwalk.tgz
diff --git a/web/attachments/153117-check_pop3_message.pl b/web/attachments/153117-check_pop3_message.pl
new file mode 100644
index 0000000..ee93123
--- /dev/null
+++ b/web/attachments/153117-check_pop3_message.pl
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-2 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378822229" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378822229" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378822229" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378822229" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378822229');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1331909&group_id=29880&atid=397599&file_id=153117"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/153312-nagios-plugins-1.4-check_log.patch b/web/attachments/153312-nagios-plugins-1.4-check_log.patch
new file mode 100644
index 0000000..7c8f439
--- /dev/null
+++ b/web/attachments/153312-nagios-plugins-1.4-check_log.patch
@@ -0,0 +1,65 @@
+*** nagios-plugins-1.4/plugins-scripts/check_log.sh.orig        Thu Feb  3 23:51:35 2005
+--- nagios-plugins-1.4/plugins-scripts/check_log.sh     Fri Oct 21 10:34:23 2005
+***************
+*** 61,71 ****
+  PATH=""
+  
+  ECHO="/bin/echo"
+! GREP="/bin/grep"
+  DIFF="/bin/diff"
+  TAIL="/bin/tail"
+  CAT="/bin/cat"
+  RM="/bin/rm"
+  
+  PROGNAME=`/bin/basename $0`
+  PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+--- 61,73 ----
+  PATH=""
+  
+  ECHO="/bin/echo"
+! GREP="/bin/egrep"
+  DIFF="/bin/diff"
+  TAIL="/bin/tail"
+  CAT="/bin/cat"
+  RM="/bin/rm"
++ CHMOD="/bin/chmod"
++ TOUCH="/bin/touch"
+  
+  PROGNAME=`/bin/basename $0`
+  PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+***************
+*** 191,198 ****
+  else
+      tempdiff=`/bin/date '+%H%M%S'`
+      tempdiff="/tmp/check_log.${tempdiff}"
+!     /bin/touch $tempdiff
+!     chmod 600 $tempdiff
+  fi
+  
+  $DIFF $logfile $oldlog > $tempdiff
+--- 193,200 ----
+  else
+      tempdiff=`/bin/date '+%H%M%S'`
+      tempdiff="/tmp/check_log.${tempdiff}"
+!     $TOUCH $tempdiff
+!     $CHMOD 600 $tempdiff
+  fi
+  
+  $DIFF $logfile $oldlog > $tempdiff
+***************
+*** 201,207 ****
+  count=`$GREP -c "$query" $tempdiff`
+  
+  # Get the last matching entry in the diff file
+! lastentry=`$GREP "$query" $tempdiff | $TAIL --lines=1`
+  
+  $RM -f $tempdiff
+  $CAT $logfile > $oldlog
+--- 203,209 ----
+  count=`$GREP -c "$query" $tempdiff`
+  
+  # Get the last matching entry in the diff file
+! lastentry=`$GREP "$query" $tempdiff | $TAIL -1`
+  
+  $RM -f $tempdiff
+  $CAT $logfile > $oldlog
diff --git a/web/attachments/153825-check_linux_raid.diff b/web/attachments/153825-check_linux_raid.diff
new file mode 100644
index 0000000..35c3162
--- /dev/null
+++ b/web/attachments/153825-check_linux_raid.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824737" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824737" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824737" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824737" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824737');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1338298&group_id=29880&atid=397599&file_id=153825"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/154188-patch-plugins_Makefile_in b/web/attachments/154188-patch-plugins_Makefile_in
new file mode 100644
index 0000000..92b9b71
--- /dev/null
+++ b/web/attachments/154188-patch-plugins_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-plugins_Makefile_in,v 1.1 2005/10/28 17:44:12 sturm Exp $
+--- plugins/Makefile.in.orig    Fri Oct 28 18:58:58 2005
++++ plugins/Makefile.in Fri Oct 28 18:59:09 2005
+@@ -977,7 +977,7 @@ $(check_tcp_programs): check_tcp
+ install-exec-hook:
+        cd $(DESTDIR)$(libexecdir) && \
+        for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
+-       if [ -x check_ldaps ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
++       if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
+ 
+ clean-local:
+        rm -f $(check_tcp_programs)
diff --git a/web/attachments/154470-nagios_plugins-check_ssh.c.patch b/web/attachments/154470-nagios_plugins-check_ssh.c.patch
new file mode 100644
index 0000000..44c5fea
--- /dev/null
+++ b/web/attachments/154470-nagios_plugins-check_ssh.c.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378821080" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378821080" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378821080" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378821080" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378821080');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1343151&group_id=29880&atid=397599&file_id=154470"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/154471-nagios_plugins-check_dns.c.patch b/web/attachments/154471-nagios_plugins-check_dns.c.patch
new file mode 100644
index 0000000..f024078
--- /dev/null
+++ b/web/attachments/154471-nagios_plugins-check_dns.c.patch
@@ -0,0 +1,113 @@
+--- ../../original_sources/nagios-plugins-1.4.2/plugins/check_dns.c     2004-12-29 19:41:39.000000000 -0500
++++ nagios-plugins-1.4.2/plugins/check_dns.c    2005-10-19 22:54:35.000000000 -0400
+@@ -45,6 +45,8 @@
+ char expected_address[ADDRESS_LENGTH] = "";
+ int match_expected_address = FALSE;
+ int expect_authority = FALSE;
++double elapsed_warn_time = 0.0;
++double elapsed_crit_time = 0.0;
+ 
+ int
+ main (int argc, char **argv)
+@@ -193,6 +195,21 @@
+        microsec = deltime (tv);
+        elapsed_time = (double)microsec / 1.0e6;
+ 
++
++       /* check elapsed time */
++       if ((result == STATE_OK) && 
++           ((elapsed_warn_time != 0.0) && (elapsed_warn_time <= elapsed_time)) &&
++           ((elapsed_crit_time == 0.0) || elapsed_crit_time > elapsed_time) ) {
++                result = STATE_WARNING;
++               asprintf(&output, _("server %s responded too slowly. %.5f seconds response time."), dns_server, elapsed_time);
++       }
++
++       if ((result == STATE_OK) && (elapsed_crit_time != 0) &&
++              (elapsed_crit_time <= elapsed_time) ) {
++               result = STATE_CRITICAL;
++               asprintf(&output, _("server %s responded too slowly. %.5f seconds response time."), dns_server, elapsed_time);
++       }
++
+        if (result == STATE_OK) {
+                if (strchr (address, ',') == NULL)
+                        multi_address = FALSE;
+@@ -200,7 +217,7 @@
+                        multi_address = TRUE;
+ 
+                printf ("DNS %s: ", _("OK"));
+-               printf (ngettext("%.3f second response time ", "%.3f seconds response time ", elapsed_time), elapsed_time);
++               printf (ngettext("%.5f second response time ", "%.5f seconds response time ", elapsed_time), elapsed_time);
+                printf (_("%s returns %s"), query_address, address);
+                printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+        }
+@@ -294,6 +311,8 @@
+                {"reverse-server", required_argument, 0, 'r'},
+                {"expected-address", required_argument, 0, 'a'},
+                {"expect-authority", no_argument, 0, 'A'},
++               {"warning", required_argument, 0, 'w'},
++               {"critical", required_argument, 0, 'c'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -305,7 +324,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVvAt:H:s:r:a:", long_opts, &opt_index);
++               c = getopt_long (argc, argv, "hVvAt:H:s:r:a:w:c:", long_opts, &opt_index);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -358,6 +377,12 @@
+                case 'A': /* expect authority */
+                        expect_authority = TRUE;
+                        break;
++               case 'w': /* elapsed time > warning */
++                       elapsed_warn_time = atof (optarg);
++                       break;
++               case 'c': /* elapsed time > critical */
++                       elapsed_crit_time = atof (optarg);
++                       break;
+                }
+        }
+ 
+@@ -387,11 +412,13 @@
+ validate_arguments ()
+ {
+        if (query_address[0] == 0)
+-               return ERROR;
+-       else
+-               return OK;
+-}
++         usage4 (_("Can't determine/parse address to query."));
++
++       if ( elapsed_crit_time != 0.0 && elapsed_warn_time > elapsed_crit_time )
++               usage4 (_("Warning time must be less than critical time."));
+ 
++       return OK;
++}
+ 
+ void
+ print_help (void)
+@@ -419,7 +446,13 @@
+ -a, --expected-address=IP-ADDRESS\n\
+    Optional IP address you expect the DNS server to return\n\
+ -A, --expect-authority\n\
+-   Optionally expect the DNS server to be authoritative for the lookup\n"));
++   Optionally expect the DNS server to be authoritative for the lookup\n\
++-w, --warning=seconds\n\
++   Return warning if elapsed time exceeds value. Default is 0.0 seconds (off).\n\
++-c, --critical=seconds\n\
++   Return critical if elapsed time exceeds value. Default is 0.0 seconds (off).\n\
++\n\
++seconds are floating point values. Set to 0 turn off check.\n"));
+ 
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ 
+@@ -431,5 +464,5 @@
+ print_usage (void)
+ {
+        printf ("\
+-Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout]\n", progname);
++Usage: %s -H host [-s server] [-a expected-address] [-A] [-t timeout] [-w warn] [-c crit]\n", progname);
+ }
diff --git a/web/attachments/154472-nagios_plugins-check_test.patch b/web/attachments/154472-nagios_plugins-check_test.patch
new file mode 100644
index 0000000..832c6a0
--- /dev/null
+++ b/web/attachments/154472-nagios_plugins-check_test.patch
@@ -0,0 +1,172 @@
+--- ../../original_sources/nagios-plugins-1.4.2/contrib/check_test      2005-10-11 20:24:13.349222200 -0400
++++ nagios-plugins-1.4.2/contrib/check_test     2005-10-11 20:22:49.205014064 -0400
+@@ -0,0 +1,169 @@
++#! /bin/bash
++
++# Author: John P. Rouillard - rouilj@cs.umb.edu,
++#                             rouilj-check_test@renesys.com
++# A quick and dirty test program similar to check_dummy, but exit
++# status is contollable from an external file. It can be used for
++# testing nagios service dependency and host dependency notification
++# suppression.
++#
++# Entries in the external file are composed of a label and an exit
++# code, or code list seperated by an = sign.
++#
++# The exit code list is any 1, 2 or 3 digit number which will exit
++# with that status (0, 1, 2 and 3 are valid for nagios). The code 'S'
++# or 's' will cause the process to sleep for 1 hour in the expectation
++# that it will recieve a kill signal from nagios.
++#
++#  The label has one of the following forms:
++#
++#       hostname-service_name (if -H specified)
++#       service_name  (if -E is not specified)
++#       hostname (if -H specified)
++#       default
++#
++# The labels are searched for in order. If no matching label is found,
++# one is appended to the command file, with exit status 0. If duplicate 
++# labels are in the file, the last label takes precidence. So you can
++# append a label/exit code line to the file and get a change in the
++# exit code.
++
++# Exit code lists look like:
++#
++#   label=value1,value2,value3,value4,...,valueN
++#
++# where value1 is used for this invocation, and a new label entry is
++# added with value1 put after valueN so that value2 wil be used as
++# exit code on the next run. This allows deterministic runs of the
++# program for testing availability metrics and various senarios for
++# reporting and other related activities.
++#
++# Note that regular poll and error poll times along with the number of
++# retries to go from soft to hard have to be considered when designing
++# a test.
++#
++# Options:
++help="Usage: $0 -E -s <svc> -H <host> -e <exitcode> -f <file> -ht -m <msg>
++ -E - exact entry including hostname is needed. Prevents matching
++      only on service_ name.
++ -H <hostname> - the hostname this test is running on. No default.
++ -e <exit code> - used like check dummy, always exits with this
++                  status code. Ignores the external file.
++ -f <filename> - the external file name used for determining exit
++                 code. Default: /tmp/check_test.
++ -h - This help text.
++ -s <service_name> - the service description for this test. Default
++                the basename of the progam name.
++ -t - enable tracing info for debugging. Note this will cause
++      problems is run from nagios.
++ -m - message to be put out when running.
++"
++
++## standard debugging preamble
++trace=true
++if ! [ -z "$SHELL_DEBUG" ]; then
++    if  echo "$SHELL_DEBUG" | grep -i xv > /dev/null 2>&1; then
++       set -xv
++    fi
++    if echo "$SHELL_DEBUG" | grep -i trace > /dev/null 2>&1; then
++       trace=echo
++    fi
++fi
++
++## set variables
++exact=""
++exitcode=-1
++filename=/tmp/check_test
++hostname=""
++message=""
++service_name=`basename $0`
++
++
++## parse arguments
++while getopts -- EH:e:f:hs:t arg
++do
++  case "$arg" in
++     E) exact="yes";;
++     H) hostname="$OPTARG";;
++     e) exitcode="$OPTARG";;
++     f) filename="$OPTARG";;
++     h) echo "$help"; exit;;
++     m) message="$OPTARG";;
++     s) service_name="$OPTARG";;
++     t) trace=echo;;
++     *) echo "Usage: $0 -E -s <svc> -H <host> -e <exitcode> -f <file>"
++         exit 4;;
++  esac
++done
++
++$trace "parsed arguments: $hostname, $service_name, $exitcode, $filename"
++
++## create command file if needed
++if ! [ -r $filename ]; then
++  $trace Did not find readable file. Creating config file $filename
++  # hmm how to capture. Wrapping with `` and assigning to variable
++  # produces syntax error missing close ` in cygwin bash, but it works
++  # interactively.
++  touch $filename 2>&1 || \
++      eval "echo \"$0: Unable to create $filename, $error\" && exit 2"
++fi
++
++## find the exit code entry for this invocation
++if [ $exitcode = "-1" ]; then
++    rule=`grep "^$hostname-$service_name=" $filename | tail -1`
++    if [ -z "$rule" ]; then
++       if [ -z "$exact" ]; then
++           rule=`grep "^$service_name=" $filename | tail -1`
++       fi
++       if [ -z "$rule" ]; then
++           if [ -n "$hostname" ]; then 
++               rule=`grep "^$hostname=" $filename | tail -1`
++           fi
++           if [ -z "$rule" ]; then
++               rule=`grep "^default=" $filename | tail -1`
++               if [ -z "$rule" ]; then
++                   $trace no matching rule found, creating new rule
++                   rule="${hostname}${hostname:+-}${service_name}=0"
++                   echo $rule >> $filename
++               fi
++           fi
++       fi
++    fi
++    $trace rule is $rule
++
++    ## split the rule to isolate the exit code(s). 
++    IFS="="
++    set -- $rule
++    IFS=""
++
++    if [ $# -gt 2 ]; then
++           echo "$0: Malformed rule $rule:"
++           exit 2
++    fi
++
++    exitcode="$2"
++    label=$1
++fi
++
++## exit with message and proper code and rotate exit code list if present
++while true; do
++    case $exitcode in
++       0) echo $0: $message exiting 0; exit 0;;
++       1) echo $0: $message exiting 1; exit 1;;
++       2) echo $0: $message exiting 2; exit 2;;
++       [0-9]|[0-9][0-9]|[0-9][0-9][0-9]) 
++          # exit with odd exit codes
++          echo $0: $message exiting $exitcode; exit $exitcode;;
++       s|S) sleep 3600 ;; # stall forcing parent nagios to kill us
++       *,*) IFS=","
++            set -- $exitcode
++            exitcode=$1
++            shift
++            exitcodes="$*,$exitcode"
++            echo "$label=$exitcodes" >> $filename
++            # not checking for bad/missing exit code here. main
++            # loop will do that.
++            ;;
++       *) echo "$0: Unrecognised status code $rule"; exit 2;;
++       esac
++done
diff --git a/web/attachments/154473-nagios_plugins-nagios_shell.patch b/web/attachments/154473-nagios_plugins-nagios_shell.patch
new file mode 100644
index 0000000..64e7d5f
--- /dev/null
+++ b/web/attachments/154473-nagios_plugins-nagios_shell.patch
@@ -0,0 +1,168 @@
+--- ../../original_sources/nagios-plugins-1.4.2/contrib/nagios_shell    2005-10-11 20:27:28.411568216 -0400
++++ nagios-plugins-1.4.2/contrib/nagios_shell   2005-10-11 20:28:54.933414896 -0400
+@@ -0,0 +1,165 @@
++#! /usr/bin/perl -T
++
++# changable variables
++# set $NAGIOS_PLUGIN_DIR to the directory that contains the nagios plugins.
++# Don't include a trailing '/'.
++my($NAGIOS_PLUGIN_DIR)="PLUGIN_DIR_HERE";
++
++# Other commands that can be run via this shell. It is strongly
++# recommended that all of these are specified with a full path name.
++my(@other_commands) = (
++);
++
++# set the PATH needed for the commands run under this shell.
++$ENV{'PATH'} = "/bin:/usr/bin:/usr/sbin";
++
++#Name: nagiosshell
++#Use: used as forced command under ssh as receiver for check_by_ssh plugin
++#Function: Check provided command and runs it from predefined directory
++#          or fully specified path.
++# Example: in ~nagios/.ssh/authorized_keys on system to be monitoed using
++#          check_by_ssh:
++#
++# command="/path/to/nagiosshell" from="nagios.example.org" ssh-rsa AAAAB3N...
++#
++# This has not been tested with the multiple passive mode of check_by_ssh.
++
++use warnings;
++use strict;
++
++my($command, $exec_command, @args, @exec_args, $i);
++
++die("$0: Not running as forced command, \$SSH_ORIGINAL_COMMAND not found.\n")
++    if (not exists($ENV{"SSH_ORIGINAL_COMMAND"}));
++
++($command, @args) = split(' ', $ENV{"SSH_ORIGINAL_COMMAND"});
++if ($command !~ m#/#) {
++    # then its a command name and not a full path
++    if (! -x "$NAGIOS_PLUGIN_DIR/$command") {
++       print "$0: Unable to find command $NAGIOS_PLUGIN_DIR/$command.\n";
++       exit 3;
++    } else {
++       # create the fully qualified name
++       ($exec_command) = ($command =~ m/^([A-z0-9_.-]+)$/);
++       $exec_command = "$NAGIOS_PLUGIN_DIR/$exec_command";
++    }
++} else {
++    # we have a qualified command path, verify it
++    foreach $i (@other_commands) {
++       $exec_command = $i if ($i eq $command);
++    }
++}
++
++if (! $exec_command) {
++    print "$0: Unable to validate $command\n";
++    exit 3;
++}
++
++# set up a clean environment
++# PATH is explicitly set at top of script in modifyable variables.
++delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV', 'PERLLIB'};
++
++# clean the args
++foreach (@args) {
++    if ( m/^([^`;()]*)$/ ) {
++       push(@exec_args, $1);
++    } else {
++       die ("$0: Unsafe argument $_ found. Exiting.\n");
++    }
++}
++
++# run the requested command without executing a shell.
++if (@exec_args) {
++  eval {no warnings 'all'; exec $exec_command $exec_command, @exec_args};
++} else {
++  eval {no warnings 'all'; exec $exec_command $exec_command};
++}
++
++use warnings;
++
++die("$0: Unable to exec ($!) $exec_command with args: \"" . join('", "', @exec_args) . "\".\n");
++
++#TESTPREP:
++# mkdir $NAGIOS_PLUGIN_DIR
++# echo '#! /usr/bin/foo' > $NAGIOS_PLUGIN_BIN/check_foo
++# echo '#! /bin/sh' > $NAGIOS_PLUGIN_BIN/check_bar
++# echo 'ls "$@"' >> $NAGIOS_PLUGIN_BIN/check_bar
++# chmod +x $NAGIOS_PLUGIN_BIN/check_bar $NAGIOS_PLUGIN_BIN/check_foo
++
++#TEST:
++#- plugin unable to exec good args
++# SSH_ORIGINAL_COMMAND='check_foo -w 3:5 -c 2,4,3 -d 12-34' ./nagios_shell
++##Unable to exec (No such file or directory) /tmp/nagiosplug/check_foo 
++##   with args: "-w", "3:5", "-c", "2,4,3", "-d", "12-34".
++
++#- plugin unable to exec bad args
++# SSH_ORIGINAL_COMMAND='check_foo -w 3`5 -c 2,4,3 -d 12-34' ./nagios_shell
++##./nagios_shell: Unsafe argument 3`5 found. Exiting.
++
++#- plugin unable to exec no args
++# SSH_ORIGINAL_COMMAND='check_foo' ./nagios_shell
++##./nagios_shell: Unable to exec (No such file or directory) 
++##   /tmp/nagiosplug/check_foo with args: "".
++
++#- plugin able to exec good args
++# SSH_ORIGINAL_COMMAND='check_bar -w 3:5 -c 2,4,3 -d 12-34' ./nagios_shell
++##ls: 2,4,3: No such file or directory
++##ls: 12-34: No such file or directory
++
++#- plugin able to exec bad args
++#  SSH_ORIGINAL_COMMAND='check_bar -w 35 -c 2,4,3 -d (12-34)' ./nagios_shell
++##./nagios_shell: Unsafe argument (12-34) found. Exiting.
++
++#- plugin able to exec no args
++# SSH_ORIGINAL_COMMAND='check_bar' ./nagios_shell
++## list of files in directory
++
++#- non existant plugin no args
++# SSH_ORIGINAL_COMMAND='check_zap' ./nagios_shell
++##./nagios_shell: Unable to find command /tmp/nagiosplug/check_zap.
++
++#- non existant plugin bad args
++# SSH_ORIGINAL_COMMAND='check_zap (foo' ./nagios_shell
++##./nagios_shell: Unable to find command /tmp/nagiosplug/check_zap.
++
++#- non existant plugin good args
++# SSH_ORIGINAL_COMMAND='check_zap foo' ./nagios_shell
++##./nagios_shell: Unable to find command /tmp/nagiosplug/check_zap.
++
++#- explicit command unable to exec (non-existent) good args
++# SSH_ORIGINAL_COMMAND='/usr/bin/nc1 -l /tmp' ./nagios_shell
++##Unable to exec (No such file or directory) /usr/bin/nc1 with args:
++##    "-l", "/tmp".
++
++#- explicit command unable to exec (non-existent) bad args
++# SSH_ORIGINAL_COMMAND='/usr/bin/nc1 -l (/tmp)' ./nagios_shell
++##Unsafe argument (/tmp) found. Exiting.
++
++#- explicit command unable to exec (non-existent) no args
++# SSH_ORIGINAL_COMMAND='/usr/bin/nc1' ./nagios_shell
++##./nagios_shell: Unable to exec (No such file or directory) 
++##     /usr/bin/nc1 with args: "".
++
++#- explicit command able to exec good args
++# SSH_ORIGINAL_COMMAND='/usr/bin/ls -l /dev/null' ./nagios_shell
++##crw-rw-rw-  1 rouilj None 1, 3 Sep 24 23:19 /dev/null
++
++#- explicit command able to exec bad args
++# SSH_ORIGINAL_COMMAND='/usr/bin/ls -l `/dev/null`' ./nagios_shell
++##./nagios_shell: Unsafe argument `/dev/null` found. Exiting.
++
++#- explicit command able to exec no args
++# SSH_ORIGINAL_COMMAND='/usr/bin/ls ' ./nagios_shell
++##list of files in directory
++
++#- explicit command not found in list
++# SSH_ORIGINAL_COMMAND='/usr/bin/nc3' ./nagios_shell
++##./nagios_shell: Unable to validate /usr/bin/nc3
++
++#- explicit command not found in list bad args
++# SSH_ORIGINAL_COMMAND='/usr/bin/nc3 (foo' ./nagios_shell
++##./nagios_shell: Unable to validate /usr/bin/nc3
++
++#- explicit command not found in list good args
++# SSH_ORIGINAL_COMMAND='/usr/bin/nc3 foo' ./nagios_shell
++##./nagios_shell: Unable to validate /usr/bin/nc3
diff --git a/web/attachments/154512-check_linux_raid.pl b/web/attachments/154512-check_linux_raid.pl
new file mode 100644
index 0000000..a7a948a
--- /dev/null
+++ b/web/attachments/154512-check_linux_raid.pl
@@ -0,0 +1,111 @@
+#!/usr/bin/perl -w
+
+# Copyright (c) 2002 ISOMEDIA, Inc.
+# Written by Steve Milton
+# Released under the GNU Public License
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Usage:   check_raid <raid-name>
+# Example: check_raid md0
+#          WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
+
+use strict;
+use Getopt::Long qw(:config no_ignore_case);
+
+my %ERRORS=('DEPENDENT'=>4,'UNKNOWN'=>3,'OK'=>0,'WARNING'=>1,'CRITICAL'=>2);
+
+my $mdstat = "/proc/mdstat";
+my $verbose = 0;
+
+GetOptions('mdstat=s' => \$mdstat,
+           'v|verbose+' => \$verbose,
+           'h|help' => sub { usage();  exit $ERRORS{'UNKNOWN'}; },
+           'V|version' => sub { version();  exit $ERRORS{'UNKNOWN'}; });
+
+# die with an error if we're not on Linux
+if ($^O ne 'linux') {
+    print "This plugin only applicable on Linux.\n";
+    exit $ERRORS{'UNKNOWN'};
+}
+
+my $mddev = shift;
+
+open (MDSTAT, "<$mdstat") or die "Failed to open $mdstat";
+my $found = 0;
+my $status = "";
+my $recovery = "";
+my $finish = "";
+my $speed = "";
+my $active = "";
+while(<MDSTAT>) {
+    chomp;
+    if ($found) {
+        if (/(\[[_U]+\])/) {
+            $status = $1;
+        } elsif (/recovery *= *([^ ]+)/) {
+            $recovery = $1;
+            ($finish) = /finish= *([^ ]+)/;
+            ($speed) = /speed= *([^ ]+)/;
+        } elsif (/^[^ \t]/) {
+            last;
+        }
+    } else {
+        if (/^$mddev\s*:/) {
+            $found = 1;
+            if (/active/) {
+                $active = 1;
+            }
+        }
+    }
+}
+
+my $msg = "FAILURE";
+my $code = "UNKNOWN";
+if ($status =~ /_/) {
+    if ($recovery) {
+        $msg = "$mddev status=$status, recovery=$recovery, finish=$finish, speed=$speed",
+        $code = "WARNING";
+    } else {
+        $msg = "$mddev status=$status";
+        $code = "CRITICAL";
+    }
+} elsif ($status =~ /U+/) {
+    $msg = "$mddev status=$status";
+    $code = "OK";
+} else {
+    if ($active) {
+        $msg = "$mddev active with no status information";
+        $code = "OK";
+    } else {
+        $msg = "$mddev does not exist";
+        $code = "CRITICAL";
+    }
+}
+
+print "RAID $code: $msg\n";
+exit ($ERRORS{$code});
+
+sub usage {
+    print qq{usage:
+    check_linux_raid.pl [--mdstat=</proc/mdstat>] <md-device>
+e.g.
+    check_linux_raid.pl md0
+};
+}
+
+sub version {
+    print "check_linux_raid.pl 1.1\n";
+}
diff --git a/web/attachments/154515-nagios_plugins-check_ssh.c.patch b/web/attachments/154515-nagios_plugins-check_ssh.c.patch
new file mode 100644
index 0000000..da31ea2
--- /dev/null
+++ b/web/attachments/154515-nagios_plugins-check_ssh.c.patch
@@ -0,0 +1,98 @@
+--- ../../original_sources/nagios-plugins-1.4.2/plugins/check_ssh.c     2005-04-11 14:02:40.000000000 -0400
++++ nagios-plugins-1.4.2/plugins/check_ssh.c    2005-10-31 09:04:34.000000000 -0500
+@@ -36,7 +36,8 @@
+ 
+ int port = -1;
+ char *server_name = NULL;
+-char *remote_version = NULL;
++int remote_versions = 0;
++char **remote_version;
+ int verbose = FALSE;
+ 
+ int process_arguments (int, char **);
+@@ -44,7 +45,7 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-int ssh_connect (char *haddr, int hport, char *remote_version);
++int ssh_connect (char *haddr, int hport, char **remote_version);
+ 
+ 
+ 
+@@ -136,9 +137,13 @@
+                        usage4 (_("IPv6 support not available"));
+ #endif
+                        break;
+-               case 'r':                                                                       /* remote version */
+-                       remote_version = optarg;
+-                       break;
++               case 'r':                                                                       /* remote version multiple occurances allowed */
++                 if (verbose) printf("pre-parsing %s-%d\n",optarg, remote_versions);
++                 remote_version = realloc(remote_version, (++remote_versions) * sizeof(char *));
++                 if (verbose) printf("post-parsing %s\n",optarg);
++                 
++                 remote_version[remote_versions - 1] = optarg;
++                 break;
+                case 'H':                                                                       /* host */
+                        if (is_host (optarg) == FALSE)
+                                usage2 (_("Invalid hostname/address"), optarg);
+@@ -193,7 +198,7 @@
+ 
+ 
+ int
+-ssh_connect (char *haddr, int hport, char *remote_version)
++ssh_connect (char *haddr, int hport, char **remote_version)
+ {
+        int sd;
+        int result;
+@@ -202,6 +207,7 @@
+        char *ssh_proto = NULL;
+        char *ssh_server = NULL;
+        char rev_no[20];
++       int remote_versions_i;
+ 
+        sscanf ("$Revision: 1.27 $", "$Revision: %[0123456789.]", rev_no);
+ 
+@@ -230,11 +236,26 @@
+                if (verbose)
+                        printf ("%s\n", buffer);
+ 
+-               if (remote_version && strcmp(remote_version, ssh_server)) {
+-                       printf
+-                               (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
+-                                ssh_server, ssh_proto, remote_version);
+-                       exit (STATE_WARNING);
++               if ( remote_versions ) {
++                 remote_versions_i = remote_versions;
++                 while ( remote_versions_i > 0) {
++                   if (verbose) printf("Comparing server '%s' to -r opt '%s'\n", ssh_server, remote_version[remote_versions_i -1]);
++                   if ( ! strcmp(remote_version[remote_versions_i - 1], ssh_server)) {
++                     break;
++                   } else {
++                     remote_versions_i--;
++                   }
++                 }
++                 if (remote_versions_i == 0) {
++                   printf
++                     (_("SSH WARNING - '%s' (protocol %s) version mismatch, expected "),
++                      ssh_server, ssh_proto);
++                   while (remote_versions > 0) {
++                     printf("'%s'%s", remote_version[remote_versions -1], remote_versions == 1?".\n":", ");
++                     remote_versions --;
++                   }
++                   exit (STATE_WARNING);
++                 }
+                }
+                
+                printf
+@@ -272,7 +293,9 @@
+ 
+        printf (_("\
+  -r, --remote-version=STRING\n\
+-    Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)\n"));
++    Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1).\n"));
++       printf (_("\
++    Can use multiple times to accept multiple version strings.\n"));
+        
+        printf (_(UT_VERBOSE));
+ 
diff --git a/web/attachments/154773-nagios_plugins-check_tcp.c.patch b/web/attachments/154773-nagios_plugins-check_tcp.c.patch
new file mode 100644
index 0000000..3d547df
--- /dev/null
+++ b/web/attachments/154773-nagios_plugins-check_tcp.c.patch
@@ -0,0 +1,88 @@
+--- ../../original_sources/nagios-plugins-1.4.2/plugins/check_tcp.c     2005-06-05 13:43:58.000000000 -0400
++++ nagios-plugins-1.4.2/plugins/check_tcp.c    2005-11-02 10:21:56.000000000 -0500
+@@ -78,6 +78,8 @@
+ static char *server_address = NULL;
+ static char *server_send = NULL;
+ static char *server_quit = NULL;
++static char *lineend = "";
++static char *lineendquit = "\r\n";
+ static char **server_expect;
+ static size_t server_expect_count = 0;
+ static size_t maxbytes = 0;
+@@ -404,6 +406,7 @@
+                {"timeout", required_argument, 0, 't'},
+                {"protocol", required_argument, 0, 'P'},
+                {"port", required_argument, 0, 'p'},
++               {"lineend", required_argument, 0, 'l'},
+                {"send", required_argument, 0, 's'},
+                {"expect", required_argument, 0, 'e'},
+                {"maxbytes", required_argument, 0, 'm'},
+@@ -445,7 +448,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
++               c = getopt_long (argc, argv, "+hVv46H:l:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
+                                 longopts, &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+@@ -515,8 +518,30 @@
+                        else
+                                server_port = atoi (optarg);
+                        break;
++               case 'l':
++                       switch (*optarg) {
++                             case 'n':
++                                      lineend = "\n";
++                                      lineendquit = lineend;
++                                      break;
++                              case 'r':
++                                      lineend = "\r";
++                                      lineendquit = lineend;
++                                      break;
++                              case 'b':
++                                      lineend = "\r\n";
++                                      lineendquit = lineend;
++                                      break;
++                              case 'e':
++                                      lineend = "";
++
++                                      break;
++                              default:
++                                     usage4 (_("Unrecognized option to -l not r, n, b or e."));
++                        }
++                       break;
+                case 's':
+-                       server_send = optarg;
++                       asprintf(&server_send, "%s%s", optarg, lineend);
+                        break;
+                case 'e': /* expect string (may be repeated) */
+                        EXPECT = NULL;
+@@ -533,7 +558,7 @@
+                        else
+                                maxbytes = strtol (optarg, NULL, 0);
+                case 'q':
+-                       asprintf(&server_quit, "%s\r\n", optarg);
++                       asprintf(&server_quit, "%s%s", optarg, lineendquit);
+                        break;
+                case 'r':
+                        if (!strncmp(optarg,"ok",2))
+@@ -738,6 +763,10 @@
+        printf (_(UT_IPv46));
+ 
+        printf (_("\
++ -l, --lineend=b|e|n|r\n\
++    Ending on -s nd -q strings. b - both: <cr><lf> style, e - empty no\n\
++    end, n - newline: newline end, r - return: carriage return end\n\
++    Default is \"-l e -s <send> -l b -q <quit>\".\n\
+  -s, --send=STRING\n\
+     String to send to the server\n\
+  -e, --expect=STRING\n\
+@@ -783,6 +812,6 @@
+                   [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+                   [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+                   [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
+-                  [-D <days to cert expiry>] [-S <use SSL>]\n", progname);
++                  [-D <days to cert expiry>] [-S <use SSL>] [-l <n|r|b|e>]\n", progname);
+ }
+ 
diff --git a/web/attachments/156009-check_email_loop.diff b/web/attachments/156009-check_email_loop.diff
new file mode 100644
index 0000000..01901f4
--- /dev/null
+++ b/web/attachments/156009-check_email_loop.diff
@@ -0,0 +1,16 @@
+Index: check_email_loop.pl
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/contrib/check_email_loop.pl,v
+retrieving revision 1.3
+diff -r1.3 check_email_loop.pl
+1c1
+< #!/usr/bin/perl 
+---
+> #!/usr/bin/perl -w
+51a52,53
+> $debug = 0;
+> 
+115c117
+< %other_smtp_opts={};
+---
+> %other_smtp_opts=();
diff --git a/web/attachments/156702-nagios.configure.patch b/web/attachments/156702-nagios.configure.patch
new file mode 100644
index 0000000..554cd7a
--- /dev/null
+++ b/web/attachments/156702-nagios.configure.patch
@@ -0,0 +1,66 @@
+--- nagios-plugins-1.4.2/configure.in   2005-09-19 23:51:19.000000000 +1000
++++ nagios-plugins-1.4.2.new/configure.in       2005-11-17 15:36:08.000000000 +1100
+@@ -227,45 +227,27 @@
+ dnl Check for mysql libraries
+ _SAVEDLIBS="$LIBS"
+ _SAVEDCPPFLAGS="$CPPFLAGS"
+-AC_ARG_WITH(mysql,
+-       ACX_HELP_STRING([--with-mysql=DIR],
+-               [sets path to mysql installation (assumes lib/mysql and include subdirs]),
+-       MYSQL=$withval,)
+-if test -n "$MYSQL"; then
+-  MYSQLLIBDIR=$MYSQL/lib/mysql
+-  CPPFLAGS="-I$MYSQL/include"
+-  AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz)
+-  AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient")
+-elif test -f /usr/lib/libmysqlclient.so; then
+-  AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
+-  AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient")
+-elif test -f /usr/lib/libmysqlclient.a; then
+-  AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
+-  AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient")
+-elif test -f /usr/lib/mysql/libmysqlclient.so; then
+-  AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz)
+-  AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql)
+-elif test -f /usr/lib/mysql/libmysqlclient.a; then
+-  AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz)
+-  AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql)
+-fi
+-if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
+-  AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" )
+-  if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
+-    EXTRAS="$EXTRAS check_mysql"
+-    AC_SUBST(MYSQLINCLUDE)
+-    AC_SUBST(MYSQLLIBS)
+-    AC_SUBST(check_mysql_LDFLAGS)
+-  else
++
++AC_PATH_PROG(MYSQLCONFIG,mysql_config)
++
++if test -z "$MYSQLCONFIG"; then
+     AC_MSG_WARN([Skipping mysql plugin])
+     AC_MSG_WARN([install mysql client headers to compile this plugin (see REQUIREMENTS).])
+-  fi
+-else
+-  AC_MSG_WARN([Skipping mysql plugin])
+-  AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
++else   
++       MYSQLINCLUDE=`$MYSQLCONFIG --include`
++       MYSQLCFLAGS=`$MYSQLCONFIG --cflags`
++       MYSQLLIBS=`$MYSQLCONFIG --libs`
++       check_mysql_LDFLAGS="$MYSQLLIBS"
++       EXTRAS="$EXTRAS check_mysql"
++    
++       AC_SUBST(MYSQLINCLUDE)
++       AC_SUBST(MYSQLLIBS)
++       AC_SUBST(MYSQLCFLAGS)
++       AC_SUBST(check_mysql_LDFLAGS)
+ fi
+-CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
+-LIBS="$_SAVEDLIBS"
++
++CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLCFLAGS"
++LIBS="$_SAVEDLIBS"
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ 
diff --git a/web/attachments/156798-check_dhcp--standardize.diff b/web/attachments/156798-check_dhcp--standardize.diff
new file mode 100644
index 0000000..00cfc4c
--- /dev/null
+++ b/web/attachments/156798-check_dhcp--standardize.diff
@@ -0,0 +1,51 @@
+--- check_dhcp.c.orig   2005-11-18 13:47:21.000000000 -0500
++++ check_dhcp.c        2005-11-18 13:55:21.000000000 -0500
+@@ -27,8 +27,8 @@
+ *****************************************************************************/
+ 
+ const char *progname = "check_dhcp";
+-const char *revision = "$Revision: 1.7 $";
+-const char *copyright = "2001-2004";
++const char *revision = "$Revision: 1.8 $";
++const char *copyright = "2001-2005";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+@@ -106,11 +106,6 @@
+ 
+ /**** Common definitions ****/
+ 
+-#define STATE_OK          0
+-#define STATE_WARNING     1
+-#define STATE_CRITICAL    2
+-#define STATE_UNKNOWN     -1
+-
+ #define OK                0
+ #define ERROR             -1
+ 
+@@ -241,7 +236,7 @@
+ 
+ int main(int argc, char **argv){
+        int dhcp_socket;
+-       int result;
++       int result = STATE_UNKNOWN;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -921,8 +916,14 @@
+        else if(request_specific_address==TRUE && received_requested_address==FALSE)
+                result=STATE_WARNING;
+ 
+-
+-       printf("DHCP %s: ",(result==STATE_OK)?"ok":"problem");
++    if(result==0)               /* garrett honeycutt 2005 */
++        printf("OK: ");
++    else if(result==1)
++        printf("WARNING: ");
++    else if(result==2)
++        printf("CRITICAL: ");
++    else if(result==3)
++        printf("UNKNOWN: ");
+ 
+        /* we didn't receive any DHCPOFFERs */
+        if(dhcp_offer_list==NULL){
diff --git a/web/attachments/158101-check_disk_smb.pl.PATCH b/web/attachments/158101-check_disk_smb.pl.PATCH
new file mode 100644
index 0000000..193932e
--- /dev/null
+++ b/web/attachments/158101-check_disk_smb.pl.PATCH
@@ -0,0 +1,148 @@
+--- check_disk_smb.pl.ORIG      Sun Apr 17 22:22:41 2005
++++ check_disk_smb.pl   Mon Nov 28 20:11:19 2005
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ #
+ #
+-# check_disk.pl <host> <share> <user> <pass> [warn] [critical] [port]
++# check_disk.pl <ip> <host> <share> <user> <pass> [warn] [critical] [port]
+ #
+ # Nagios host script to get the disk usage from a SMB share
+ #
+@@ -15,6 +15,10 @@
+ #  allow setting of limits in MBytes or GBytes.  Percentage settings for large
+ #  drives is a pain in the butt
+ # 2-May-2002 - SGhosh fix for embedded perl
++# 11-Nov-2005 - John Relph
++#  allow specifying IP address for NetBIOS names that don't resolve
++#  correctly using DNS; specifically for *nix samba servers using
++#  virtual names
+ #
+ # $Id: check_disk_smb.pl,v 1.12 2005/04/17 22:22:41 seanius Exp $
+ #
+@@ -23,7 +27,7 @@
+ use POSIX;
+ use strict;
+ use Getopt::Long;
+-use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose);
++use vars qw($opt_P $opt_V $opt_h $opt_H $opt_I $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose);
+ use vars qw($PROGNAME);
+ use lib utils.pm ;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
+@@ -49,7 +53,9 @@
+         "u=s" => \$opt_u, "username=s" => \$opt_u,
+         "s=s" => \$opt_s, "share=s"    => \$opt_s,
+         "W=s" => \$opt_W, "workgroup=s" => \$opt_W,
+-        "H=s" => \$opt_H, "hostname=s" => \$opt_H);
++        "H=s" => \$opt_H, "hostname=s" => \$opt_H,
++        "I=s" => \$opt_I, "ipaddr=s"   => \$opt_I
++        );
+ 
+ if ($opt_V) {
+        print_revision($PROGNAME,'$Revision: 1.12 $'); #'
+@@ -68,8 +74,14 @@
+ my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9]+\$?)$/);
+ ($host) || usage("Invalid host: $opt_H\n");
+ 
++($opt_I) || ($opt_I = shift) || ($opt_I = '');
++my $ipaddr = ($opt_I =~ /^([-_.A-Za-z0-9]+\$?)$/ ? $1 : '');
++if ($opt_I) { ($ipaddr) || usage("Invalid IP address: $opt_I\n"); }
++
++$smbclientoptions .= "-I $ipaddr " if $ipaddr;
++
+ ($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n");
+-my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/);
++my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
+ ($share) || usage("Invalid share: $opt_s\n");
+ 
+ ($opt_u) || ($opt_u = shift) || ($opt_u = "guest");
+@@ -120,27 +132,23 @@
+ };
+ alarm($TIMEOUT);
+ 
+-# Execute an "ls" on the share using smbclient program
++# Execute a "du" on the share using smbclient program
+ # get the results into $res
+ if (defined($workgroup)) {
+-       $res = qx/$smbclient \/\/$host\/$share -W $workgroup -U $user%$pass $smbclientoptions -c ls/;
++       print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -c du\n" if ($verbose);
++       $res = qx/$smbclient "\/\/$host\/$share" -W $workgroup -U $user%$pass $smbclientoptions -c du/;
+ } else {
+-       print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
+-       $res = qx/$smbclient \/\/$host\/$share -U $user%$pass $smbclientoptions -c ls/;
++       print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c du\n" if ($verbose);
++       $res = qx/$smbclient "\/\/$host\/$share" -U $user%$pass $smbclientoptions -c du/;
+ }
+ #Turn off alarm
+ alarm(0);
+ 
+-#Split $res into an array of lines
+-@lines = split /\n/, $res;
+-
+-#Get the last line into $_
+-$_ = $lines[$#lines];
+-#print "$_\n";
++print "result: $res" if ($verbose);
+ 
+-#Process the last line to get free space.  
++#Process the output to get free space.  
+ #If line does not match required regexp, return an UNKNOWN error
+-if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
++if ($res =~ m/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/s) {
+ 
+        my ($avail) = ($3*$2)/1024;
+        my ($avail_bytes) = $avail;
+@@ -189,9 +197,9 @@
+                $avail = $avail ."K";
+        }
+ 
+-#print ":$warn:$warn_type:\n";
+-#print ":$crit:$crit_type:\n";
+-#print ":$avail:$avail_bytes:$capper:$mountpt:\n";
++print ":$warn:$warn_type:\n" if ($verbose);
++print ":$crit:$crit_type:\n" if ($verbose);
++print ":$avail:$avail_bytes:$capper:$mountpt:\n" if ($verbose);
+ 
+        if ((($warn_type eq "P") && (100 - $capper) < $warn) || (($warn_type eq "K") && ($avail_bytes > $warn))) { 
+                $answer = "Disk ok - $avail ($capper%) free on $mountpt\n";
+@@ -205,18 +213,18 @@
+ } else {
+        $answer = "Result from smbclient not suitable\n";
+        $state = "UNKNOWN";
+-       foreach (@lines) {
+-               if (/(Access denied|NT_STATUS_LOGON_FAILURE)/) {
++       foreach ($res) {
++               if (/(Access denied|NT_STATUS_LOGON_FAILURE)/s) {
+                        $answer = "Access Denied\n";
+                        $state = "CRITICAL";
+                        last;
+                }
+-               if (/(Unknown host \w*|Connection.*failed)/) {
++               if (/(Unknown host \w*|Connection.*failed)/s) {
+                        $answer = "$1\n";
+                        $state = "CRITICAL";
+                        last;
+                }
+-               if (/(You specified an invalid share name|NT_STATUS_BAD_NETWORK_NAME)/) {
++               if (/(You specified an invalid share name|NT_STATUS_BAD_NETWORK_NAME)/s) {
+                        $answer = "Invalid share name \\\\$host\\$share\n";
+                        $state = "CRITICAL";
+                        last;
+@@ -230,7 +238,7 @@
+ exit $ERRORS{$state};
+ 
+ sub print_usage () {
+-       print "Usage: $PROGNAME -H <host> -s <share> -u <user> -p <password> 
++       print "Usage: $PROGNAME -H <host> -I <ipaddr> -s <share> -u <user> -p <password>
+       -w <warn> -c <crit> [-W <workgroup>] [-P <port>]\n";
+ }
+ 
+@@ -245,6 +253,8 @@
+        print "
+ -H, --hostname=HOST
+    NetBIOS name of the server
++-I, --ipaddr=IPADDR
++   IP address of the server
+ -s, --share=STRING
+    Share name to be tested
+ -W, --workgroup=STRING
diff --git a/web/attachments/158749-patch-check_ping-timeout b/web/attachments/158749-patch-check_ping-timeout
new file mode 100644
index 0000000..35d3dfb
--- /dev/null
+++ b/web/attachments/158749-patch-check_ping-timeout
@@ -0,0 +1,11 @@
+--- check_ping.c.org    2005-06-14 12:40:11.000000000 -0400
++++ check_ping.c        2005-06-14 12:40:22.000000000 -0400
+@@ -87,7 +87,7 @@
+        }
+ 
+        /* handle timeouts gracefully */
+-       alarm (timeout_interval);
++       alarm (timeout_interval+4);
+ 
+        for (i = 0 ; i < n_addresses ; i++) {
+                
diff --git a/web/attachments/158752-patch-check_disk_snmp.pl-snmpv1-2-win b/web/attachments/158752-patch-check_disk_snmp.pl-snmpv1-2-win
new file mode 100644
index 0000000..7db3a88
--- /dev/null
+++ b/web/attachments/158752-patch-check_disk_snmp.pl-snmpv1-2-win
@@ -0,0 +1,299 @@
+--- check_disk_snmp.pl.org      2005-12-05 15:06:35.815047753 -0500
++++ check_disk_snmp.pl  2005-12-05 15:17:23.142768392 -0500
+@@ -1,74 +1,257 @@
+ #!/usr/bin/perl
+-# cm@financial.com 07/2002
++# ----------------------------------------------------------------------------
++# Name:         check_disk_snmp.pl
++# Version:      1.1
++# Description:  This script will check the disk space usage using SNMP for
++#               both Unix and Windows hosts.  The warning and critical values
++#               can be specified using ratios (default) or free bytes.
++# ----------------------------------------------------------------------------
++# ChangeLog:
++#
++# July, 2002:  cm@financial.com
++# -Original release
++#
++# Oct 14, 2005: Alex Burger <alex_b@users.sourceforge.net>
++# - Added support for SNMP version 1 and 2
++# - Added support for checking free bytes instead of only usage ratio
++# - Added support for selecting a device by specifying a substring of the 
++#   device description such as c:, d: etc.
++# - Added support for hostname:port
++# ----------------------------------------------------------------------------
++# 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 2 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, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++# ----------------------------------------------------------------------------
+ use strict;
+ use Net::SNMP;
+ use Getopt::Std;
++my ($warn_bytes, $critical_bytes);
+ 
+ my %opts =(
+-        u => 'nobody',          # snmp user
+-        l => 'authNoPriv',      # snmp security level   
+-        a => 'MD5',             # snmp authentication protocol
+-        A => 'nopass',          # authentication protocol pass phrase.
+-        x => 'DES',             # privacy protocol
++        u => 'nobody',          # snmp user (v3) or snmp community string (v1/2c)
++        l => 'authNoPriv',      # snmp security level (v3)   
++        a => 'MD5',             # snmp authentication protocol (v3)
++        A => 'nopass',          # authentication protocol pass phrase. (v3)
++        x => 'DES',             # privacy protocol (v3)
+         m => 'localhost',       # host 
+-        d => 1,         # devicenumber
+-        w => 70,                # warnratio
+-        c => 85,                # critical ratio
++        d => 1,                 # devicenumber
++        w => 70,                # usage warnratio or bytes free
++        c => 85,                # usage critical ratio or bytes free
++        v => 3,
++        t => 'ratio',           # ratio or bytes
+         h => 0,
+-        );
++      );
+ 
+-getopts('m:u:l:a:A:x:d:w:c:h',\%opts);
++getopts('m:u:l:a:A:x:d:w:c:v:t:h',\%opts);
+ 
+ if ( $opts{'h'} ) {
+-       print "Usage: $0 [ -u <username> ] [ -l <snmp security level>] [ -a <snmp authentication protocol> ] [ -A <authentication protocol pass phrase> ] [ -x <snmp privacy protocol> ] [ -m <hostname>] [ -d <devicenumber> ] [ -w <warning ratio> ] [ -c <critical ratio ]\n";
++       print "Usage: $0 [ -v <snmp version (3)> ]\n";
++        print "       [ -u <username or community name> ] [ -l <snmp security level>]\n";
++        print "       [ -a <snmp authentication protocol> ]\n";
++        print "       [ -A <authentication protocol pass phrase> ]\n";
++        print "       [ -x <snmp privacy protocol> ] [ -m <hostname>]\n";
++        print "       [ -d <devicenumber or description> ] [ -w <warning ratio or bytes free> ]\n";
++        print "       [ -c <critical ratio or bytes free> ] [ -t <(ratio)|bytes> ]\n\n";
++        print "SNMP V3 example using ratio for device number 2:\n";
++        print "$0 -u nobody -l authPriv -a MD5 -A nopass -x DES \\\n";
++        print "  -m server1 -d 2 -w 70 -c 85\n\n";
++        print "SNMP V1 example using ratio for device number 2:\n";
++        print "$0 -v 1 -u public -m server1 -d 2 -w 70 -c 85\n\n";
++        print "SNMP V1 example using bytes for device number 2\n";
++        print "$0 -v 1 -u public -m server1 -d 2 -w 10Gb -c 900Mb \\\n";
++        print "  -t bytes\n\n";
++        print "SNMP V1 example using bytes free for device description that contains 'c:'\n";
++        print "$0 -v 1 -u public -m server1 -d 'c:' -w 10Gb -c 900Mb \\\n";
++        print "  -t bytes\n\n";
++        print "Note:  The device list can be retreived using Net-SNMP's snmpwalk:\n";
++        print "       snmpwalk -v 1 -c public server01 .1.3.6.1.2.1.25.2.3.1\n\n";
+        exit 1;
+ }
+ 
+-if ($opts{'w'} >= $opts{'c'}) {
+-       print "Errorratio must be higher then Warnratio!\n";
+-       exit 1;
++if ($opts{'t'} eq "ratio") {
++  if ($opts{'w'} >= $opts{'c'}) {
++    print "Errorratio must be higher then Warnratio!\n";
++    exit 3;
++  }
++}
++else {
++  # For 'bytes' mode, allow user to specify size using k, M, G or T
++  ($warn_bytes, $critical_bytes) = ($opts{'w'}, $opts{'c'});
++
++  if ($warn_bytes =~ /(.*)T/i) {
++    $warn_bytes = $1 * 1099511627776;                   # 1024 * 1024 * 1024 * 1024
++  }
++  elsif ($warn_bytes =~ /(.*)G.*/i) {
++    $warn_bytes = $1 * 1073741824;                      # 1024 * 1024 * 1024
++  }
++  elsif ($warn_bytes =~ /(.*)M.*/i) {
++    $warn_bytes = $1 * 1048576;                         # 1024 * 1024
++  }
++  elsif ($warn_bytes =~ /(.*)k.*/i) {
++    $warn_bytes = $1 * 1024;
++  }
++
++  if ($critical_bytes =~ /(.*)T/i) {
++    $critical_bytes = $1 * 1099511627776;               # 1024 * 1024 * 1024 * 1024
++  }
++  elsif ($critical_bytes =~ /(.*)G.*/i) {
++    $critical_bytes = $1 * 1073741824;                  # 1024 * 1024 * 1024
++  }
++  elsif ($critical_bytes =~ /(.*)M.*/i) {
++    $critical_bytes = $1 * 1048576;                     # 1024 * 1024
++  }
++  elsif ($critical_bytes =~ /(.*)k.*/i) {
++    $critical_bytes = $1 * 1024;
++  }
++
++  if ($warn_bytes <= $critical_bytes) {
++    print "Critical bytes free must be lower then Warning bytes free!\n";
++    exit 3;
++  }  
+ }
+ 
+-my ($session, $error) = Net::SNMP->session(
+-       -hostname       =>      $opts{'m'},
+-       -nonblocking    =>      0x0,
+-       -username       =>      $opts{'u'},
+-       -authpassword   =>      $opts{'A'},
+-       -authprotocol   =>      $opts{'a'},
+-       -version        =>      '3',
+-       );
++# Allow hostname:port for -m
++my $hostname = $opts{'m'};
++my $port = 161;                         # Default to port 161
++if ($hostname =~ /(.*):(.*)/) {
++  $hostname = $1;
++  $port = $2;
++}
++
++my $session;
++my $error;
++if ($opts{'v'} == 3) {
++  ($session, $error) = Net::SNMP->session(
++    -hostname          =>      $hostname,
++    -port              =>      $port,
++    -nonblocking       =>      0x0,
++    -username          =>      $opts{'u'},
++    -authpassword      =>      $opts{'A'},
++    -authprotocol      =>      $opts{'a'},
++    -version           =>      '3',
++  );
++}
++else {
++  ($session, $error) = Net::SNMP->session(
++    -hostname          =>      $hostname,
++    -port              =>      $port,
++    -nonblocking       =>      0x0,
++    -community         =>      $opts{'u'},
++    -version           =>      $opts{'v'},
++  );
++}  
+ 
+ if ($@) {
+        print "SNMP-Error occured";
+-       exit 1;
++       exit 3;
+ }
+ my $result=undef;
+ 
++my $device_id = $opts{'d'};
++
++if ($device_id =~ /^(\D+)$/) {
++  # Non numeric device.  Search for matching description in all drives.
++  # If we don't find it, set device number to 999.
++  #print "non numeric device: $1\n\n";
++
++  my $i=1;
++  $device_id = 999;
++  while (1) {
++    my $deviceName=".1.3.6.1.2.1.25.2.3.1.3.$i";        # HOST-RESOURCES-MIB::hrStorageDescr
++
++    my $result = $session->get_request(
++      -varbindlist => [$deviceName]
++    );
++
++    if (!defined($result)) {
++      $session->close;
++      last;
++   }
++
++   if ($result->{$deviceName} =~ /$opts{'d'}/i) {
++     #print "Found matching device: $result->{$deviceName}\n";
++     $device_id = $i;
++     last;
++   }
++   $i++;
++  }
++}
+ 
+-my $deviceSize=".1.3.6.1.2.1.25.2.3.1.5.$opts{'d'}";
+-my $deviceUsed=".1.3.6.1.2.1.25.2.3.1.6.$opts{'d'}";
+-my $deviceName=".1.3.6.1.2.1.25.2.3.1.3.$opts{'d'}";
+-my @OID=($deviceSize, $deviceUsed, $deviceName);
+-$result = $session->get_request(
++my $deviceUnits=".1.3.6.1.2.1.25.2.3.1.4.$device_id";   # HOST-RESOURCES-MIB::hrStorageAllocationUnits
++my $deviceSize=".1.3.6.1.2.1.25.2.3.1.5.$device_id";    # HOST-RESOURCES-MIB::hrStorageSize
++my $deviceUsed=".1.3.6.1.2.1.25.2.3.1.6.$device_id";    # HOST-RESOURCES-MIB::hrStorageUsed
++my $deviceName=".1.3.6.1.2.1.25.2.3.1.3.$device_id";    # HOST-RESOURCES-MIB::hrStorageDescr
++my @OID=($deviceUnits, $deviceSize, $deviceUsed, $deviceName);
++my $result = $session->get_request(
+        -varbindlist => \@OID,
+        );
+ 
+ if (!defined($result)) {
+        printf("ERROR: %s.\n", $session->error);
+        $session->close;
+-       exit 1;
++       exit 3;
+ }
+ 
+-my $ratio=$result->{$deviceUsed}*100/$result->{$deviceSize};
++if ($opts{'t'} eq "ratio") {
++  my $ratio=$result->{$deviceUsed}*100/$result->{$deviceSize};
+ 
+-if ($ratio > $opts{'c'}){
+-       printf("CRITICAL: %s usage %.2f%%\n", $result->{$deviceName}, $ratio);
+-       exit 2;
++  if ($ratio > $opts{'c'}){
++    printf("CRITICAL: %s usage %.2f%%\n", $result->{$deviceName}, $ratio);
++    exit 2;
++  }
++  if ($ratio > $opts{'w'}){
++    printf("WARNING: %s usage %.2f%%\n", $result->{$deviceName}, $ratio);
++    exit 1;
++  }
++  
++  printf("OK: %s usage %.2f%%\n", $result->{$deviceName}, $ratio);
++  exit 0;
+ }
+-if ($ratio > $opts{'w'}){
+-       printf("WARNING: %s usage %.2f%%\n", $result->{$deviceName}, $ratio);
+-        exit 1;
++else {
++  #print "Bytes...\n";
++  # Calculate actual size in bytes
++  my $b_deviceSize = $result->{$deviceSize} * $result->{$deviceUnits};
++  my $b_deviceUsed = $result->{$deviceUsed} * $result->{$deviceUnits};
++  my $b_free = $b_deviceSize - $b_deviceUsed;
++  my $b_free_units;
++
++  if ($b_free > 1099511627776) {
++    $b_free_units = (int ($b_free / 1099511627776 * 100) / 100);
++    $b_free_units .= "Tb";
++  }
++  elsif ($b_free > 1073741824) {
++    $b_free_units = (int ($b_free / 1073741824 * 100) / 100);
++    $b_free_units .= "Gb";
++  }
++  elsif ($b_free > 1048576) {
++    $b_free_units = (int ($b_free / 1048576 * 100) / 100);
++    $b_free_units .= "Mb";
++  }
++  elsif ($b_free > 1024) {
++    $b_free_units = (int ($b_free / 1024 * 100) / 100);
++    $b_free_units .= "kb";
++  }
++  
++  if ($b_free < $critical_bytes){
++    printf("CRITICAL: %s free: %s\n", $result->{$deviceName}, $b_free_units);
++    exit 2;
++  }
++  if ($b_free < $warn_bytes){
++    printf("WARNING: %s free: %s\n", $result->{$deviceName}, $b_free_units);
++    exit 1;
++  }
++
++  printf("OK: %s free: %s\n", $result->{$deviceName}, $b_free_units);
++  exit 0;
+ }
+ 
+-printf("OK: %s usage %.2f%%\n", $result->{$deviceName}, $ratio);
+-exit 0;
diff --git a/web/attachments/159986-check_ntp.zip b/web/attachments/159986-check_ntp.zip
new file mode 100644
index 0000000..fcd96b5
--- /dev/null
+++ b/web/attachments/159986-check_ntp.zip
diff --git a/web/attachments/160015-check_ups--1.28.diff b/web/attachments/160015-check_ups--1.28.diff
new file mode 100644
index 0000000..b86f9bb
--- /dev/null
+++ b/web/attachments/160015-check_ups--1.28.diff
@@ -0,0 +1,55 @@
+--- check_ups.c.orig    2005-12-15 17:17:54.000000000 -0500
++++ check_ups.c 2005-12-15 17:22:44.000000000 -0500
+@@ -7,6 +7,7 @@
+  Copyright (c) 2000 Tom Shields
+                2004 Alain Richard <alain.richard@equation.fr>
+                2004 Arnaud Quette <arnaud.quette@mgeups.com>
++               2005 Garrett Honeycutt <gh@3gupload.com>
+ 
+  
+  This program is free software; you can redistribute it and/or modify
+@@ -23,13 +24,11 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: check_ups.c,v 1.27 2005/03/04 21:58:40 tonvoon Exp $
+- 
+ ******************************************************************************/
+ 
+ const char *progname = "check_ups";
+-const char *revision = "$Revision: 1.27 $";
+-const char *copyright = "2000-2004";
++const char *revision = "$Revision: 1.28 $";
++const char *copyright = "2000-2005";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+@@ -302,9 +301,17 @@
+                                            check_crit, (long)(1000*critical_value),
+                                            TRUE, 0, FALSE, 0));
+                } else {
+-                       asprintf (&data, "%s %s", data,
+-                                 perfdata ("temp", (long)ups_temperature, "degF",
+-                                           FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
++                       /* 2005 garrett honeycutt - small bugfix to print the correct abbreviation */
++                       if (temp_output_c) {
++                               asprintf (&data, "%s %s", data,
++                                         perfdata ("temp", (long)ups_temperature, "degC",
++                                                   FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
++                       }
++                       else {
++                               asprintf (&data, "%s %s", data,
++                                          perfdata ("temp", (long)ups_temperature, "degF",
++                                                    FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
++                       }
+                }
+        }
+ 
+@@ -588,6 +595,7 @@
+        printf ("Copyright (c) 2000 Tom Shields");
+        printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
+        printf ("Copyright (c) 2004 Arnaud Quette <arnaud.quette@mgeups.com>\n");
++       printf ("Copyright (c) 2005 Garrett Honeycutt <gh@3gupload.com>\n");
+        printf (COPYRIGHT, copyright, email);
+ 
+        printf (_("This plugin tests the UPS service on the specified host.\n\
diff --git a/web/attachments/160368-check_ntp-131.out b/web/attachments/160368-check_ntp-131.out
new file mode 100644
index 0000000..86796aa
--- /dev/null
+++ b/web/attachments/160368-check_ntp-131.out
@@ -0,0 +1,31 @@
+ntperr = 0 
+ntperr = 0 
+Argument "(not parsed)" isn't numeric in abs at ./check_ntp line 408.
+     remote           refid      st t when poll reach   delay   offset  jitter
+No match!
+==============================================================================
+No match!
+ 127.127.1.0     LOCAL(0)        10 l   19   64  377    0.000    0.000   0.001
+No match!
++10.17.33.12     .GPS.            1 u  440 1024  377    5.121   -0.443   2.513
+Candidate count= 1
+No match!
+-10.64.49.11     .GPS.            1 u  138 1024  377   14.865    1.412  12.189
+No match!
+*10.80.49.11     .GPS.            1 u  728 1024  377   11.730   -0.399   1.081
+Candidate count= 2
+match *10.80.49.11     .GPS.            1 u  728 1024  377   11.730   -0.399   1.081
+ 
++10.96.113.11    .GPS.            1 u  265 1024  377   13.316   -0.622   0.617
+Candidate count= 3
+No match!
+-10.112.49.11    .GPS.            1 u  395 1024  377   13.645    1.960   0.637
+No match!
++10.128.49.11    .GPS.            1 u  383 1024  377   13.932   -0.405   8.635
+Candidate count= 4
+No match!
+-192.168.219.11  10.80.49.11      2 u  362 1024  377    0.001   18.433  18.817
+No match!
+x192.168.219.12  10.17.33.12      2 u  442 1024  377    0.001   39.417  16.607
+No match!
+NTP OK: Offset 0.009224 secs, jitter (not parsed) msec, peer is stratum 1|offset=0.009224, jitter=0,peer_stratum=1
diff --git a/web/attachments/160369-check_ntp-fqdn.patch b/web/attachments/160369-check_ntp-fqdn.patch
new file mode 100644
index 0000000..b20a702
--- /dev/null
+++ b/web/attachments/160369-check_ntp-fqdn.patch
@@ -0,0 +1,11 @@
+--- check_ntp.pl.orig   2005-12-19 13:34:41.000000000 +0100
++++ check_ntp.pl        2005-12-19 13:43:49.000000000 +0100
+@@ -112,7 +112,7 @@
+ }
+ 
+ $opt_H = shift unless ($opt_H);
+-my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0-9]+(\.[a-zA-Z][-a-zA-Z0-9]+)*)$/);
++my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0-9]+([a-zA-Z][-a-zA-Z0-9\.]+)*)$/);
+ unless ($host) {
+        print "No target host specified\n";
+        print_usage();
diff --git a/web/attachments/160531-check_mrtg.c b/web/attachments/160531-check_mrtg.c
new file mode 100644
index 0000000..4c592dd
--- /dev/null
+++ b/web/attachments/160531-check_mrtg.c
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-4 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378821200" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378821200" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378821200" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378821200" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378821200');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1386201&group_id=29880&atid=397597&file_id=160531"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/160532-check_mrtg.c b/web/attachments/160532-check_mrtg.c
new file mode 100644
index 0000000..9d652ad
--- /dev/null
+++ b/web/attachments/160532-check_mrtg.c
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-4 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378821205" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378821205" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378821205" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378821205" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378821205');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1386205&group_id=29880&atid=397599&file_id=160532"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/162122-check_procs.patch b/web/attachments/162122-check_procs.patch
new file mode 100644
index 0000000..55889fb
--- /dev/null
+++ b/web/attachments/162122-check_procs.patch
@@ -0,0 +1,30 @@
+--- nagios-plugins-1.4.2/plugins/check_procs.c  2005-09-15 08:27:58.000000000 +0000
++++ check_procs.c       2006-01-04 15:22:53.684763668 +0000
+@@ -84,6 +84,7 @@
+        char *input_buffer;
+        char *input_line;
+        char *procprog;
++        char *tmp_out;
+ 
+        pid_t mypid = 0;
+        int procuid = 0;
+@@ -300,7 +301,18 @@
+        if ( verbose >= 1 && strcmp(fails,"") )
+                printf (" [%s]", fails);
+ 
+-       printf ("\n");
++  /* add performance data */
++  if ( metric == METRIC_PROCS ) {
++    printf ("|%s\n", perfdata (metric_name,procs,"",(wmax!=-1),wmax,(cmax!=-1),cmax,TRUE,0,FALSE,0));
++  } else {
++    asprintf (&tmp_out, _("%s Processes OK"),metric_name);
++    printf ("|%s", perfdata (tmp_out,procs,"",FALSE,0,FALSE,0,TRUE,0,FALSE,0));
++    asprintf (&tmp_out, _("%s Processes WARNING"),metric_name);
++    printf (" %s", perfdata (tmp_out,warn,"",FALSE,0,FALSE,0,TRUE,0,FALSE,0));
++    asprintf (&tmp_out, _("%s Processes CRITICAL"),metric_name);
++    printf (" %s\n", perfdata (tmp_out,crit,"",FALSE,0,FALSE,0,TRUE,0,FALSE,0));
++  }
++
+        return result;
+ }
+ 
diff --git a/web/attachments/163283-nagios-plugins-1.4.1-check_snmp_c_fix_alt.patch b/web/attachments/163283-nagios-plugins-1.4.1-check_snmp_c_fix_alt.patch
new file mode 100644
index 0000000..47d51fc
--- /dev/null
+++ b/web/attachments/163283-nagios-plugins-1.4.1-check_snmp_c_fix_alt.patch
@@ -0,0 +1,25 @@
+--- nagios-plugins-1.4.2/plugins/check_snmp.c.orig      Wed Jun 
+1 15:41:
+01 2005
++++ nagios-plugins-1.4.2/plugins/check_snmp.c   Thu Jan 12
+18:22:
+47 2006
+@@ -337,10 +337,17 @@
+                        asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
+ 
+                i++;
+-
++#if 0
+                char *str[MAX_INPUT_BUFFER];
+                asprintf(str, "=%s%s;;;; ", show, type ? type : "");
+                strcat(perfstr, *str);
++#else
++               strcat(perfstr, "=");
++               strcat(perfstr, show);
++               if (type)
++                       strcat(perfstr, type);
++               strcat(perfstr, ";;;; ");
++#endif
+ 
+        }       /* end while (ptr) */
+
diff --git a/web/attachments/163415-diff-check_dns b/web/attachments/163415-diff-check_dns
new file mode 100644
index 0000000..1c1beb2
--- /dev/null
+++ b/web/attachments/163415-diff-check_dns
@@ -0,0 +1,13 @@
+*** check_dns.c.orig    Sun Jan 15 10:30:55 2006
+--- check_dns.c Sun Jan 15 10:55:07 2006
+***************
+*** 173,178 ****
+--- 173,179 ----
+
+        /* If we got here, we should have an address string,
+                 and we can segfault if we do not */
++       strip(address);
+        if (address==NULL || strlen(address)==0)
+                die (STATE_CRITICAL,
+                     _("DNS CRITICAL - '%s' output parsing exited with no address\n"),
+
diff --git a/web/attachments/163636-check_ntp.pl.patch b/web/attachments/163636-check_ntp.pl.patch
new file mode 100644
index 0000000..3ce6b2a
--- /dev/null
+++ b/web/attachments/163636-check_ntp.pl.patch
@@ -0,0 +1,75 @@
+--- check_ntp.pl.dist   2006-01-16 17:56:25.835790000 +0100
++++ check_ntp.pl        2006-01-16 20:17:39.345787000 +0100
+@@ -56,6 +56,12 @@
+ # changed ntpdc to ntpq - jitter/dispersion is in milliseconds
+ #
+ # Patch for for regex for stratum1 refid.
++#
++# Modified by Joachim Schrod <jschrod@acm.org>, 16 Jan 06:
++# Support multiple peers, don't overwrite jitter value if one was found.
++# ntpdate and ntpq may exit with non-zero status, then close() returns false.
++# Support FQDN hostnames with one-letter components.
++# Support unknown hosts.
+ 
+ require 5.004;
+ use POSIX;
+@@ -112,7 +118,7 @@
+ }
+ 
+ $opt_H = shift unless ($opt_H);
+-my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0-9]+(\.[a-zA-Z][-a-zA-Z0-9]+)*)$/);
++my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0-9]*(\.[a-zA-Z][-a-zA-Z0-9]*)*)$/);
+ unless ($host) {
+        print "No target host specified\n";
+        print_usage();
+@@ -242,11 +248,15 @@
+                }
+        }
+ 
++       if (/can\'t find host/) {
++               $ntpdate_error = $ERRORS{"CRITICAL"};
++               $msg = "Host not found - ";
++       }
++
+ }
+ $out =~ s/\n//g;
+-close (NTPDATE) || 
+-    die $! ? "$out - Error closing $ntpdate pipe: $!"
+-           : "$out - Exit status: $? from $ntpdate\n";
++close (NTPDATE)  or
++    $!  and  die "$out - Error closing $ntpdate pipe: $!\n";
+ 
+ # declare an error if we also get a non-zero return code from ntpdate
+ # unless already set to critical
+@@ -314,13 +324,11 @@
+                                }
+                        } else {
+                                print "No match!\n" if $verbose;
+-                               $jitter = '(not parsed)';
+                        }
+                        
+                }
+-               close NTPQ ||
+-            die $! ? "Error closing $ntpq pipe: $!"
+-                   : "Exit status: $? from $ntpq\n";
++               close NTPQ  or
++                   $! and die "Error closing $ntpq pipe: $!\n";
+ 
+                # if we did not match sys.peer or pps.peer but matched # candidates only
+                # generate a warning 
+@@ -428,7 +436,14 @@
+ foreach my $key (keys %ERRORS) {
+        if ($state==$ERRORS{$key}) {
+ #              print ("NTP $key: $answer");
+-               print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 .     ",peer_stratum=$stratum\n");
++               defined($offset) or $offset = '-';
++               defined($stratum) or $stratum = '-';
++               if (defined($jitter)) {
++                       $jitter /= 1000;
++               } else {
++                       $jitter = '-';
++               }
++               print ("NTP $key: $answer|offset=$offset, jitter=$jitter, peer_stratum=$stratum\n");
+                last;
+        }
+ }
diff --git a/web/attachments/165690-check_swap.c.diff b/web/attachments/165690-check_swap.c.diff
new file mode 100644
index 0000000..38c4396
--- /dev/null
+++ b/web/attachments/165690-check_swap.c.diff
@@ -0,0 +1,9 @@
+--- check_swap.c.1.54   2006-01-31 12:14:01.000000000 -0500
++++ check_swap.c        2006-01-31 12:14:46.000000000 -0500
+@@ -292,4 +292,4 @@
+        for(i=0;i<nswaps;i++){
+-               dsktotal_mb = (float) ent->se_nblks / conv_factor;
+-               dskused_mb = (float) ent->se_inuse / conv_factor;
++               dsktotal_mb = (float) ent[i].se_nblks / conv_factor;
++               dskused_mb = (float) ent[i].se_inuse / conv_factor;
+                dskfree_mb = ( dsktotal_mb - dskused_mb );
diff --git a/web/attachments/169141-check_file_age.pl.patch b/web/attachments/169141-check_file_age.pl.patch
new file mode 100644
index 0000000..857e11c
--- /dev/null
+++ b/web/attachments/169141-check_file_age.pl.patch
@@ -0,0 +1,101 @@
+diff -r -U1 nagios-plugins-HEAD-200602280052-orig/plugins-scripts/check_file_age.pl nagios-plugins-HEAD-200602280052/plugins-scripts/check_file_age.pl
+--- nagios-plugins-HEAD-200602280052-orig/plugins-scripts/check_file_age.pl     2005-12-15 16:17:49.000000000 +0100
++++ nagios-plugins-HEAD-200602280052/plugins-scripts/check_file_age.pl  2006-02-28 12:10:21.000000000 +0100
+@@ -35,4 +35,4 @@
+ 
+-my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
+-my ($result, $message, $age, $size, $st);
++my ($opt_c, $opt_f, $opt_d, $opt_n, $opt_w, $opt_r, $opt_C, $opt_W, $opt_h, $opt_V);
++my ($result, $message, $age, $size, $st, @files, @failed, $file);
+ 
+@@ -45,2 +45,5 @@
+ $opt_f = "";
++$opt_n = 1;
++$opt_d = "";
++$opt_r = "";
+ 
+@@ -50,3 +53,6 @@
+        "h"   => \$opt_h, "help"        => \$opt_h,
++       "d"   => \$opt_d, "dir-content" => \$opt_d,
+        "f=s" => \$opt_f, "file"        => \$opt_f,
++       "n=i" => \$opt_n, "num-files=i" => \$opt_n,
++       "r=s" => \$opt_r, "regexp=s"    => \$opt_r,
+        "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
+@@ -79,17 +85,54 @@
+ 
+-$st = File::stat::stat($opt_f);
+-$age = time - $st->mtime;
+-$size = $st->size;
+-
++if ($opt_d) {
++    if (!opendir(DIR, $opt_f)) {
++        print "FILE_AGE CRITICAL: $opt_f: $!";
++        exit $ERRORS{'CRITICAL'};
++    }
++    # remove . and .. and filter regular expression
++    @files = grep { !/^\.{1,2}$/ } grep { /$opt_r/ } readdir(DIR);
++    # print "@files";
++    closedir(DIR);
++} else {
++    @files = ($opt_f);
++}
++
++my $crit = 0;
++my $warn = 0;
++foreach $file (@files) {
++    if ($opt_d) {
++        $file = "$opt_f/$file";
++    }
++    $st = File::stat::stat("$file");
++    $age = time - $st->mtime;
++    $size = $st->size;
++
++    if (($opt_c and $age > $opt_c) or ($opt_C and $size < $opt_C)) {
++        push (@failed,$file);
++        $crit++;
++    }
++    elsif (($opt_w and $age > $opt_w) or ($opt_W and $size < $opt_W)) {
++        push (@failed,$file);
++        $warn++;
++    }
++}
++
++# return maximum RC if the sum of nOK files exceeds $opt_n
++if ($warn + $crit >= $opt_n) {
++    if ($crit > 0 ) {
++        $result = 'CRITICAL';
++    } else {
++        $result = 'WARNING';
++    }
++} else {
++    $result = 'OK';
++}
+ 
+-$result = 'OK';
+ 
+-if (($opt_c and $age > $opt_c) or ($opt_C and $size < $opt_C)) {
+-       $result = 'CRITICAL';
++if ( ! $opt_d ) {
++    print "FILE_AGE $result: $opt_f is $age seconds old and $size bytes\n";
++} else {
++    my $failed = @failed;
++    print "FILE_AGE $result: @failed " . $failed ." files older/smaller than threshold thres: $opt_n\n";
+ }
+-elsif (($opt_w and $age > $opt_w) or ($opt_W and $size < $opt_W)) {
+-       $result = 'WARNING';
+-}
+-
+-print "FILE_AGE $result: $opt_f is $age seconds old and $size bytes\n";
++    
+ exit $ERRORS{$result};
+@@ -98,3 +141,3 @@
+        print "Usage:\n";
+-       print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] -f <file>\n";
++       print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] [-d [-r <regexp>] [-n <num>]  -f <file>\n";
+        print "  $PROGNAME [-h | --help]\n";
+@@ -110,2 +153,5 @@
+        print "  <size>  File must be at least this many bytes long (default: crit 0 bytes)\n";
++       print "  -d check all files in <file> (if <file> is a directory)\n";
++       print "  -r only check files maching regular expression in directory (only if -d is given)\n";
++       print "  -n minimum number of files that have to be crit/warn to reach non OK state\n";
+        print "\n";
diff --git a/web/attachments/170107-check_pgsql.patch b/web/attachments/170107-check_pgsql.patch
new file mode 100644
index 0000000..b880f8c
--- /dev/null
+++ b/web/attachments/170107-check_pgsql.patch
@@ -0,0 +1,138 @@
+--- check_pgsql.original        2006-03-07 12:40:11.000000000 -0700
++++ check_pgsql.c       2006-03-07 12:47:48.000000000 -0700
+@@ -21,5 +21,5 @@
+ const char *progname = "check_pgsql";
+ const char *revision = "$Revision: 1.31 $";
+-const char *copyright = "1999-2004";
++const char *copyright = "1999-2006";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+@@ -36,5 +36,7 @@
+        DEFAULT_PORT = 5432,
+        DEFAULT_WARN = 2,
+-       DEFAULT_CRIT = 8
++       DEFAULT_CRIT = 8,
++       DEFAULT_WARNING_XID_AGE = 500000000,                    /* 500M */
++       DEFAULT_CRITICAL_XID_AGE = 1000000000                   /* 1B */
+ };
+ 
+@@ -58,4 +60,6 @@
+ double twarn = (double)DEFAULT_WARN;
+ double tcrit = (double)DEFAULT_CRIT;
++int warning_xid_age = DEFAULT_WARNING_XID_AGE;
++int critical_xid_age = DEFAULT_CRITICAL_XID_AGE;
+ 
+ PGconn *conn;
+@@ -124,4 +128,9 @@
+        int elapsed_time;
+        int status = STATE_UNKNOWN;
++       int i,j;
++       int nFields;
++       const char *paramValues[1];
++        char param[100];
++       PGresult *res;
+ 
+        /* begin, by setting the parameters for a backend connection if the
+@@ -167,8 +176,43 @@
+        }
+        else {
++               snprintf(param, 100, "%d", warning_xid_age);
++               paramValues[0] = param;
++               res = PQexecParams(conn, 
++                       "SELECT datname,age(datvacuumxid) FROM pg_database WHERE age(datvacuumxid) > $1 ORDER BY age(datvacuumxid) DESC",
++                       1, NULL, paramValues, NULL, NULL, 0);
++               if (PQresultStatus(res) != PGRES_TUPLES_OK)
++               {
++                       printf (_("CRITICAL - error '%s' running query on '%s' (%s).\n"),
++                               PQerrorMessage(conn), dbName,   PQerrorMessage (conn));
++                       PQclear (res);
++                       PQfinish (conn);
++                       return STATE_CRITICAL;
++               }
++
++               if (PQntuples(res) > 0)
++               {
++                       j = atoi(PQgetvalue(res, 0, 1));
++
++                       printf (_("%s: Databases in danger of XID wraparound: "), 
++                               ((j > critical_xid_age) ? "CRITICAL" : "WARNING"));
++
++                       for (i = 0; i < PQntuples(res); i++)
++                       {
++                               printf (_("%s age %s"), PQgetvalue(res, i, 0), PQgetvalue(res, i, 1));
++                               if (i < PQntuples(res) - 1)
++                                       printf (_(","));
++                               else
++                                       printf (_("\n\n"));
++                       }
++                       PQclear (res);
++                       PQfinish (conn);
++                       return (j > critical_xid_age) ? STATE_CRITICAL : STATE_WARNING;
++               }
++
++               PQclear(res);
+                status = STATE_OK;
+        }
+        PQfinish (conn);
+-       printf (_(" %s - database %s (%d sec.)|%s\n"), 
++       printf (_(" %s - database %s (%ds, XIDs OK)|%s\n"), 
+                state_text(status), dbName, elapsed_time,
+                fperfdata("time", elapsed_time, "s",
+@@ -198,9 +242,11 @@
+                {"port", required_argument, 0, 'P'},
+                {"database", required_argument, 0, 'd'},
++               {"warnxid", required_argument, 0, 'x'},
++               {"critxid", required_argument, 0, 'y'},
+                {0, 0, 0, 0}
+        };
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:",
++               c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:x:y:",
+                                 longopts, &option);
+ 
+@@ -259,4 +305,16 @@
+                                pguser = optarg;
+                        break;
++               case 'x':
++                       if (!is_intpos(optarg))
++                               usage2 (_("Warning XID age must be a positive integer"), optarg);
++                       else
++                               warning_xid_age = atoi(optarg);         
++                       break;
++               case 'y':
++                       if (!is_intpos(optarg))
++                               usage2 (_("Critical XID age must be a positive integer"), optarg);
++                       else
++                               critical_xid_age = atoi(optarg);                
++                       break;
+                case 'p':     /* authentication password */
+                case 'a':
+@@ -403,11 +461,17 @@
+ 
+        printf (_("\
+-  -d, --database=STRING\n\
++ -d, --database=STRING\n\
+     Database to check (default: %s)\n\
+-  -l, --logname = STRING\n\
++ -l, --logname = STRING\n\
+     Login name of user\n\
+-  -p, --password = STRING\n\
++ -p, --password = STRING\n\
+     Password (BIG SECURITY ISSUE)\n"), DEFAULT_DB);
+ 
++       printf (_("\
++ -x, --warnxid=INTEGER\n\
++    Minimum XID age to generate a warning (default: %d)\n\
++ -y, --critxid=INTEGER\n\
++    Minimum XID age to generate a critical (default: %d)\n"), DEFAULT_WARNING_XID_AGE, DEFAULT_CRITICAL_XID_AGE);
++
+        printf (_(UT_WARN_CRIT));
+ 
+@@ -442,4 +506,5 @@
+        printf ("\
+ Usage: %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
+-                  [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
++                  [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n\
++                 [-x <warning_xid_age>] [-y <critical_xid_age>]\n", progname);
+ }
diff --git a/web/attachments/170760-core.9342.tar.gz b/web/attachments/170760-core.9342.tar.gz
new file mode 100644
index 0000000..502117b
--- /dev/null
+++ b/web/attachments/170760-core.9342.tar.gz
diff --git a/web/attachments/171745-nagios-plugins-1.4.2-check_procs_zombies.patch b/web/attachments/171745-nagios-plugins-1.4.2-check_procs_zombies.patch
new file mode 100644
index 0000000..3ba88bf
--- /dev/null
+++ b/web/attachments/171745-nagios-plugins-1.4.2-check_procs_zombies.patch
@@ -0,0 +1,26 @@
+diff -Naur nagios-plugins-1.4.2/plugins/check_procs.c nagios-plugins-1.4.2-check_proc_zombies/plugins/check_procs.c
+--- nagios-plugins-1.4.2/plugins/check_procs.c  2005-09-15 10:27:58.000000000 +0200
++++ nagios-plugins-1.4.2-check_proc_zombies/plugins/check_procs.c       2006-03-21 20:22:50.883708900 +0100
+@@ -166,6 +166,7 @@
+                strcpy (procprog, "");
+                asprintf (&procargs, "%s", "");
+ 
++               pos = 0;
+                cols = sscanf (input_line, PS_FORMAT, PS_VARLIST);
+ 
+                /* Zombie processes do not give a procprog command */
+@@ -174,8 +175,12 @@
+                }
+                if ( cols >= expected_cols ) {
+                        resultsum = 0;
+-                       asprintf (&procargs, "%s", input_line + pos);
+-                       strip (procargs);
++                       if (strstr(procstat, zombie)) {
++                               procargs = "";
++                       } else {
++                               asprintf (&procargs, "%s", input_line + pos);
++                               strip (procargs);
++                       }
+ 
+                        /* Some ps return full pathname for command. This removes path */
+ #ifdef HAVE_BASENAME
diff --git a/web/attachments/172575-nagios-plugins-1.4.check_http.patch b/web/attachments/172575-nagios-plugins-1.4.check_http.patch
new file mode 100644
index 0000000..f3c3b4d
--- /dev/null
+++ b/web/attachments/172575-nagios-plugins-1.4.check_http.patch
@@ -0,0 +1,18 @@
+--- nagios-plugins-1.4.orig/plugins/check_http.c        2006-03-28 16:19:02.000000000 -0500
++++ nagios-plugins-1.4/plugins/check_http.c     2006-03-28 17:08:22.000000000 -0500
+@@ -989,14 +989,12 @@
+                        die (STATE_WARNING, _("HTTP WARNING: %s\n"), status_line);
+ 
+                /* check redirected page if specified */
+-               else if (http_status >= 300) {
++               else if (http_status >= 300 && onredirect != STATE_OK) {
+ 
+                        if (onredirect == STATE_DEPENDENT)
+                                redir (header, status_line);
+                        else if (onredirect == STATE_UNKNOWN)
+                                printf (_("UNKNOWN"));
+-                       else if (onredirect == STATE_OK)
+-                               printf (_("OK"));
+                        else if (onredirect == STATE_WARNING)
+                                printf (_("WARNING"));
+                        else if (onredirect == STATE_CRITICAL)
diff --git a/web/attachments/174385-patch-plugins_popen_c b/web/attachments/174385-patch-plugins_popen_c
new file mode 100644
index 0000000..b424896
--- /dev/null
+++ b/web/attachments/174385-patch-plugins_popen_c
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- plugins/popen.c.orig        Wed Apr 12 20:42:46 2006
++++ plugins/popen.c     Wed Apr 12 20:42:48 2006
+@@ -268,9 +268,10 @@ popen_sigchld_handler (int signo)
+ RETSIGTYPE
+ popen_timeout_alarm_handler (int signo)
+ {
+-       int fh;
++       int fh = -1;
+        if (signo == SIGALRM) {
+-               fh=fileno (child_process);
++               if (child_process)
++                       fh=fileno (child_process);
+                if(fh >= 0){
+                        kill (childpid[fh], SIGKILL);
+                }
diff --git a/web/attachments/176602-nagios-plugins-1.4.3-Makefile.in-mathlib.diff b/web/attachments/176602-nagios-plugins-1.4.3-Makefile.in-mathlib.diff
new file mode 100644
index 0000000..bd97a71
--- /dev/null
+++ b/web/attachments/176602-nagios-plugins-1.4.3-Makefile.in-mathlib.diff
@@ -0,0 +1,19 @@
+*** nagios-plugins-1.4.3/plugins/Makefile.in.orig       Tue May  2 18:20:40 2006
+--- nagios-plugins-1.4.3/plugins/Makefile.in    Tue May  2 18:41:19 2006
+***************
+*** 411,417 ****
+  ##############################################################################
+  # the actual targets
+  check_dig_LDADD = $(NETLIBS) runcmd.o 
+! check_disk_LDADD = $(BASEOBJS) popen.o
+  check_dns_LDADD = $(NETLIBS) runcmd.o
+  check_dummy_LDADD = $(BASEOBJS)
+  check_fping_LDADD = $(NETLIBS) popen.o
+--- 411,417 ----
+  ##############################################################################
+  # the actual targets
+  check_dig_LDADD = $(NETLIBS) runcmd.o 
+! check_disk_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
+  check_dns_LDADD = $(NETLIBS) runcmd.o
+  check_dummy_LDADD = $(BASEOBJS)
+  check_fping_LDADD = $(NETLIBS) popen.o
diff --git a/web/attachments/176994-check-smtp-ehlo.diff b/web/attachments/176994-check-smtp-ehlo.diff
new file mode 100644
index 0000000..d40329a
--- /dev/null
+++ b/web/attachments/176994-check-smtp-ehlo.diff
@@ -0,0 +1,43 @@
+Index: check_smtp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_smtp.c,v
+retrieving revision 1.50
+diff -u -r1.50 check_smtp.c
+--- check_smtp.c        2 Nov 2005 08:47:26 -0000       1.50
++++ check_smtp.c        6 May 2006 01:41:30 -0000
+@@ -270,6 +270,35 @@
+                  } else {
+                        ssl_established = 1;
+                  }
++
++               /*
++                * Resend the EHLO command.
++                *
++                * RFC 3207 (4.2) says: ``The client MUST discard any knowledge
++                * obtained from the server, such as the list of SMTP service
++                * extensions, which was not obtained from the TLS negotiation
++                * itself.  The client SHOULD send an EHLO command as the first
++                * command after a successful TLS negotiation.''  For this
++                * reason, some MTAs will not allow an AUTH LOGIN command before
++                * we resent EHLO via TLS.
++                */
++               if (my_send(helocmd, strlen(helocmd)) <= 0) {
++                       printf(_("SMTP UNKNOWN - Cannot send EHLO command via TLS.\n"));
++                       my_close();
++                       return STATE_UNKNOWN;
++               }
++               if (verbose)
++                       printf(_("sent %s"), helocmd);
++               if ((n = my_recv(buffer, MAX_INPUT_BUFFER - 1)) <= 0) {
++                       printf(_("SMTP UNKNOWN - Cannot read EHLO response via TLS.\n"));
++                       my_close();
++                       return STATE_UNKNOWN;
++               }
++               if (verbose) {
++                       buffer[n] = '\0';
++                       printf("%s", buffer);
++               }
++
+ #  ifdef USE_OPENSSL
+                  if ( check_cert ) {
+                    result = np_net_ssl_check_cert(days_till_exp);
diff --git a/web/attachments/177459-check_ntp.diff b/web/attachments/177459-check_ntp.diff
new file mode 100644
index 0000000..da11eb4
--- /dev/null
+++ b/web/attachments/177459-check_ntp.diff
@@ -0,0 +1,27 @@
+--- check_ntp   2006-04-28 07:19:01.546010471 +0200
++++ check_ntp.modified  2006-04-28 07:02:45.236824995 +0200
+@@ -56,6 +56,10 @@
+ # changed ntpdc to ntpq - jitter/dispersion is in milliseconds
+ #
+ # Patch for for regex for stratum1 refid.
++#
++# Script modified 2006 April 28 by Johan Nilsson (johan.nilsson@axis.com)
++#      o Modified script to handle case when ntpdate reports time, but ntpq times out
++#
+ 
+ require 5.004;
+ use POSIX;
+@@ -427,8 +431,11 @@
+ 
+ foreach my $key (keys %ERRORS) {
+        if ($state==$ERRORS{$key}) {
+-#              print ("NTP $key: $answer");
+-               print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 .     ",peer_stratum=$stratum\n");
++               if ( defined($jitter) ) {
++                       print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 .     ",peer_stratum=$stratum\n");
++               } else { 
++                       print ("NTP $key: $answer");
++               };
+                last;
+        }
+ }
diff --git a/web/attachments/178166-check_log_patch.txt b/web/attachments/178166-check_log_patch.txt
new file mode 100644
index 0000000..7debed7
--- /dev/null
+++ b/web/attachments/178166-check_log_patch.txt
@@ -0,0 +1,23 @@
+***************

+*** 198,207 ****

+  $DIFF $logfile $oldlog > $tempdiff

+

+  # Count the number of matching log entries we have

+! count=`$GREP -c "$query" $tempdiff`

+

+  # Get the last matching entry in the diff file

+! lastentry=`$GREP "$query" $tempdiff | $TAIL --lines=1`

+

+  $RM -f $tempdiff

+  $CAT $logfile > $oldlog

+--- 198,207 ----

+  $DIFF $logfile $oldlog > $tempdiff

+

+  # Count the number of matching log entries we have

+! count=`$GREP -c "^<.*$query" $tempdiff`

+

+  # Get the last matching entry in the diff file

+! lastentry=`$GREP "^<.*$query" $tempdiff | $TAIL --lines=1`

+

+  $RM -f $tempdiff

+  $CAT $logfile > $oldlog

diff --git a/web/attachments/178421-check_disk.c b/web/attachments/178421-check_disk.c
new file mode 100644
index 0000000..a46ceb6
--- /dev/null
+++ b/web/attachments/178421-check_disk.c
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378822012" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378822012" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378822012" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378822012" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378822012');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1485816&group_id=29880&atid=397597&file_id=178421"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/178627-nagios-plugins-HEAD-200605181152-bugreport.tar.gz b/web/attachments/178627-nagios-plugins-HEAD-200605181152-bugreport.tar.gz
new file mode 100644
index 0000000..976d2c4
--- /dev/null
+++ b/web/attachments/178627-nagios-plugins-HEAD-200605181152-bugreport.tar.gz
diff --git a/web/attachments/178637-check_disk.c b/web/attachments/178637-check_disk.c
new file mode 100644
index 0000000..b4c2b1d
--- /dev/null
+++ b/web/attachments/178637-check_disk.c
@@ -0,0 +1,874 @@
+/******************************************************************************
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id: check_disk.c,v 1.65m 2006/03/27 08:19:01 maemigh Exp $
+ 
+*****************************************************************************/
+
+const char *progname = "check_disk";
+const char *program_name = "check_disk";  /* Required for coreutils libs */
+const char *revision = "$Revision: 1.65.1 maemigh $";
+const char *copyright = "1999-2005";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+ /*
+  * Additional inode code by Jorgen Lundman <lundman@lundman.net>
+  */
+
+
+#include "common.h"
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <assert.h>
+#include "popen.h"
+#include "utils.h"
+#include <stdarg.h>
+#include "../lib/fsusage.h"
+#include "../lib/mountlist.h"
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+/* If nonzero, show even filesystems with zero size or
+   uninteresting types. */
+static int show_all_fs = 1;
+
+/* If nonzero, show only local filesystems.  */
+static int show_local_fs = 0;
+
+/* If nonzero, show output in HTML format. */
+static int show_html = 0;
+
+/* If nonzero, output percent of space and inodes USED rather than percent free */
+static int show_used = 0;
+
+/* If positive, the units to use when printing sizes;
+   if negative, the human-readable base.  */
+/* static int output_block_size; */
+
+/* If nonzero, invoke the `sync' system call before getting any usage data.
+   Using this option can make df very slow, especially with many or very
+   busy disks.  Note that this may make a difference on some systems --
+   SunOs4.1.3, for one.  It is *not* necessary on Linux.  */
+/* static int require_sync = 0; */
+
+/* A filesystem type to display. */
+
+struct name_list
+{
+  char *name;
+  int exclude;
+  int found;
+  int foundexact;
+  int found_len;
+  uintmax_t w_df;
+  uintmax_t c_df;
+  double w_dfp;
+  double c_dfp;
+  double w_idfp;
+  double c_idfp;
+  struct name_list *name_next;
+};
+
+/* Linked list of filesystem types to display.
+   If `fs_select_list' is NULL, list all types.
+   This table is generated dynamically from command-line options,
+   rather than hardcoding into the program what it thinks are the
+   valid filesystem types; let the user specify any filesystem type
+   they want to, and if there are any filesystems of that type, they
+   will be shown.
+
+   Some filesystem types:
+   4.2 4.3 ufs nfs swap ignore io vm efs dbg */
+
+/* static struct name_list *fs_select_list; */
+
+/* Linked list of filesystem types to omit.
+   If the list is empty, don't exclude any types.  */
+
+static struct name_list *fs_exclude_list;
+
+static struct name_list *dp_exclude_list;
+
+static struct name_list *path_select_list;
+
+static struct name_list *dev_select_list;
+
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
+/* For long options that have no equivalent short option, use a
+   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
+enum
+{
+  SYNC_OPTION = CHAR_MAX + 1,
+  NO_SYNC_OPTION,
+  BLOCK_SIZE_OPTION
+};
+
+#ifdef _AIX
+ #pragma alloca
+#endif
+
+int process_arguments (int, char **);
+void print_path (const char *mypath);
+int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
+int check_disk (double usp, uintmax_t free_disk, double uisp);
+int walk_name_list (struct name_list *list, const char *name);
+void print_help (void);
+void print_usage (void);
+
+uintmax_t w_df = 0;
+uintmax_t c_df = 0;
+double w_dfp = -1.0;
+double c_dfp = -1.0;
+double w_idfp = -1.0;
+double c_idfp = -1.0;
+char *path;
+char *exclude_device;
+char *units;
+uintmax_t mult = 1024 * 1024;
+int verbose = 0;
+int erronly = FALSE;
+int display_mntp = FALSE;
+int longest_length = 0;
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
+
+
+int
+main (int argc, char **argv)
+{
+  double usp = -1.0, uisp = -1.0;
+  int result = STATE_UNKNOWN;
+  int disk_result = STATE_UNKNOWN;
+  char file_system[MAX_INPUT_BUFFER];
+  char *output;
+  char *details;
+  char *perf;
+  uintmax_t psize;
+  float free_space, free_space_pct, total_space, inode_space_pct;
+
+  struct mount_entry *me;
+  struct fs_usage fsp;
+  struct name_list *temp_list;
+
+  output = strdup (" - free space:");
+  details = strdup ("");
+  perf = strdup ("");
+
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  mount_list = read_filesystem_list (0);
+
+  if (process_arguments (argc, argv) == ERROR)
+    usage4 (_("Could not parse arguments"));
+
+  /* if a list of paths has been selected, preseed the list with
+   * the longest matching filesystem name by iterating across
+   * the mountlist once ahead of time.  this will allow a query on
+   * "/var/log" to return information about "/var" if no "/var/log"
+   * filesystem exists, etc.  this is the default behavior already
+   * with df-based checks, but for systems with their own space
+   * checking routines, this should make them more consistent.
+   *
+   * Also keep track of the longest path that will be displayed
+   * in order to format in HTML.
+   */
+  
+  /* The walk_name_list function will keep track of longest_length */
+  if(path_select_list){
+    for (me = mount_list; me; me = me->me_next) {
+        walk_name_list(path_select_list, me->me_devname);
+        walk_name_list(path_select_list, me->me_mountdir);
+    }
+  }
+  /* Longest length is only kept track of when the list passed is NOT
+   * and exclude list. Thus we must verify the longest path that
+   * will be displayed in the output.
+   */ 
+  else {
+     for (me = mount_list; me; me = me->me_next) {
+        if(!walk_name_list(fs_exclude_list, me->me_type) && 
+           !walk_name_list(dp_exclude_list, me->me_devname) &&
+           !walk_name_list(dp_exclude_list, me->me_mountdir)) {
+             get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+             if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+               if (!strcmp(file_system, "none") || display_mntp) {
+                  if(strlen(me->me_devname) > longest_length) longest_length = strlen(me->me_devname);
+               } else {
+                  if(strlen(me->me_mountdir) > longest_length) longest_length = strlen(me->me_mountdir);
+               }
+             }
+        }
+     }
+  }
+    /* now pretend we never saw anything, but keep found_len.
+     * thus future searches will only match the best match */
+    for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next){
+      temp_list->found=0;
+    } 
+
+  /* for every mount entry */
+  for (me = mount_list; me; me = me->me_next) {
+    /* if there's a list of paths to select, the current mount
+     * entry matches in path or device name, get fs usage */
+    if (path_select_list && 
+        (walk_name_list(path_select_list, me->me_devname) ||
+         walk_name_list(path_select_list, me->me_mountdir))) {
+           get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+    /* else if there's a list of paths/devices to select (but
+     * we didn't match above) skip to the next mount entry */
+    } else if (dev_select_list || path_select_list) {
+      continue;
+    /* skip remote filesystems if we're not interested in them */
+    } else if (me->me_remote && show_local_fs) {
+      continue;
+    /* skip pseudo fs's if we haven't asked for all fs's */
+    } else if (me->me_dummy && !show_all_fs) {
+      continue;
+    /* skip excluded fstypes */
+    } else if (fs_exclude_list && walk_name_list (fs_exclude_list, me->me_type)) {
+      continue;
+    /* skip excluded fs's */  
+    } else if (dp_exclude_list && 
+             (walk_name_list (dp_exclude_list, me->me_devname) ||
+              walk_name_list (dp_exclude_list, me->me_mountdir))) {
+      continue;
+    /* otherwise, get fs usage */
+    } else {
+      get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+    }
+    if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+      usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
+                        uisp = (double)(fsp.fsu_files - fsp.fsu_ffree) * 100 / fsp.fsu_files;
+      disk_result = check_disk (usp, fsp.fsu_bavail, uisp);
+
+
+      result = max_state (disk_result, result);
+      psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+
+
+                        /* Moved this computation up here so we can add it
+                         * to perf */
+                        inode_space_pct = (float)fsp.fsu_ffree*100/fsp.fsu_files;
+
+      asprintf (&perf, "%s %s", perf,
+                perfdata ((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                          psize-(fsp.fsu_bavail*fsp.fsu_blocksize/mult), units,
+                          TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
+                          TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
+                                            TRUE, inode_space_pct,
+
+                          TRUE, psize));
+      if (disk_result==STATE_OK && erronly && !verbose)
+        continue;
+
+      free_space = (float)fsp.fsu_bavail*fsp.fsu_blocksize/mult;
+      free_space_pct = (float)fsp.fsu_bavail*100/fsp.fsu_blocks;
+      total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+      if (disk_result!=STATE_OK || verbose>=0) {
+        if (show_html == 1) {
+          int x = 0;
+          int delta_len = (longest_length - strlen((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir));
+          for(x=delta_len; x >= 0; x--) {
+             if((!strcmp(file_system, "none") || display_mntp)) strcat(me->me_devname, " ");
+             else strcat(me->me_mountdir, " ");
+          }
+          asprintf (&output, ("%s <br/>%s %6.0f %s (%3.0f%% inode=%3.0f%%);"),
+                  output,
+                  (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                  free_space,
+                  units,
+                  (show_used == 1) ? 100-free_space_pct : free_space_pct,
+                  (show_used == 1) ? 100-inode_space_pct : inode_space_pct);
+        } else {
+          asprintf (&output, ("%s %s %.0f %s (%.0f%% inode=%.0f%%);"),
+                  output,
+                  (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                  free_space,
+                  units,
+                  (show_used == 1) ? 100-free_space_pct : free_space_pct,
+                  (show_used == 1) ? 100-inode_space_pct : inode_space_pct);
+        }
+      }
+      asprintf (&details, _("%s\n\
+%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
+                details, free_space, total_space, units, free_space_pct, inode_space_pct,
+                me->me_devname, me->me_type, me->me_mountdir,
+                (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
+
+    }
+
+  }
+
+  if (verbose > 2)
+    asprintf (&output, "%s%s", output, details);
+
+  /* Override result if paths specified and not found */
+  temp_list = path_select_list;
+  while (temp_list) {
+    if (!temp_list->found) {
+      asprintf (&output, _("%s [%s not found]"), output, temp_list->name);
+      result = STATE_CRITICAL;
+    }
+    temp_list = temp_list->name_next;
+  }
+  if (show_html == 1) 
+     printf ("<pre>DISK %s%s|%s\n", state_text (result), output, perf);
+  else 
+     printf ("DISK %s%s|%s\n", state_text (result), output, perf);
+  return result;
+}
+
+
+
+/* process command-line arguments */
+int
+process_arguments (int argc, char **argv)
+{
+  int c;
+  struct name_list *se;
+  struct name_list **pathtail = &path_select_list;
+  struct name_list **fstail = &fs_exclude_list;
+  struct name_list **dptail = &dp_exclude_list;
+  struct name_list *temp_list;
+  int result = OK;
+  struct stat *stat_buf;
+
+  unsigned long l;
+
+  int option = 0;
+  static struct option longopts[] = {
+    {"timeout", required_argument, 0, 't'},
+    {"warning", required_argument, 0, 'w'},
+    {"critical", required_argument, 0, 'c'},
+    {"iwarning", required_argument, 0, 'W'},
+    /* Dang, -C is taken. We might want to reshuffle this. */
+    {"icritical", required_argument, 0, 'K'},
+    {"local", required_argument, 0, 'l'},
+    {"kilobytes", required_argument, 0, 'k'},
+    {"megabytes", required_argument, 0, 'm'},
+    {"units", required_argument, 0, 'u'},
+    {"path", required_argument, 0, 'p'},
+    {"partition", required_argument, 0, 'p'},
+    {"exclude_device", required_argument, 0, 'x'},
+    {"exclude_path", required_argument, 0, 's'},
+    {"exclude-type", required_argument, 0, 'X'},
+    {"mountpoint", no_argument, 0, 'M'},
+    {"errors-only", no_argument, 0, 'e'},
+    {"verbose", no_argument, 0, 'v'},
+    {"quiet", no_argument, 0, 'q'},
+    {"clear", no_argument, 0, 'C'},
+    {"version", no_argument, 0, 'V'},
+    {"help", no_argument, 0, 'h'},
+    {"html", no_argument, 0, 'H'},
+    {"used", no_argument, 0, 'U'},
+    {0, 0, 0, 0}
+  };
+
+  if (argc < 2)
+    return ERROR;
+
+  se = (struct name_list *) malloc (sizeof (struct name_list));
+  se->name = strdup ("iso9660");
+  se->name_next = NULL;
+  se->found = 0;
+  se->foundexact = 0;
+  se->exclude = 0;
+  se->found_len = 0;
+  *fstail = se;
+  fstail = &se->name_next;
+  for (c = 1; c < argc; c++)
+    if (strcmp ("-to", argv[c]) == 0)
+      strcpy (argv[c], "-t");
+
+  while (1) {
+    c = getopt_long (argc, argv, "+?VqhHiUveCt:c:w:K:W:u:p:x:s:X:mklM", longopts, &option);
+
+    if (c == -1 || c == EOF)
+      break;
+
+    switch (c) {
+    case 't':                 /* timeout period */
+      if (is_integer (optarg)) {
+        timeout_interval = atoi (optarg);
+        break;
+      }
+      else {
+        usage2 (_("Timeout interval must be a positive integer"), optarg);
+      }
+    case 'w':                 /* warning threshold */
+      if (is_intnonneg (optarg)) {
+        w_df = atoi (optarg);
+        break;
+      }
+      else if (strpbrk (optarg, ",:") &&
+               strstr (optarg, "%") &&
+               sscanf (optarg, "%lu%*[:,]%lf%%", &l, &w_dfp) == 2) {
+        w_df = (uintmax_t)l;
+        break;
+      }
+      else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_dfp) == 1) {
+        break;
+      }
+      else {
+        usage4 (_("Warning threshold must be integer or percentage!"));
+      }
+    case 'c':                 /* critical threshold */
+      if (is_intnonneg (optarg)) {
+        c_df = atoi (optarg);
+        break;
+      }
+      else if (strpbrk (optarg, ",:") &&
+               strstr (optarg, "%") &&
+               sscanf (optarg, "%lu%*[,:]%lf%%", &l, &c_dfp) == 2) {
+        c_df = (uintmax_t)l;
+        break;
+      }
+      else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_dfp) == 1) {
+        break;
+      }
+      else {
+        usage4 (_("Critical threshold must be integer or percentage!"));
+      }
+
+
+                case 'W':                                                                       /* warning inode threshold */
+                        if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_idfp) == 1) {
+                        break;
+                        }
+                        else {
+                      usage (_("Warning inode threshold must be percentage!\n"));
+                  }
+                case 'K':                                                                       /* kritical inode threshold */
+                        if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_idfp) == 1) {
+                        break;
+                        }
+                        else {
+                      usage (_("Critical inode threshold must be percentage!\n"));
+                       }
+    case 'u':
+      if (units)
+        free(units);
+      if (! strcmp (optarg, "bytes")) {
+        mult = (uintmax_t)1;
+        units = strdup ("B");
+      } else if (! strcmp (optarg, "kB")) {
+        mult = (uintmax_t)1024;
+        units = strdup ("kB");
+      } else if (! strcmp (optarg, "MB")) {
+        mult = (uintmax_t)1024 * 1024;
+        units = strdup ("MB");
+      } else if (! strcmp (optarg, "GB")) {
+        mult = (uintmax_t)1024 * 1024 * 1024;
+        units = strdup ("GB");
+      } else if (! strcmp (optarg, "TB")) {
+        mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
+        units = strdup ("TB");
+      } else {
+        die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+      }
+      if (units == NULL)
+        die (STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
+      break;
+    case 'k': /* display mountpoint */
+      mult = 1024;
+      if (units)
+        free(units);
+      units = strdup ("kB");
+      break;
+    case 'm': /* display mountpoint */
+      mult = 1024 * 1024;
+      if (units)
+        free(units);
+      units = strdup ("MB");
+      break;
+    case 'l':
+      show_local_fs = 1;      
+      break;
+    case 'p':                 /* select path */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+      se->w_df = w_df;
+      se->c_df = c_df;
+      se->w_dfp = w_dfp;
+      se->c_dfp = c_dfp;
+      se->w_idfp = w_idfp;
+      se->c_idfp = c_idfp;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 0;
+      *pathtail = se;
+      pathtail = &se->name_next;
+      break;
+    case 'x':                 /* exclude path or partition */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 1;
+      *dptail = se;
+      dptail = &se->name_next;
+      break;
+    case 's':                 /* exclude path or partition */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 2;
+      *dptail = se;
+      dptail = &se->name_next;
+      break;
+    case 'X':                 /* exclude file system type */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      *fstail = se;
+      fstail = &se->name_next;
+      break;
+    case 'v':                 /* verbose */
+      verbose++;
+      break;
+    case 'q':                 /* verbose */
+      verbose--;
+      break;
+    case 'e':
+      erronly = TRUE;
+      break;
+    case 'M': /* display mountpoint */
+      display_mntp = TRUE;
+      break;
+    case 'C':
+      w_df = 0;
+      c_df = 0;
+      w_dfp = -1.0;
+      c_dfp = -1.0;
+      w_idfp = -1.0;
+      c_idfp = -1.0;
+      break;
+    case 'H':                 /* HTML formatted output */
+      show_html = 1;
+      break;
+    case 'U':
+      show_used = 1;
+      break;
+    case 'V':                 /* version */
+      print_revision (progname, revision);
+      exit (STATE_OK);
+    case 'h':                 /* help */
+      print_help ();
+      exit (STATE_OK);
+    case '?':                 /* help */
+      usage (_("Unknown argument"));
+    }
+  }
+
+  /* Support for "check_disk warn crit [fs]" with thresholds at used level */
+  c = optind;
+  if (w_dfp < 0 && argc > c && is_intnonneg (argv[c]))
+    w_dfp = (100.0 - atof (argv[c++]));
+
+  if (c_dfp < 0 && argc > c && is_intnonneg (argv[c]))
+    c_dfp = (100.0 - atof (argv[c++]));
+
+  if (argc > c && path == NULL) {
+    se = (struct name_list *) malloc (sizeof (struct name_list));
+    se->name = strdup (argv[c++]);
+    se->name_next = NULL;
+    se->w_df = w_df;
+    se->c_df = c_df;
+    se->w_dfp = w_dfp;
+    se->c_dfp = c_dfp;
+    se->w_idfp = w_idfp;
+    se->c_idfp = c_idfp;
+    se->found =0;
+    se->foundexact = 0;
+    se->found_len = 0;
+    se->exclude = 0;
+    *pathtail = se;
+  }
+
+  if (path_select_list) {
+    temp_list = path_select_list;
+    stat_buf = malloc(sizeof *stat_buf);
+    while (temp_list) {
+      /* Stat each entry to check that dir exists */
+      if (stat (temp_list->name, &stat_buf[0])) {
+        printf("DISK %s - ", _("CRITICAL"));
+        die (STATE_CRITICAL, _("%s does not exist\n"), temp_list->name);
+      }
+      if (validate_arguments (temp_list->w_df,
+                              temp_list->c_df,
+                              temp_list->w_dfp,
+                              temp_list->c_dfp,
+                              temp_list->w_idfp,
+                              temp_list->c_idfp,
+                              temp_list->name) == ERROR)
+        result = ERROR;
+      temp_list = temp_list->name_next;
+    }
+    free(stat_buf);
+    return result;
+  } else {
+    return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL);
+  }
+}
+
+
+
+void
+print_path (const char *mypath) 
+{
+  if (mypath == NULL)
+    printf ("\n");
+  else
+    printf (_(" for %s\n"), mypath);
+
+  return;
+}
+
+
+
+int
+validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath)
+{
+  if (w < 0 && c < 0 && wp < 0.0 && cp < 0.0) {
+    printf (_("INPUT ERROR: No thresholds specified"));
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((wp >= 0.0 || cp >= 0.0) &&
+           (wp < 0.0 || cp < 0.0 || wp > 100.0 || cp > 100.0 || cp > wp)) {
+    printf (_("\
+INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be between zero and 100 percent, inclusive"),
+            cp, wp);
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((iwp >= 0.0 || icp >= 0.0) &&
+           (iwp < 0.0 || icp < 0.0 || iwp > 100.0 || icp > 100.0 || icp > iwp)) {
+    printf (_("\
+INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both should be between zero and 100 percent, inclusive"),
+            icp, iwp);
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((w > 0 || c > 0) && (w == 0 || c == 0 || c > w)) {
+    printf (_("\
+INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greater than zero"),
+            (unsigned long)c, (unsigned long)w);
+    print_path (mypath);
+    return ERROR;
+  }
+  
+  if (units == NULL) {
+    units = strdup ("MB");
+    mult = (uintmax_t)1024 * 1024;
+  }
+  return OK;
+}
+
+
+
+int
+
+check_disk (double usp, uintmax_t free_disk, double uisp)
+{
+       int result = STATE_UNKNOWN;
+       /* check the percent used space against thresholds */
+       if (usp >= 0.0 && c_dfp >=0.0 && usp >= (100.0 - c_dfp))
+               result = STATE_CRITICAL;
+       else if (uisp >= 0.0 && c_idfp >=0.0 && uisp >= (100.0 - c_idfp))
+               result = STATE_CRITICAL;
+       else if (c_df > 0 && free_disk <= c_df)
+               result = STATE_CRITICAL;
+       else if (usp >= 0.0 && w_dfp >=0.0 && usp >= (100.0 - w_dfp))
+               result = STATE_WARNING;
+       else if (uisp >= 0.0 && w_idfp >=0.0 && uisp >= (100.0 - w_idfp))
+               result = STATE_WARNING;
+       else if (w_df > 0 && free_disk <= w_df)
+               result = STATE_WARNING;
+       else if (usp >= 0.0)
+    result = STATE_OK;
+  return result;
+}
+
+
+
+int
+walk_name_list (struct name_list *list, const char *name)
+{
+  int foundexact = FALSE, foundmatch = FALSE;
+  int name_len;
+  name_len = strlen(name);
+  while (list) {
+    int list_name_len;
+    list_name_len = strlen(list->name);
+    if ((list->exclude == 1 && name_len == list_name_len && strncmp(list->name, name, list_name_len-1) == 0) ||
+       (list->foundexact == 0 && list->exclude == 0 && name_len < list_name_len && strncmp(list->name, name, name_len-1) == 0) ||
+       (list->exclude == 0 && name_len == list_name_len && strncmp(list->name, name, name_len-1) == 0) ||
+       (list->exclude == 2 && name_len >= list_name_len && strncmp(list->name, name, list_name_len-1) == 0)) {
+      /* Set to -1 for now to note it was a potential match.  If an EXACT match is found later,
+         then reset this found to 0.  If not, set it to 1. */
+      list->found = -1;
+      list->found_len = name_len;
+      /* Grab the longest string length that is not being excluded in order to format HTML properly */
+      if (name_len > longest_length && list->exclude == 0) {longest_length = name_len;}
+      /* if required for name_lists that have not saved w_df, etc (eg exclude lists) */
+      if (list->w_df) w_df = list->w_df;
+      if (list->c_df) c_df = list->c_df;
+      if (list->w_dfp>=0.0) w_dfp = list->w_dfp;
+      if (list->c_dfp>=0.0) c_dfp = list->c_dfp;
+      if (name_len == list_name_len) {
+        foundexact=TRUE;
+        list->foundexact = TRUE; 
+        list->found = 1;
+      }
+      foundmatch = TRUE;
+    }
+    list = list->name_next;
+  }
+  /* Traverse the list again to reset the found variable properly */
+  while (list) {
+    if (list->found == -1 && foundexact == TRUE) list->found = 0;
+    if (list->found == -1 && foundexact == FALSE) list->found =1;
+    list = list->name_next;
+    printf("tried ");
+  }
+  return foundmatch;
+}
+
+
+
+void
+print_help (void)
+{
+  print_revision (progname, revision);
+
+  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+  printf (COPYRIGHT, copyright, email);
+
+  printf (_("This plugin checks the amount of used disk space on a mounted file system"));
+  printf (_("and generates an alert if free space is less than one of the threshold values"));
+
+  printf ("\n\n");
+
+  print_usage ();
+
+  printf (_(UT_HELP_VRSN));
+
+  printf (" %s\n", "-w, --warning=INTEGER");
+  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
+  printf (" %s\n", "-w, --warning=PERCENT%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
+  printf (" %s\n", "-W, --iwarning=PERCENT%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
+  printf (" %s\n", "-K, --icritical=PERCENT%");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
+  printf (" %s\n", "-c, --critical=INTEGER");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
+  printf (" %s\n", "-c, --critical=PERCENT%");
+  printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of disk space is free"));
+  printf (" %s\n", "-C, --clear");
+  printf ("    %s\n", _("Clear thresholds"));
+  printf (" %s\n", "-u, --units=STRING");
+  printf ("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
+  printf (" %s\n", "-k, --kilobytes");
+  printf ("    %s\n", _("Same as '--units kB'"));
+  printf (" %s\n", "-m, --megabytes");
+  printf ("    %s\n", _("Same as '--units MB'"));
+  printf (" %s\n", "-l, --local");
+  printf ("    %s\n", _("Only check local filesystems"));
+  printf (" %s\n", "-p, --path=PATH, --partition=PARTITION");
+  printf ("    %s\n", _("Path or partition (may be repeated)"));
+  printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
+  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
+  printf (" %s\n", "-s, --exclude_path=PATH <STRING>");
+  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
+  printf (" %s\n", _("-X, --exclude-type=TYPE <STRING>"));
+  printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
+  printf (" %s\n", "-m, --mountpoint");
+  printf ("    %s\n", _("Display the mountpoint instead of the partition"));
+  printf (" %s\n", "-e, --errors-only");
+  printf ("    %s\n", _("Display only devices/mountpoints with errors"));
+  printf (" %s\n", "-H, --html");
+  printf ("    %s\n", _("Output in HTML format"));
+  printf (" %s\n", "-U, --used");
+  printf ("    %s\n", _("Output percentage of space/inodes used rather than free"));
+  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (_(UT_VERBOSE));
+  printf ("\n");
+  printf ("%s\n", _("Examples:"));
+  printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
+  printf ("    %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
+  printf (_(UT_SUPPORT));
+}
+
+
+
+void
+print_usage (void)
+{
+  printf (_("Usage:"));
+  printf (" %s -w limit -c limit [-p path | -x device | -s path] [-t timeout]", progname);
+  printf ("[-m] [-e] [-W limit] [-K limit] [-H] [-U] [-v] [-q]\n");
+}
diff --git a/web/attachments/178709-check_disk.c b/web/attachments/178709-check_disk.c
new file mode 100644
index 0000000..0e97150
--- /dev/null
+++ b/web/attachments/178709-check_disk.c
@@ -0,0 +1,914 @@
+/******************************************************************************
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id: check_disk.c,v 1.65.3m 2006/05/20 21:34:01 maemigh Exp $
+ 
+*****************************************************************************/
+
+const char *progname = "check_disk";
+const char *program_name = "check_disk";  /* Required for coreutils libs */
+const char *revision = "$Revision: 1.65.3 maemigh $";
+const char *copyright = "1999-2005";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+ /*
+  * Additional inode code by Jorgen Lundman <lundman@lundman.net>
+  */
+
+
+#include "common.h"
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <assert.h>
+#include "popen.h"
+#include "utils.h"
+#include <stdarg.h>
+#include "../lib/fsusage.h"
+#include "../lib/mountlist.h"
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+/* If nonzero, show even filesystems with zero size or
+   uninteresting types. */
+static int show_all_fs = 1;
+
+/* If nonzero, show only local filesystems.  */
+static int show_local_fs = 0;
+
+/* If nonzero, show output in HTML format. */
+static int show_html = 0;
+
+/* If nonzero, output percent of space and inodes USED rather than percent free */
+static int show_used = 0;
+
+/* If zero, display all mounts even with -p specified */
+static int path_select_exclude_others = 1;
+
+/* If positive, the units to use when printing sizes;
+   if negative, the human-readable base.  */
+/* static int output_block_size; */
+
+/* If nonzero, invoke the `sync' system call before getting any usage data.
+   Using this option can make df very slow, especially with many or very
+   busy disks.  Note that this may make a difference on some systems --
+   SunOs4.1.3, for one.  It is *not* necessary on Linux.  */
+/* static int require_sync = 0; */
+
+/* A filesystem type to display. */
+
+struct name_list
+{
+  char *name;
+  int exclude;
+  int found;
+  int foundexact;
+  int found_len;
+  uintmax_t w_df;
+  uintmax_t c_df;
+  double w_dfp;
+  double c_dfp;
+  double w_idfp;
+  double c_idfp;
+  struct name_list *name_next;
+};
+
+/* Linked list of filesystem types to display.
+   If `fs_select_list' is NULL, list all types.
+   This table is generated dynamically from command-line options,
+   rather than hardcoding into the program what it thinks are the
+   valid filesystem types; let the user specify any filesystem type
+   they want to, and if there are any filesystems of that type, they
+   will be shown.
+
+   Some filesystem types:
+   4.2 4.3 ufs nfs swap ignore io vm efs dbg */
+
+/* static struct name_list *fs_select_list; */
+
+/* Linked list of filesystem types to omit.
+   If the list is empty, don't exclude any types.  */
+
+static struct name_list *fs_exclude_list;
+
+static struct name_list *dp_exclude_list;
+
+static struct name_list *path_select_list;
+
+static struct name_list *dev_select_list;
+
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
+/* For long options that have no equivalent short option, use a
+   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
+enum
+{
+  SYNC_OPTION = CHAR_MAX + 1,
+  NO_SYNC_OPTION,
+  BLOCK_SIZE_OPTION
+};
+
+#ifdef _AIX
+ #pragma alloca
+#endif
+
+int process_arguments (int, char **);
+void print_path (const char *mypath);
+int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
+int check_disk (double usp, uintmax_t free_disk, double uisp);
+int walk_name_list (struct name_list *list, const char *name);
+void print_help (void);
+void print_usage (void);
+
+uintmax_t w_df = 0;
+uintmax_t c_df = 0;
+double w_dfp = -1.0;
+double c_dfp = -1.0;
+double w_idfp = -1.0;
+double c_idfp = -1.0;
+uintmax_t dw_df = 0;
+uintmax_t dc_df = 0;
+double dw_dfp = -1.0;
+double dc_dfp = -1.0;
+double dw_idfp = -1.0;
+double dc_idfp = -1.0;
+
+char *path;
+char *exclude_device;
+char *units;
+uintmax_t mult = 1024 * 1024;
+int verbose = 0;
+int erronly = FALSE;
+int display_mntp = FALSE;
+int longest_length = 0;
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
+
+
+int
+main (int argc, char **argv)
+{
+  double usp = -1.0, uisp = -1.0;
+  int result = STATE_UNKNOWN;
+  int disk_result = STATE_UNKNOWN;
+  char file_system[MAX_INPUT_BUFFER];
+  char *output;
+  char *details;
+  char *perf;
+  uintmax_t psize;
+  float free_space, free_space_pct, total_space, inode_space_pct;
+
+  struct mount_entry *me;
+  struct fs_usage fsp;
+  struct name_list *temp_list;
+
+  output = strdup (" - free space:");
+  details = strdup ("");
+  perf = strdup ("");
+
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  mount_list = read_filesystem_list (0);
+
+  if (process_arguments (argc, argv) == ERROR)
+    usage4 (_("Could not parse arguments"));
+
+  /* if a list of paths has been selected, preseed the list with
+   * the longest matching filesystem name by iterating across
+   * the mountlist once ahead of time.  this will allow a query on
+   * "/var/log" to return information about "/var" if no "/var/log"
+   * filesystem exists, etc.  this is the default behavior already
+   * with df-based checks, but for systems with their own space
+   * checking routines, this should make them more consistent.
+   *
+   * Also keep track of the longest path that will be displayed
+   * in order to format in HTML.
+   */
+  
+  /* The walk_name_list function will keep track of longest_length */
+  if(path_select_list){
+    for (me = mount_list; me; me = me->me_next) {
+        walk_name_list(path_select_list, me->me_devname);
+        walk_name_list(path_select_list, me->me_mountdir);
+    }
+  }
+  /* Longest length is only kept track of when the list passed is NOT
+   * and exclude list. Thus we must verify the longest path that
+   * will be displayed in the output.
+   */ 
+  else {
+     for (me = mount_list; me; me = me->me_next) {
+        if(!walk_name_list(fs_exclude_list, me->me_type) && 
+           !walk_name_list(dp_exclude_list, me->me_devname) &&
+           !walk_name_list(dp_exclude_list, me->me_mountdir)) {
+             get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+             if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+               if (!strcmp(file_system, "none") || display_mntp) {
+                  if(strlen(me->me_devname) > longest_length) longest_length = strlen(me->me_devname);
+               } else {
+                  if(strlen(me->me_mountdir) > longest_length) longest_length = strlen(me->me_mountdir);
+               }
+             }
+        }
+     }
+  }
+    /* now pretend we never saw anything, but keep found_len.
+     * thus future searches will only match the best match */
+    for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next){
+      temp_list->found=0;
+    } 
+
+  /* for every mount entry */
+  for (me = mount_list; me; me = me->me_next) {
+    /* if there's a list of paths to select, the current mount
+     * entry matches in path or device name, get fs usage */
+    if (path_select_list && 
+        (walk_name_list(path_select_list, me->me_devname) ||
+         walk_name_list(path_select_list, me->me_mountdir))) {
+           get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+    /* else if there's a list of paths/devices to select (but
+     * we didn't match above) skip to the next mount entry */
+    } else if (dev_select_list || (path_select_list && path_select_exclude_others)) {
+      continue;
+    /* skip remote filesystems if we're not interested in them */
+    } else if (me->me_remote && show_local_fs) {
+      continue;
+    /* skip pseudo fs's if we haven't asked for all fs's */
+    } else if (me->me_dummy && !show_all_fs) {
+      continue;
+    /* skip excluded fstypes */
+    } else if (fs_exclude_list && walk_name_list (fs_exclude_list, me->me_type)) {
+      continue;
+    /* skip excluded fs's */  
+    } else if (dp_exclude_list && 
+             (walk_name_list (dp_exclude_list, me->me_devname) ||
+              walk_name_list (dp_exclude_list, me->me_mountdir))) {
+      continue;
+    /* otherwise, get fs usage */
+    } else {
+      /* Reset thresholds to defaults */
+      w_df = dw_df;
+      c_df = dc_df;
+      w_dfp = dw_dfp;
+      c_dfp = dc_dfp;
+      w_idfp = dw_idfp;
+      c_idfp = dc_idfp;
+      get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+    }
+    if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+      usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
+                        uisp = (double)(fsp.fsu_files - fsp.fsu_ffree) * 100 / fsp.fsu_files;
+      disk_result = check_disk (usp, fsp.fsu_bavail, uisp);
+
+
+      result = max_state (disk_result, result);
+      psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+
+
+                        /* Moved this computation up here so we can add it
+                         * to perf */
+                        inode_space_pct = (float)fsp.fsu_ffree*100/fsp.fsu_files;
+
+      asprintf (&perf, "%s %s", perf,
+                perfdata ((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                          psize-(fsp.fsu_bavail*fsp.fsu_blocksize/mult), units,
+                          TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
+                          TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
+                                            TRUE, inode_space_pct,
+
+                          TRUE, psize));
+      if (disk_result==STATE_OK && erronly && !verbose)
+        continue;
+
+      free_space = (float)fsp.fsu_bavail*fsp.fsu_blocksize/mult;
+      free_space_pct = (float)fsp.fsu_bavail*100/fsp.fsu_blocks;
+      total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+      if (disk_result!=STATE_OK || verbose>=0) {
+        if (show_html == 1) {
+          int x = 0;
+          int delta_len = (longest_length - strlen((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir));
+          for(x=delta_len; x >= 0; x--) {
+             if((!strcmp(file_system, "none") || display_mntp)) strcat(me->me_devname, " ");
+             else strcat(me->me_mountdir, " ");
+          }
+          asprintf (&output, ("%s <br/>%s%s %6.0f %s (%3.0f%% inode=%3.0f%%);%s"),
+                  output,
+                  (disk_result!=STATE_OK) ? "*" : " ",
+                  (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                  free_space,
+                  units,
+                  (show_used == 1) ? 100-free_space_pct : free_space_pct,
+                  (show_used == 1) ? 100-inode_space_pct : inode_space_pct,
+                  (disk_result!=STATE_OK) ? "*" : " ");
+        } else {
+          asprintf (&output, ("%s %s %.0f %s (%.0f%% inode=%.0f%%);"),
+                  output,
+                  (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                  free_space,
+                  units,
+                  (show_used == 1) ? 100-free_space_pct : free_space_pct,
+                  (show_used == 1) ? 100-inode_space_pct : inode_space_pct);
+        }
+      }
+      asprintf (&details, _("%s\n\
+%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
+                details, free_space, total_space, units, free_space_pct, inode_space_pct,
+                me->me_devname, me->me_type, me->me_mountdir,
+                (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
+
+    }
+
+  }
+
+  if (verbose > 2)
+    asprintf (&output, "%s%s", output, details);
+
+  /* Override result if paths specified and not found */
+  temp_list = path_select_list;
+  while (temp_list) {
+    if (!temp_list->found) {
+      asprintf (&output, _("%s [%s not found]"), output, temp_list->name);
+      result = STATE_CRITICAL;
+    }
+    temp_list = temp_list->name_next;
+  }
+  if (show_html == 1) 
+     printf ("<pre>DISK %s%s|%s\n", state_text (result), output, perf);
+  else 
+     printf ("DISK %s%s|%s\n", state_text (result), output, perf);
+  return result;
+}
+
+
+
+/* process command-line arguments */
+int
+process_arguments (int argc, char **argv)
+{
+  int c;
+  struct name_list *se;
+  struct name_list **pathtail = &path_select_list;
+  struct name_list **fstail = &fs_exclude_list;
+  struct name_list **dptail = &dp_exclude_list;
+  struct name_list *temp_list;
+  int result = OK;
+  struct stat *stat_buf;
+
+  unsigned long l;
+
+  int option = 0;
+  static struct option longopts[] = {
+    {"timeout", required_argument, 0, 't'},
+    {"warning", required_argument, 0, 'w'},
+    {"critical", required_argument, 0, 'c'},
+    {"iwarning", required_argument, 0, 'W'},
+    /* Dang, -C is taken. We might want to reshuffle this. */
+    {"icritical", required_argument, 0, 'K'},
+    {"local", required_argument, 0, 'l'},
+    {"kilobytes", required_argument, 0, 'k'},
+    {"megabytes", required_argument, 0, 'm'},
+    {"units", required_argument, 0, 'u'},
+    {"all", no_argument, 0, 'a'},
+    {"path", required_argument, 0, 'p'},
+    {"partition", required_argument, 0, 'p'},
+    {"exclude_device", required_argument, 0, 'x'},
+    {"exclude_path", required_argument, 0, 's'},
+    {"exclude-type", required_argument, 0, 'X'},
+    {"mountpoint", no_argument, 0, 'M'},
+    {"errors-only", no_argument, 0, 'e'},
+    {"verbose", no_argument, 0, 'v'},
+    {"quiet", no_argument, 0, 'q'},
+    {"clear", no_argument, 0, 'C'},
+    {"version", no_argument, 0, 'V'},
+    {"help", no_argument, 0, 'h'},
+    {"html", no_argument, 0, 'H'},
+    {"used", no_argument, 0, 'U'},
+    {0, 0, 0, 0}
+  };
+
+  if (argc < 2)
+    return ERROR;
+
+  se = (struct name_list *) malloc (sizeof (struct name_list));
+  se->name = strdup ("iso9660");
+  se->name_next = NULL;
+  se->found = 0;
+  se->foundexact = 0;
+  se->exclude = 0;
+  se->found_len = 0;
+  *fstail = se;
+  fstail = &se->name_next;
+  for (c = 1; c < argc; c++)
+    if (strcmp ("-to", argv[c]) == 0)
+      strcpy (argv[c], "-t");
+
+  while (1) {
+    c = getopt_long (argc, argv, "+?VqhHiUveCat:c:w:K:W:u:p:x:s:X:mklM", longopts, &option);
+
+    if (c == -1 || c == EOF)
+      break;
+
+    switch (c) {
+    case 't':                 /* timeout period */
+      if (is_integer (optarg)) {
+        timeout_interval = atoi (optarg);
+        break;
+      }
+      else {
+        usage2 (_("Timeout interval must be a positive integer"), optarg);
+      }
+    case 'w':                 /* warning threshold */
+      if (is_intnonneg (optarg)) {
+        w_df = atoi (optarg);
+        break;
+      }
+      else if (strpbrk (optarg, ",:") &&
+               strstr (optarg, "%") &&
+               sscanf (optarg, "%lu%*[:,]%lf%%", &l, &w_dfp) == 2) {
+        w_df = (uintmax_t)l;
+        break;
+      }
+      else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_dfp) == 1) {
+        break;
+      }
+      else {
+        usage4 (_("Warning threshold must be integer or percentage!"));
+      }
+    case 'c':                 /* critical threshold */
+      if (is_intnonneg (optarg)) {
+        c_df = atoi (optarg);
+        break;
+      }
+      else if (strpbrk (optarg, ",:") &&
+               strstr (optarg, "%") &&
+               sscanf (optarg, "%lu%*[,:]%lf%%", &l, &c_dfp) == 2) {
+        c_df = (uintmax_t)l;
+        break;
+      }
+      else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_dfp) == 1) {
+        break;
+      }
+      else {
+        usage4 (_("Critical threshold must be integer or percentage!"));
+      }
+
+
+                case 'W':                                                                       /* warning inode threshold */
+                        if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_idfp) == 1) {
+                        break;
+                        }
+                        else {
+                      usage (_("Warning inode threshold must be percentage!\n"));
+                  }
+                case 'K':                                                                       /* kritical inode threshold */
+                        if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_idfp) == 1) {
+                        break;
+                        }
+                        else {
+                      usage (_("Critical inode threshold must be percentage!\n"));
+                       }
+    case 'u':
+      if (units)
+        free(units);
+      if (! strcmp (optarg, "bytes")) {
+        mult = (uintmax_t)1;
+        units = strdup ("B");
+      } else if (! strcmp (optarg, "kB")) {
+        mult = (uintmax_t)1024;
+        units = strdup ("kB");
+      } else if (! strcmp (optarg, "MB")) {
+        mult = (uintmax_t)1024 * 1024;
+        units = strdup ("MB");
+      } else if (! strcmp (optarg, "GB")) {
+        mult = (uintmax_t)1024 * 1024 * 1024;
+        units = strdup ("GB");
+      } else if (! strcmp (optarg, "TB")) {
+        mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
+        units = strdup ("TB");
+      } else {
+        die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+      }
+      if (units == NULL)
+        die (STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
+      break;
+    case 'k': /* display mountpoint */
+      mult = 1024;
+      if (units)
+        free(units);
+      units = strdup ("kB");
+      break;
+    case 'm': /* display mountpoint */
+      mult = 1024 * 1024;
+      if (units)
+        free(units);
+      units = strdup ("MB");
+      break;
+    case 'l':
+      show_local_fs = 1;      
+      break;
+    case 'a':                 /* Choose all paths */
+      /* Remember the values passed in for all paths */
+      path_select_exclude_others=0;
+      dw_df = w_df;
+      dc_df = c_df;
+      dw_dfp = w_dfp;
+      dc_dfp = c_dfp;
+      dw_idfp = w_idfp;
+      dc_idfp = c_idfp;
+      break;
+    case 'p':                 /* select path */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+      se->w_df = w_df;
+      se->c_df = c_df;
+      se->w_dfp = w_dfp;
+      se->c_dfp = c_dfp;
+      se->w_idfp = w_idfp;
+      se->c_idfp = c_idfp;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 0;
+      *pathtail = se;
+      pathtail = &se->name_next;
+      break;
+    case 'x':                 /* exclude path or partition */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 1;
+      *dptail = se;
+      dptail = &se->name_next;
+      break;
+    case 's':                 /* exclude path or partition */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 2;
+      *dptail = se;
+      dptail = &se->name_next;
+      break;
+    case 'X':                 /* exclude file system type */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      *fstail = se;
+      fstail = &se->name_next;
+      break;
+    case 'v':                 /* verbose */
+      verbose++;
+      break;
+    case 'q':                 /* verbose */
+      verbose--;
+      break;
+    case 'e':
+      erronly = TRUE;
+      break;
+    case 'M': /* display mountpoint */
+      display_mntp = TRUE;
+      break;
+    case 'C':
+      w_df = 0;
+      c_df = 0;
+      w_dfp = -1.0;
+      c_dfp = -1.0;
+      w_idfp = -1.0;
+      c_idfp = -1.0;
+      break;
+    case 'H':                 /* HTML formatted output */
+      show_html = 1;
+      break;
+    case 'U':
+      show_used = 1;
+      break;
+    case 'V':                 /* version */
+      print_revision (progname, revision);
+      exit (STATE_OK);
+    case 'h':                 /* help */
+      print_help ();
+      exit (STATE_OK);
+    case '?':                 /* help */
+      usage (_("Unknown argument"));
+    }
+  }
+
+  /* Support for "check_disk warn crit [fs]" with thresholds at used level */
+  c = optind;
+  if (w_dfp < 0 && argc > c && is_intnonneg (argv[c]))
+    w_dfp = (100.0 - atof (argv[c++]));
+
+  if (c_dfp < 0 && argc > c && is_intnonneg (argv[c]))
+    c_dfp = (100.0 - atof (argv[c++]));
+
+  if (argc > c && path == NULL) {
+    se = (struct name_list *) malloc (sizeof (struct name_list));
+    se->name = strdup (argv[c++]);
+    se->name_next = NULL;
+    se->w_df = w_df;
+    se->c_df = c_df;
+    se->w_dfp = w_dfp;
+    se->c_dfp = c_dfp;
+    se->w_idfp = w_idfp;
+    se->c_idfp = c_idfp;
+    se->found =0;
+    se->foundexact = 0;
+    se->found_len = 0;
+    se->exclude = 0;
+    *pathtail = se;
+  }
+
+  /* Remember the default values */
+      w_df = 0;
+      c_df = 0;
+      w_dfp = -1.0;
+      c_dfp = -1.0;
+      w_idfp = -1.0;
+      c_idfp = -1.0;
+
+  if (path_select_list) {
+    temp_list = path_select_list;
+    stat_buf = malloc(sizeof *stat_buf);
+    while (temp_list) {
+      /* Stat each entry to check that dir exists */
+      if (stat (temp_list->name, &stat_buf[0])) {
+        printf("DISK %s - ", _("CRITICAL"));
+        die (STATE_CRITICAL, _("%s does not exist\n"), temp_list->name);
+      }
+      if (validate_arguments (temp_list->w_df,
+                              temp_list->c_df,
+                              temp_list->w_dfp,
+                              temp_list->c_dfp,
+                              temp_list->w_idfp,
+                              temp_list->c_idfp,
+                              temp_list->name) == ERROR)
+        result = ERROR;
+      temp_list = temp_list->name_next;
+    }
+    free(stat_buf);
+    return result;
+  } else {
+    return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL);
+  }
+}
+
+
+
+void
+print_path (const char *mypath) 
+{
+  if (mypath == NULL)
+    printf ("\n");
+  else
+    printf (_(" for %s\n"), mypath);
+
+  return;
+}
+
+
+
+int
+validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath)
+{
+  if (w < 0 && c < 0 && wp < 0.0 && cp < 0.0) {
+    printf (_("INPUT ERROR: No thresholds specified"));
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((wp >= 0.0 || cp >= 0.0) &&
+           (wp < 0.0 || cp < 0.0 || wp > 100.0 || cp > 100.0 || cp > wp)) {
+    printf (_("\
+INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be between zero and 100 percent, inclusive"),
+            cp, wp);
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((iwp >= 0.0 || icp >= 0.0) &&
+           (iwp < 0.0 || icp < 0.0 || iwp > 100.0 || icp > 100.0 || icp > iwp)) {
+    printf (_("\
+INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both should be between zero and 100 percent, inclusive"),
+            icp, iwp);
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((w > 0 || c > 0) && (w == 0 || c == 0 || c > w)) {
+    printf (_("\
+INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greater than zero"),
+            (unsigned long)c, (unsigned long)w);
+    print_path (mypath);
+    return ERROR;
+  }
+  
+  if (units == NULL) {
+    units = strdup ("MB");
+    mult = (uintmax_t)1024 * 1024;
+  }
+  return OK;
+}
+
+
+
+int
+
+check_disk (double usp, uintmax_t free_disk, double uisp)
+{
+       int result = STATE_UNKNOWN;
+       /* check the percent used space against thresholds */
+       if (usp >= 0.0 && c_dfp >=0.0 && usp >= (100.0 - c_dfp))
+               result = STATE_CRITICAL;
+       else if (uisp >= 0.0 && c_idfp >=0.0 && uisp >= (100.0 - c_idfp))
+               result = STATE_CRITICAL;
+       else if (c_df > 0 && free_disk <= c_df)
+               result = STATE_CRITICAL;
+       else if (usp >= 0.0 && w_dfp >=0.0 && usp >= (100.0 - w_dfp))
+               result = STATE_WARNING;
+       else if (uisp >= 0.0 && w_idfp >=0.0 && uisp >= (100.0 - w_idfp))
+               result = STATE_WARNING;
+       else if (w_df > 0 && free_disk <= w_df)
+               result = STATE_WARNING;
+       else if (usp >= 0.0)
+    result = STATE_OK;
+  return result;
+}
+
+
+
+int
+walk_name_list (struct name_list *list, const char *name)
+{
+  int foundexact = FALSE, foundmatch = FALSE;
+  int name_len;
+  name_len = strlen(name);
+  while (list) {
+    int list_name_len;
+    list_name_len = strlen(list->name);
+    if ((list->exclude == 1 && name_len == list_name_len && strncmp(list->name, name, list_name_len-1) == 0) ||
+       (list->foundexact == 0 && list->exclude == 0 && name_len < list_name_len && strncmp(list->name, name, name_len-1) == 0) ||
+       (list->exclude == 0 && name_len == list_name_len && strncmp(list->name, name, name_len-1) == 0) ||
+       (list->exclude == 2 && name_len >= list_name_len && strncmp(list->name, name, list_name_len-1) == 0)) {
+      /* Set to -1 for now to note it was a potential match.  If an EXACT match is found later,
+         then reset this found to 0.  If not, set it to 1. */
+      list->found = -1;
+      list->found_len = name_len;
+      /* Grab the longest string length that is not being excluded in order to format HTML properly */
+      if (name_len > longest_length && list->exclude == 0) {longest_length = name_len;}
+      /* if required for name_lists that have not saved w_df, etc (eg exclude lists) */
+      if (list->w_df) w_df = list->w_df;
+      if (list->c_df) c_df = list->c_df;
+      if (list->w_dfp>=0.0) w_dfp = list->w_dfp;
+      if (list->c_dfp>=0.0) c_dfp = list->c_dfp;
+      if (name_len == list_name_len) {
+        foundexact=TRUE;
+        list->foundexact = TRUE; 
+        list->found = 1;
+      }
+      foundmatch = TRUE;
+    }
+    list = list->name_next;
+  }
+  /* Traverse the list again to reset the found variable properly */
+  while (list) {
+    if (list->found == -1 && foundexact == TRUE) list->found = 0;
+    if (list->found == -1 && foundexact == FALSE) list->found =1;
+    list = list->name_next;
+    printf("tried ");
+  }
+  return foundmatch;
+}
+
+
+
+void
+print_help (void)
+{
+  print_revision (progname, revision);
+
+  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+  printf (COPYRIGHT, copyright, email);
+
+  printf (_("This plugin checks the amount of used disk space on a mounted file system"));
+  printf (_("and generates an alert if free space is less than one of the threshold values"));
+
+  printf ("\n\n");
+
+  print_usage ();
+
+  printf (_(UT_HELP_VRSN));
+
+  printf (" %s\n", "-w, --warning=INTEGER");
+  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
+  printf (" %s\n", "-w, --warning=PERCENT%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
+  printf (" %s\n", "-W, --iwarning=PERCENT%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
+  printf (" %s\n", "-K, --icritical=PERCENT%");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
+  printf (" %s\n", "-c, --critical=INTEGER");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
+  printf (" %s\n", "-c, --critical=PERCENT%");
+  printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of disk space is free"));
+  printf (" %s\n", "-C, --clear");
+  printf ("    %s\n", _("Clear thresholds"));
+  printf (" %s\n", "-u, --units=STRING");
+  printf ("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
+  printf (" %s\n", "-k, --kilobytes");
+  printf ("    %s\n", _("Same as '--units kB'"));
+  printf (" %s\n", "-m, --megabytes");
+  printf ("    %s\n", _("Same as '--units MB'"));
+  printf (" %s\n", "-l, --local");
+  printf ("    %s\n", _("Only check local filesystems"));
+  printf (" %s\n", "-p, --path=PATH, --partition=PARTITION");
+  printf ("    %s\n", _("Path or partition (may be repeated)"));
+  printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
+  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
+  printf (" %s\n", "-s, --exclude_path=PATH <STRING>");
+  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
+  printf (" %s\n", _("-X, --exclude-type=TYPE <STRING>"));
+  printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
+  printf (" %s\n", "-m, --mountpoint");
+  printf ("    %s\n", _("Display the mountpoint instead of the partition"));
+  printf (" %s\n", "-e, --errors-only");
+  printf ("    %s\n", _("Display only devices/mountpoints with errors"));
+  printf (" %s\n", "-H, --html");
+  printf ("    %s\n", _("Output in HTML format"));
+  printf (" %s\n", "-U, --used");
+  printf ("    %s\n", _("Output percentage of space/inodes used rather than free"));
+  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (_(UT_VERBOSE));
+  printf ("\n");
+  printf ("%s\n", _("Examples:"));
+  printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
+  printf ("    %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
+  printf (" %s\n", "check_disk -w 10% -c 5% -a -C -w 5% -c 3% -p /");
+  printf ("    %s\n", _("Checks / at 5% and 3% and every other mount at 10% and 5%"));
+  printf (_(UT_SUPPORT));
+}
+
+
+
+void
+print_usage (void)
+{
+  printf (_("Usage:"));
+  printf (" %s -w limit -c limit [-a | -p path | -x device | -s path] [-t timeout]", progname);
+  printf ("[-m] [-e] [-W limit] [-K limit] [-H] [-U] [-v] [-q]\n");
+}
diff --git a/web/attachments/178761-nagiosplug-check_dhcp-ifnamsiz.patch b/web/attachments/178761-nagiosplug-check_dhcp-ifnamsiz.patch
new file mode 100644
index 0000000..ccfb9b5
--- /dev/null
+++ b/web/attachments/178761-nagiosplug-check_dhcp-ifnamsiz.patch
@@ -0,0 +1,15 @@
+diff -ru nagios-plugins-1.4.3.orig/plugins-root/check_dhcp.c nagios-plugins-1.4.3/plugins-root/check_dhcp.c
+--- nagios-plugins-1.4.3.orig/plugins-root/check_dhcp.c 2005-09-21 12:06:37.000000000 +0200
++++ nagios-plugins-1.4.3/plugins-root/check_dhcp.c      2006-05-21 15:40:27.000000000 +0200
+@@ -192,7 +192,11 @@
+ 
+ unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH]="";
+ 
++#if IFNAMSIZ > 8
++char network_interface_name[IFNAMSIZ]="eth0";
++#else
+ char network_interface_name[8]="eth0";
++#endif
+ 
+ u_int32_t packet_xid=0;
+ 
diff --git a/web/attachments/178818-check_disk.c b/web/attachments/178818-check_disk.c
new file mode 100644
index 0000000..bad05fb
--- /dev/null
+++ b/web/attachments/178818-check_disk.c
@@ -0,0 +1,916 @@
+/******************************************************************************
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id: check_disk.c,v 1.65.4m 2006/05/20 21:34:01 maemigh Exp $
+ 
+*****************************************************************************/
+
+const char *progname = "check_disk";
+const char *program_name = "check_disk";  /* Required for coreutils libs */
+const char *revision = "$Revision: 1.65.4 maemigh $";
+const char *copyright = "1999-2005";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+ /*
+  * Additional inode code by Jorgen Lundman <lundman@lundman.net>
+  */
+
+
+#include "common.h"
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <assert.h>
+#include "popen.h"
+#include "utils.h"
+#include <stdarg.h>
+#include "../lib/fsusage.h"
+#include "../lib/mountlist.h"
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+/* If nonzero, show even filesystems with zero size or
+   uninteresting types. */
+static int show_all_fs = 1;
+
+/* If nonzero, show only local filesystems.  */
+static int show_local_fs = 0;
+
+/* If nonzero, show output in HTML format. */
+static int show_html = 0;
+
+/* If nonzero, output percent of space and inodes USED rather than percent free */
+static int show_used = 0;
+
+/* If zero, display all mounts even with -p specified */
+static int path_select_exclude_others = 1;
+
+/* If positive, the units to use when printing sizes;
+   if negative, the human-readable base.  */
+/* static int output_block_size; */
+
+/* If nonzero, invoke the `sync' system call before getting any usage data.
+   Using this option can make df very slow, especially with many or very
+   busy disks.  Note that this may make a difference on some systems --
+   SunOs4.1.3, for one.  It is *not* necessary on Linux.  */
+/* static int require_sync = 0; */
+
+/* A filesystem type to display. */
+
+struct name_list
+{
+  char *name;
+  int exclude;
+  int found;
+  int foundexact;
+  int found_len;
+  uintmax_t w_df;
+  uintmax_t c_df;
+  double w_dfp;
+  double c_dfp;
+  double w_idfp;
+  double c_idfp;
+  struct name_list *name_next;
+};
+
+/* Linked list of filesystem types to display.
+   If `fs_select_list' is NULL, list all types.
+   This table is generated dynamically from command-line options,
+   rather than hardcoding into the program what it thinks are the
+   valid filesystem types; let the user specify any filesystem type
+   they want to, and if there are any filesystems of that type, they
+   will be shown.
+
+   Some filesystem types:
+   4.2 4.3 ufs nfs swap ignore io vm efs dbg */
+
+/* static struct name_list *fs_select_list; */
+
+/* Linked list of filesystem types to omit.
+   If the list is empty, don't exclude any types.  */
+
+static struct name_list *fs_exclude_list;
+
+static struct name_list *dp_exclude_list;
+
+static struct name_list *path_select_list;
+
+static struct name_list *dev_select_list;
+
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
+/* For long options that have no equivalent short option, use a
+   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
+enum
+{
+  SYNC_OPTION = CHAR_MAX + 1,
+  NO_SYNC_OPTION,
+  BLOCK_SIZE_OPTION
+};
+
+#ifdef _AIX
+ #pragma alloca
+#endif
+
+int process_arguments (int, char **);
+void print_path (const char *mypath);
+int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
+int check_disk (double usp, uintmax_t free_disk, double uisp);
+int walk_name_list (struct name_list *list, const char *name);
+void print_help (void);
+void print_usage (void);
+
+uintmax_t w_df = 0;
+uintmax_t c_df = 0;
+double w_dfp = -1.0;
+double c_dfp = -1.0;
+double w_idfp = -1.0;
+double c_idfp = -1.0;
+uintmax_t dw_df = 0;
+uintmax_t dc_df = 0;
+double dw_dfp = -1.0;
+double dc_dfp = -1.0;
+double dw_idfp = -1.0;
+double dc_idfp = -1.0;
+
+char *path;
+char *exclude_device;
+char *units;
+uintmax_t mult = 1024 * 1024;
+int verbose = 0;
+int erronly = FALSE;
+int display_mntp = FALSE;
+int longest_length = 0;
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
+
+
+int
+main (int argc, char **argv)
+{
+  double usp = -1.0, uisp = -1.0;
+  int result = STATE_UNKNOWN;
+  int disk_result = STATE_UNKNOWN;
+  char file_system[MAX_INPUT_BUFFER];
+  char *output;
+  char *details;
+  char *perf;
+  uintmax_t psize;
+  float free_space, free_space_pct, total_space, inode_space_pct;
+
+  struct mount_entry *me;
+  struct fs_usage fsp;
+  struct name_list *temp_list;
+
+  output = strdup (" - free space:");
+  details = strdup ("");
+  perf = strdup ("");
+
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  mount_list = read_filesystem_list (0);
+
+  if (process_arguments (argc, argv) == ERROR)
+    usage4 (_("Could not parse arguments"));
+
+  /* if a list of paths has been selected, preseed the list with
+   * the longest matching filesystem name by iterating across
+   * the mountlist once ahead of time.  this will allow a query on
+   * "/var/log" to return information about "/var" if no "/var/log"
+   * filesystem exists, etc.  this is the default behavior already
+   * with df-based checks, but for systems with their own space
+   * checking routines, this should make them more consistent.
+   *
+   * Also keep track of the longest path that will be displayed
+   * in order to format in HTML.
+   */
+  
+  /* The walk_name_list function will keep track of longest_length */
+  if(path_select_list){
+    for (me = mount_list; me; me = me->me_next) {
+        walk_name_list(path_select_list, me->me_devname);
+        walk_name_list(path_select_list, me->me_mountdir);
+    }
+  }
+  /* Longest length is only kept track of when the list passed is NOT
+   * and exclude list. Thus we must verify the longest path that
+   * will be displayed in the output.
+   */ 
+  else {
+     for (me = mount_list; me; me = me->me_next) {
+        if(!walk_name_list(fs_exclude_list, me->me_type) && 
+           !walk_name_list(dp_exclude_list, me->me_devname) &&
+           !walk_name_list(dp_exclude_list, me->me_mountdir)) {
+             get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+             if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+               if (!strcmp(file_system, "none") || display_mntp) {
+                  if(strlen(me->me_devname) > longest_length) longest_length = strlen(me->me_devname);
+               } else {
+                  if(strlen(me->me_mountdir) > longest_length) longest_length = strlen(me->me_mountdir);
+               }
+             }
+        }
+     }
+  }
+    /* now pretend we never saw anything, but keep found_len.
+     * thus future searches will only match the best match */
+    for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next){
+      temp_list->found=0;
+    } 
+
+  /* for every mount entry */
+  for (me = mount_list; me; me = me->me_next) {
+    /* if there's a list of paths to select, the current mount
+     * entry matches in path or device name, get fs usage */
+    if (path_select_list && 
+        (walk_name_list(path_select_list, me->me_devname) ||
+         walk_name_list(path_select_list, me->me_mountdir))) {
+           get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+    /* else if there's a list of paths/devices to select (but
+     * we didn't match above) skip to the next mount entry */
+    } else if (dev_select_list || (path_select_list && path_select_exclude_others == 1)) {
+      continue;
+    /* skip remote filesystems if we're not interested in them */
+    } else if (me->me_remote && show_local_fs) {
+      continue;
+    /* skip pseudo fs's if we haven't asked for all fs's */
+    } else if (me->me_dummy && !show_all_fs) {
+      continue;
+    /* skip excluded fstypes */
+    } else if (fs_exclude_list && walk_name_list (fs_exclude_list, me->me_type)) {
+      continue;
+    /* skip excluded fs's */  
+    } else if (dp_exclude_list && 
+             (walk_name_list (dp_exclude_list, me->me_devname) ||
+              walk_name_list (dp_exclude_list, me->me_mountdir))) {
+      continue;
+    /* otherwise, get fs usage */
+    } else {
+      /* Reset thresholds to defaults */
+           w_df = dw_df;
+           c_df = dc_df;
+           w_dfp = dw_dfp;
+           c_dfp = dc_dfp;
+           w_idfp = dw_idfp;
+           c_idfp = dc_idfp;
+      get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+    }
+    if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+      usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
+                        uisp = (double)(fsp.fsu_files - fsp.fsu_ffree) * 100 / fsp.fsu_files;
+      disk_result = check_disk (usp, fsp.fsu_bavail, uisp);
+
+
+      result = max_state (disk_result, result);
+      psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+
+
+                        /* Moved this computation up here so we can add it
+                         * to perf */
+                        inode_space_pct = (float)fsp.fsu_ffree*100/fsp.fsu_files;
+
+      asprintf (&perf, "%s %s", perf,
+                perfdata ((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                          psize-(fsp.fsu_bavail*fsp.fsu_blocksize/mult), units,
+                          TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
+                          TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
+                                            TRUE, inode_space_pct,
+
+                          TRUE, psize));
+      if (disk_result==STATE_OK && erronly && !verbose)
+        continue;
+
+      free_space = (float)fsp.fsu_bavail*fsp.fsu_blocksize/mult;
+      free_space_pct = (float)fsp.fsu_bavail*100/fsp.fsu_blocks;
+      total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+      if (disk_result!=STATE_OK || verbose>=0) {
+        if (show_html == 1) {
+          int x = 0;
+          int delta_len = (longest_length - strlen((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir));
+          for(x=delta_len; x >= 0; x--) {
+             if((!strcmp(file_system, "none") || display_mntp)) strcat(me->me_devname, " ");
+             else strcat(me->me_mountdir, " ");
+          }
+          asprintf (&output, ("%s <br/>%s%s %6.0f %s (%3.0f%% inode=%3.0f%%);%s"),
+                  output,
+                  (disk_result!=STATE_OK) ? "*" : " ",
+                  (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                  free_space,
+                  units,
+                  (show_used == 1) ? 100-free_space_pct : free_space_pct,
+                  (show_used == 1) ? 100-inode_space_pct : inode_space_pct,
+                  (disk_result!=STATE_OK) ? "*" : " ");
+        } else {
+          asprintf (&output, ("%s %s %.0f %s (%.0f%% inode=%.0f%%);"),
+                  output,
+                  (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                  free_space,
+                  units,
+                  (show_used == 1) ? 100-free_space_pct : free_space_pct,
+                  (show_used == 1) ? 100-inode_space_pct : inode_space_pct);
+        }
+      }
+      asprintf (&details, _("%s\n\
+%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
+                details, free_space, total_space, units, free_space_pct, inode_space_pct,
+                me->me_devname, me->me_type, me->me_mountdir,
+                (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
+
+    }
+
+  }
+
+  if (verbose > 2)
+    asprintf (&output, "%s%s", output, details);
+
+  /* Override result if paths specified and not found */
+  temp_list = path_select_list;
+  while (temp_list) {
+    if (!temp_list->found) {
+      asprintf (&output, _("%s [%s not found]"), output, temp_list->name);
+      result = STATE_CRITICAL;
+    }
+    temp_list = temp_list->name_next;
+  }
+  if (show_html == 1) 
+     printf ("<pre>DISK %s%s|%s\n", state_text (result), output, perf);
+  else 
+     printf ("DISK %s%s|%s\n", state_text (result), output, perf);
+  return result;
+}
+
+
+
+/* process command-line arguments */
+int
+process_arguments (int argc, char **argv)
+{
+  int c;
+  struct name_list *se;
+  struct name_list **pathtail = &path_select_list;
+  struct name_list **fstail = &fs_exclude_list;
+  struct name_list **dptail = &dp_exclude_list;
+  struct name_list *temp_list;
+  int result = OK;
+  struct stat *stat_buf;
+
+  unsigned long l;
+
+  int option = 0;
+  static struct option longopts[] = {
+    {"timeout", required_argument, 0, 't'},
+    {"warning", required_argument, 0, 'w'},
+    {"critical", required_argument, 0, 'c'},
+    {"iwarning", required_argument, 0, 'W'},
+    /* Dang, -C is taken. We might want to reshuffle this. */
+    {"icritical", required_argument, 0, 'K'},
+    {"local", required_argument, 0, 'l'},
+    {"kilobytes", required_argument, 0, 'k'},
+    {"megabytes", required_argument, 0, 'm'},
+    {"units", required_argument, 0, 'u'},
+    {"all", no_argument, 0, 'a'},
+    {"path", required_argument, 0, 'p'},
+    {"partition", required_argument, 0, 'p'},
+    {"exclude_device", required_argument, 0, 'x'},
+    {"exclude_path", required_argument, 0, 's'},
+    {"exclude-type", required_argument, 0, 'X'},
+    {"mountpoint", no_argument, 0, 'M'},
+    {"errors-only", no_argument, 0, 'e'},
+    {"verbose", no_argument, 0, 'v'},
+    {"quiet", no_argument, 0, 'q'},
+    {"clear", no_argument, 0, 'C'},
+    {"version", no_argument, 0, 'V'},
+    {"help", no_argument, 0, 'h'},
+    {"html", no_argument, 0, 'H'},
+    {"used", no_argument, 0, 'U'},
+    {0, 0, 0, 0}
+  };
+
+  if (argc < 2)
+    return ERROR;
+
+  se = (struct name_list *) malloc (sizeof (struct name_list));
+  se->name = strdup ("iso9660");
+  se->name_next = NULL;
+  se->found = 0;
+  se->foundexact = 0;
+  se->exclude = 0;
+  se->found_len = 0;
+  *fstail = se;
+  fstail = &se->name_next;
+  for (c = 1; c < argc; c++)
+    if (strcmp ("-to", argv[c]) == 0)
+      strcpy (argv[c], "-t");
+
+  while (1) {
+    c = getopt_long (argc, argv, "+?VqhHiUveCat:c:w:K:W:u:p:x:s:X:mklM", longopts, &option);
+
+    if (c == -1 || c == EOF)
+      break;
+
+    switch (c) {
+    case 't':                 /* timeout period */
+      if (is_integer (optarg)) {
+        timeout_interval = atoi (optarg);
+        break;
+      }
+      else {
+        usage2 (_("Timeout interval must be a positive integer"), optarg);
+      }
+    case 'w':                 /* warning threshold */
+      if (is_intnonneg (optarg)) {
+        w_df = atoi (optarg);
+        break;
+      }
+      else if (strpbrk (optarg, ",:") &&
+               strstr (optarg, "%") &&
+               sscanf (optarg, "%lu%*[:,]%lf%%", &l, &w_dfp) == 2) {
+        w_df = (uintmax_t)l;
+        break;
+      }
+      else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_dfp) == 1) {
+        break;
+      }
+      else {
+        usage4 (_("Warning threshold must be integer or percentage!"));
+      }
+    case 'c':                 /* critical threshold */
+      if (is_intnonneg (optarg)) {
+        c_df = atoi (optarg);
+        break;
+      }
+      else if (strpbrk (optarg, ",:") &&
+               strstr (optarg, "%") &&
+               sscanf (optarg, "%lu%*[,:]%lf%%", &l, &c_dfp) == 2) {
+        c_df = (uintmax_t)l;
+        break;
+      }
+      else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_dfp) == 1) {
+        break;
+      }
+      else {
+        usage4 (_("Critical threshold must be integer or percentage!"));
+      }
+
+
+                case 'W':                                                                       /* warning inode threshold */
+                        if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_idfp) == 1) {
+                        break;
+                        }
+                        else {
+                      usage (_("Warning inode threshold must be percentage!\n"));
+                  }
+                case 'K':                                                                       /* kritical inode threshold */
+                        if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_idfp) == 1) {
+                        break;
+                        }
+                        else {
+                      usage (_("Critical inode threshold must be percentage!\n"));
+                       }
+    case 'u':
+      if (units)
+        free(units);
+      if (! strcmp (optarg, "bytes")) {
+        mult = (uintmax_t)1;
+        units = strdup ("B");
+      } else if (! strcmp (optarg, "kB")) {
+        mult = (uintmax_t)1024;
+        units = strdup ("kB");
+      } else if (! strcmp (optarg, "MB")) {
+        mult = (uintmax_t)1024 * 1024;
+        units = strdup ("MB");
+      } else if (! strcmp (optarg, "GB")) {
+        mult = (uintmax_t)1024 * 1024 * 1024;
+        units = strdup ("GB");
+      } else if (! strcmp (optarg, "TB")) {
+        mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
+        units = strdup ("TB");
+      } else {
+        die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+      }
+      if (units == NULL)
+        die (STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
+      break;
+    case 'k': /* display mountpoint */
+      mult = 1024;
+      if (units)
+        free(units);
+      units = strdup ("kB");
+      break;
+    case 'm': /* display mountpoint */
+      mult = 1024 * 1024;
+      if (units)
+        free(units);
+      units = strdup ("MB");
+      break;
+    case 'l':
+      show_local_fs = 1;      
+      break;
+    case 'a':                 /* Choose all paths */
+      /* Remember the values passed in for all paths */
+      path_select_exclude_others=0;
+      dw_df = w_df;
+      dc_df = c_df;
+      dw_dfp = w_dfp;
+      dc_dfp = c_dfp;
+      dw_idfp = w_idfp;
+      dc_idfp = c_idfp;
+      break;
+    case 'p':                 /* select path */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+      se->w_df = w_df;
+      se->c_df = c_df;
+      se->w_dfp = w_dfp;
+      se->c_dfp = c_dfp;
+      se->w_idfp = w_idfp;
+      se->c_idfp = c_idfp;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 0;
+      *pathtail = se;
+      pathtail = &se->name_next;
+      break;
+    case 'x':                 /* exclude path or partition */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 1;
+      *dptail = se;
+      dptail = &se->name_next;
+      break;
+    case 's':                 /* exclude path or partition */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      se->exclude = 2;
+      *dptail = se;
+      dptail = &se->name_next;
+      break;
+    case 'X':                 /* exclude file system type */
+      se = (struct name_list *) malloc (sizeof (struct name_list));
+      se->name = optarg;
+      se->name_next = NULL;
+                        /* If you don't clear the w_fd etc values here, they
+                         * get processed when you walk the list and assigned
+                         * to the global w_df!
+                         */
+                        se->w_df = 0;
+                        se->c_df = 0;
+                        se->w_dfp = 0;
+                        se->c_dfp = 0;
+                        se->w_idfp = 0;
+                        se->c_idfp = 0;
+      se->found = 0;
+      se->foundexact = 0;
+      se->found_len = 0;
+      *fstail = se;
+      fstail = &se->name_next;
+      break;
+    case 'v':                 /* verbose */
+      verbose++;
+      break;
+    case 'q':                 /* verbose */
+      verbose--;
+      break;
+    case 'e':
+      erronly = TRUE;
+      break;
+    case 'M': /* display mountpoint */
+      display_mntp = TRUE;
+      break;
+    case 'C':
+      w_df = 0;
+      c_df = 0;
+      w_dfp = -1.0;
+      c_dfp = -1.0;
+      w_idfp = -1.0;
+      c_idfp = -1.0;
+      break;
+    case 'H':                 /* HTML formatted output */
+      show_html = 1;
+      break;
+    case 'U':
+      show_used = 1;
+      break;
+    case 'V':                 /* version */
+      print_revision (progname, revision);
+      exit (STATE_OK);
+    case 'h':                 /* help */
+      print_help ();
+      exit (STATE_OK);
+    case '?':                 /* help */
+      usage (_("Unknown argument"));
+    }
+  }
+
+  /* Support for "check_disk warn crit [fs]" with thresholds at used level */
+  c = optind;
+  if (w_dfp < 0 && argc > c && is_intnonneg (argv[c]))
+    w_dfp = (100.0 - atof (argv[c++]));
+
+  if (c_dfp < 0 && argc > c && is_intnonneg (argv[c]))
+    c_dfp = (100.0 - atof (argv[c++]));
+
+  if (argc > c && path == NULL) {
+    se = (struct name_list *) malloc (sizeof (struct name_list));
+    se->name = strdup (argv[c++]);
+    se->name_next = NULL;
+    se->w_df = w_df;
+    se->c_df = c_df;
+    se->w_dfp = w_dfp;
+    se->c_dfp = c_dfp;
+    se->w_idfp = w_idfp;
+    se->c_idfp = c_idfp;
+    se->found =0;
+    se->foundexact = 0;
+    se->found_len = 0;
+    se->exclude = 0;
+    *pathtail = se;
+  }
+
+  /* Remember the default values */
+  if(path_select_exclude_others == 1) {
+      dw_df = w_df;
+      dc_df = c_df;
+      dw_dfp = w_dfp;
+      dc_dfp = c_dfp;
+      dw_idfp = w_idfp;
+      dc_idfp = c_idfp;
+  }
+
+  if (path_select_list) {
+    temp_list = path_select_list;
+    stat_buf = malloc(sizeof *stat_buf);
+    while (temp_list) {
+      /* Stat each entry to check that dir exists */
+      if (stat (temp_list->name, &stat_buf[0])) {
+        printf("DISK %s - ", _("CRITICAL"));
+        die (STATE_CRITICAL, _("%s does not exist\n"), temp_list->name);
+      }
+      if (validate_arguments (temp_list->w_df,
+                              temp_list->c_df,
+                              temp_list->w_dfp,
+                              temp_list->c_dfp,
+                              temp_list->w_idfp,
+                              temp_list->c_idfp,
+                              temp_list->name) == ERROR)
+        result = ERROR;
+      temp_list = temp_list->name_next;
+    }
+    free(stat_buf);
+    return result;
+  } else {
+    return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL);
+  }
+}
+
+
+
+void
+print_path (const char *mypath) 
+{
+  if (mypath == NULL)
+    printf ("\n");
+  else
+    printf (_(" for %s\n"), mypath);
+
+  return;
+}
+
+
+
+int
+validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath)
+{
+  if (w < 0 && c < 0 && wp < 0.0 && cp < 0.0) {
+    printf (_("INPUT ERROR: No thresholds specified"));
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((wp >= 0.0 || cp >= 0.0) &&
+           (wp < 0.0 || cp < 0.0 || wp > 100.0 || cp > 100.0 || cp > wp)) {
+    printf (_("\
+INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be between zero and 100 percent, inclusive"),
+            cp, wp);
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((iwp >= 0.0 || icp >= 0.0) &&
+           (iwp < 0.0 || icp < 0.0 || iwp > 100.0 || icp > 100.0 || icp > iwp)) {
+    printf (_("\
+INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both should be between zero and 100 percent, inclusive"),
+            icp, iwp);
+    print_path (mypath);
+    return ERROR;
+  }
+  else if ((w > 0 || c > 0) && (w == 0 || c == 0 || c > w)) {
+    printf (_("\
+INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greater than zero"),
+            (unsigned long)c, (unsigned long)w);
+    print_path (mypath);
+    return ERROR;
+  }
+  
+  if (units == NULL) {
+    units = strdup ("MB");
+    mult = (uintmax_t)1024 * 1024;
+  }
+  return OK;
+}
+
+
+
+int
+
+check_disk (double usp, uintmax_t free_disk, double uisp)
+{
+       int result = STATE_UNKNOWN;
+       /* check the percent used space against thresholds */
+       if (usp >= 0.0 && c_dfp >=0.0 && usp >= (100.0 - c_dfp))
+               result = STATE_CRITICAL;
+       else if (uisp >= 0.0 && c_idfp >=0.0 && uisp >= (100.0 - c_idfp))
+               result = STATE_CRITICAL;
+       else if (c_df > 0 && free_disk <= c_df)
+               result = STATE_CRITICAL;
+       else if (usp >= 0.0 && w_dfp >=0.0 && usp >= (100.0 - w_dfp))
+               result = STATE_WARNING;
+       else if (uisp >= 0.0 && w_idfp >=0.0 && uisp >= (100.0 - w_idfp))
+               result = STATE_WARNING;
+       else if (w_df > 0 && free_disk <= w_df)
+               result = STATE_WARNING;
+       else if (usp >= 0.0)
+    result = STATE_OK;
+  return result;
+}
+
+
+
+int
+walk_name_list (struct name_list *list, const char *name)
+{
+  int foundexact = FALSE, foundmatch = FALSE;
+  int name_len;
+  name_len = strlen(name);
+  while (list) {
+    int list_name_len;
+    list_name_len = strlen(list->name);
+    if ((list->exclude == 1 && name_len == list_name_len && strncmp(list->name, name, list_name_len-1) == 0) ||
+       (list->foundexact == 0 && list->exclude == 0 && name_len < list_name_len && strncmp(list->name, name, name_len-1) == 0) ||
+       (list->exclude == 0 && name_len == list_name_len && strncmp(list->name, name, name_len-1) == 0) ||
+       (list->exclude == 2 && name_len >= list_name_len && strncmp(list->name, name, list_name_len-1) == 0)) {
+      /* Set to -1 for now to note it was a potential match.  If an EXACT match is found later,
+         then reset this found to 0.  If not, set it to 1. */
+      list->found = -1;
+      list->found_len = name_len;
+      /* Grab the longest string length that is not being excluded in order to format HTML properly */
+      if (name_len > longest_length && list->exclude == 0) {longest_length = name_len;}
+      /* if required for name_lists that have not saved w_df, etc (eg exclude lists) */
+      if (list->w_df) w_df = list->w_df;
+      if (list->c_df) c_df = list->c_df;
+      if (list->w_dfp>=0.0) w_dfp = list->w_dfp;
+      if (list->c_dfp>=0.0) c_dfp = list->c_dfp;
+      if (name_len == list_name_len) {
+        foundexact=TRUE;
+        list->foundexact = TRUE; 
+        list->found = 1;
+      }
+      foundmatch = TRUE;
+    }
+    list = list->name_next;
+  }
+  /* Traverse the list again to reset the found variable properly */
+  while (list) {
+    if (list->found == -1 && foundexact == TRUE) list->found = 0;
+    if (list->found == -1 && foundexact == FALSE) list->found =1;
+    list = list->name_next;
+    printf("tried ");
+  }
+  return foundmatch;
+}
+
+
+
+void
+print_help (void)
+{
+  print_revision (progname, revision);
+
+  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+  printf (COPYRIGHT, copyright, email);
+
+  printf (_("This plugin checks the amount of used disk space on a mounted file system"));
+  printf (_("and generates an alert if free space is less than one of the threshold values"));
+
+  printf ("\n\n");
+
+  print_usage ();
+
+  printf (_(UT_HELP_VRSN));
+
+  printf (" %s\n", "-w, --warning=INTEGER");
+  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
+  printf (" %s\n", "-w, --warning=PERCENT%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
+  printf (" %s\n", "-W, --iwarning=PERCENT%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
+  printf (" %s\n", "-K, --icritical=PERCENT%");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
+  printf (" %s\n", "-c, --critical=INTEGER");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
+  printf (" %s\n", "-c, --critical=PERCENT%");
+  printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of disk space is free"));
+  printf (" %s\n", "-C, --clear");
+  printf ("    %s\n", _("Clear thresholds"));
+  printf (" %s\n", "-u, --units=STRING");
+  printf ("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
+  printf (" %s\n", "-k, --kilobytes");
+  printf ("    %s\n", _("Same as '--units kB'"));
+  printf (" %s\n", "-m, --megabytes");
+  printf ("    %s\n", _("Same as '--units MB'"));
+  printf (" %s\n", "-l, --local");
+  printf ("    %s\n", _("Only check local filesystems"));
+  printf (" %s\n", "-p, --path=PATH, --partition=PARTITION");
+  printf ("    %s\n", _("Path or partition (may be repeated)"));
+  printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
+  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
+  printf (" %s\n", "-s, --exclude_path=PATH <STRING>");
+  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
+  printf (" %s\n", _("-X, --exclude-type=TYPE <STRING>"));
+  printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
+  printf (" %s\n", "-m, --mountpoint");
+  printf ("    %s\n", _("Display the mountpoint instead of the partition"));
+  printf (" %s\n", "-e, --errors-only");
+  printf ("    %s\n", _("Display only devices/mountpoints with errors"));
+  printf (" %s\n", "-H, --html");
+  printf ("    %s\n", _("Output in HTML format"));
+  printf (" %s\n", "-U, --used");
+  printf ("    %s\n", _("Output percentage of space/inodes used rather than free"));
+  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (_(UT_VERBOSE));
+  printf ("\n");
+  printf ("%s\n", _("Examples:"));
+  printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
+  printf ("    %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
+  printf (" %s\n", "check_disk -w 10% -c 5% -a -C -w 5% -c 3% -p /");
+  printf ("    %s\n", _("Checks / at 5% and 3% and every other mount at 10% and 5%"));
+  printf (_(UT_SUPPORT));
+}
+
+
+
+void
+print_usage (void)
+{
+  printf (_("Usage:"));
+  printf (" %s -w limit -c limit [-a | -p path | -x device | -s path] [-t timeout]", progname);
+  printf ("[-m] [-e] [-W limit] [-K limit] [-H] [-U] [-v] [-q]\n");
+}
diff --git a/web/attachments/180341-nagios-plugins-1.4.3.ping_source_address.patch b/web/attachments/180341-nagios-plugins-1.4.3.ping_source_address.patch
new file mode 100644
index 0000000..1560a41
--- /dev/null
+++ b/web/attachments/180341-nagios-plugins-1.4.3.ping_source_address.patch
@@ -0,0 +1,114 @@
+diff -uNr nagios-plugins-1.4.3.old/plugins/check_ping.c nagios-plugins-1.4.3/plugins/check_ping.c
+--- nagios-plugins-1.4.3.old/plugins/check_ping.c       2006-03-13 06:08:28.000000000 -0500
++++ nagios-plugins-1.4.3/plugins/check_ping.c   2006-05-19 11:33:42.000000000 -0400
+@@ -50,6 +50,7 @@
+ float wrta = UNKNOWN_TRIP_TIME;
+ float crta = UNKNOWN_TRIP_TIME;
+ char **addresses = NULL;
++char *source_address;
+ int n_addresses = 0;
+ int max_addr = 1;
+ int max_packets = -1;
+@@ -67,6 +68,7 @@
+ {
+        char *cmd = NULL;
+        char *rawcmd = NULL;
++       char *ping_args = NULL;
+        int result = STATE_UNKNOWN;
+        int this_result = STATE_UNKNOWN;
+        int i;
+@@ -101,15 +103,28 @@
+                rawcmd = strdup(PING_COMMAND);
+ #endif
+ 
++               ping_args = strdup("");
++
++               /* Need to check ping -I in configure and enclose this in ifdef */
++               if (source_address != NULL) {
++                       ping_args = realloc (ping_args, 20 * sizeof(char));
++                       ping_args = strcat(ping_args, "-I ");
++                       ping_args = strncat(ping_args, source_address, 15 * sizeof(char));
++                       ping_args = strcat(ping_args, " ");
++               }
++
++               ping_args = realloc (ping_args, strlen(ping_args) + strlen(addresses[i]) + 1);
++               ping_args = strcat(ping_args, addresses[i]);
++
+                /* does the host address of number of packets argument come first? */
+ #ifdef PING_PACKETS_FIRST
+ # ifdef PING_HAS_TIMEOUT
+-               asprintf (&cmd, rawcmd, timeout_interval, max_packets, addresses[i]);
++               asprintf (&cmd, rawcmd, timeout_interval, max_packets, ping_args);
+ # else
+-               asprintf (&cmd, rawcmd, max_packets, addresses[i]);
++               asprintf (&cmd, rawcmd, max_packets, ping_args);
+ # endif
+ #else
+-               asprintf (&cmd, rawcmd, addresses[i], max_packets);
++               asprintf (&cmd, rawcmd, ping_args, max_packets);
+ #endif
+ 
+                if (verbose >= 2)
+@@ -150,6 +165,7 @@
+                        printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
+ 
+                result = max_state (result, this_result);
++               free (ping_args);
+                free (rawcmd);
+                free (cmd);
+        }
+@@ -170,6 +186,7 @@
+        static struct option longopts[] = {
+                STD_LONG_OPTS,
+                {"packets", required_argument, 0, 'p'},
++               {"source", required_argument, 0, 's'},
+                {"nohtml", no_argument, 0, 'n'},
+                {"link", no_argument, 0, 'L'},
+                {"use-ipv4", no_argument, 0, '4'},
+@@ -188,7 +205,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:s:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -245,6 +262,9 @@
+                        else
+                                usage2 (_("<max_packets> (%s) must be a non-negative number\n"), optarg);
+                        break;
++               case 's':       /* number of packets to send */
++                       source_address = strdup (optarg);
++                       break;
+                case 'n':       /* no HTML */
+                        display_html = FALSE;
+                        break;
+@@ -396,6 +416,11 @@
+                usage (_("You must specify a server address or host name"));
+        }
+ 
++       if (source_address != NULL) {
++               if (is_addr(source_address) == FALSE)
++                       usage2 (_("Invalid source address"), source_address);
++       }
++
+        return OK;
+ }
+ 
+@@ -535,6 +560,8 @@
+    critical threshold pair\n\
+ -p, --packets=INTEGER\n\
+    number of ICMP ECHO packets to send (Default: %d)\n\
++-s, --source=IP\n\
++   source address\n\
+ -L, --link\n\
+    show HTML in the plugin output (obsoleted by urlize)\n"),
+                DEFAULT_MAX_PACKETS);
+@@ -559,5 +586,5 @@
+ print_usage (void)
+ {
+        printf ("Usage: %s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
+-                     [-p packets] [-t timeout] [-L] [-4|-6]\n", progname);
++                     [-p packets] [-s source_address] [-t timeout] [-L] [-4|-6]\n", progname);
+ }
diff --git a/web/attachments/180350-check_rsync b/web/attachments/180350-check_rsync
new file mode 100644
index 0000000..b65a2fd
--- /dev/null
+++ b/web/attachments/180350-check_rsync
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-2 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378821899" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378821899" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378821899" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378821899" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378821899');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1499684&group_id=29880&atid=397599&file_id=180350"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/181129-check_rsync b/web/attachments/181129-check_rsync
new file mode 100644
index 0000000..e7537ee
--- /dev/null
+++ b/web/attachments/181129-check_rsync
@@ -0,0 +1,146 @@
+#! /usr/bin/perl -w
+#
+# check_rsync  -  Check Rsync and modules availability
+#
+# Copyright (C) 2006 Thomas Guyot-Sionnest <tguyot@gmail.com>
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+use POSIX;
+use strict;
+use Getopt::Long;
+
+# Make sure this module is installed or IPC::Cmd::run won't work as expected.
+require IPC::Run;
+
+use IPC::Cmd qw[run];
+use vars qw($opt_H $opt_p $opt_m);
+use vars qw($PROGNAME);
+use lib "/usr/local/nagios/libexec";
+use utils qw($TIMEOUT %ERRORS);
+
+$PROGNAME = "check_rsync";
+$ENV{'PATH'}='';
+$ENV{'BASH_ENV'}='';
+$ENV{'ENV'}='';
+
+Getopt::Long::Configure('bundling');
+GetOptions (
+        "H=s" => \$opt_H, "hostname=s" => \$opt_H,
+        "p=s" => \$opt_p, "port=s" => \$opt_p,
+        "m=s@" => \$opt_m, "module=s@" => \$opt_m );
+
+unless (defined($opt_H)){
+  print "Usage: $PROGNAME -H <host> [-p <port>] [-m <module>[,<user>,<password>] [-m <module>[,<user>,<password>]...]]\n";
+  exit $ERRORS{'UNKNOWN'};
+}
+
+my $host = $opt_H;
+my $port = defined($opt_p) ? $opt_p : 873;
+
+# Create an array for each -m arguments and store them in @modules
+my @modules;
+if (defined($opt_m)) {
+  for(@$opt_m) {
+    push @modules, [ split(/,/) ];
+  }
+}
+
+# Just in case of problems, let's not hang Nagios
+$SIG{'ALRM'} = sub {
+        print "CRITICAL: Rsync timed out\n";
+        exit $ERRORS{"CRITICAL"};
+};
+
+# Rsync arguments
+my $source = "rsync://$host";
+
+alarm($TIMEOUT);
+
+# Get a list of modules to see if rsync is up
+my $command = "/usr/bin/rsync --port=$port $source";
+my (undef, $error_code, undef, $stdout_buf, $stderr_buf ) =
+        run( command => $command, verbose => 0 );
+
+#Turn off alarm
+alarm(0);
+
+my $realerr = $error_code >> 8;
+report_error("Rsync command $command failed with error " . $realerr) if ($realerr != 0);
+
+# If one or more -m, check if these modules exists first...
+if (@modules) {
+
+  # IPC::Run have the bad habbit of randomly concatenating multiple lines
+  # in the same array element.
+  my @result;
+  for (@$stdout_buf) {
+    push(@result, split(/\n/));
+  }
+
+  foreach my $mod (@modules) {
+    my $match = 0;
+    for (@result) {
+      $match = 1 if (/^$$mod[0]\s/);
+    }
+    report_error("Module $$mod[0] not found") if ($match == 0);
+  }
+} else { # else just return OK
+  print "OK: Rsync is up\n";
+  exit $ERRORS{'OK'};
+}
+
+# Check each -m aruments...
+for my $arg (@modules) {
+  if (defined($$arg[1]) and defined($$arg[2])) {
+    $source = "rsync://$$arg[1]" . '@' . "$host/$$arg[0]";
+    $ENV{'RSYNC_PASSWORD'} = $$arg[2];
+  } else {
+    $source = "rsync://$host/$$arg[0]";
+  }
+
+  alarm($TIMEOUT);
+
+  # Get a file listing of the root of the module
+  undef $error_code; # Better safe than sorry...
+  $command = "/usr/bin/rsync --port=$port $source";
+  (undef, $error_code, undef, $stdout_buf, $stderr_buf ) =
+        run( command => $command, verbose => 0 );
+
+  #Turn off alarm
+  alarm(0);
+
+  $realerr = $error_code >> 8;
+  report_error("Rsync command failed on module $$arg[0] with error " . $realerr) if ($realerr != 0);
+}
+
+if (@modules > 0) {
+  print "OK: Rsync is up with ", scalar(@modules), " module tested\n" if (@modules == 1);
+  print "OK: Rsync is up with ", scalar(@modules), " modules tested\n" if (@modules > 1);
+  exit $ERRORS{'OK'};
+} else { # We hould never end up here :)
+  print "UNKNOWN: The unexpected occured (bug?)\n";
+  exit $ERRORS{'UNKNOWN'};
+}
+
+# Report error passed as one string, print rsync messages to STDERR
+sub report_error {
+  my $report = shift;
+  print "CRITICAL: $report\n";
+  print STDERR @$stderr_buf;
+  exit $ERRORS{'CRITICAL'};
+}
+
diff --git a/web/attachments/182402-check_mysql.c b/web/attachments/182402-check_mysql.c
new file mode 100644
index 0000000..5ef37d1
--- /dev/null
+++ b/web/attachments/182402-check_mysql.c
@@ -0,0 +1,100 @@
+/*****************************************************************
+ *
+ * Program: check_mysql.c
+ * License: GPL
+ *
+ * Written by Tim Weippert
+ *   (based on plugins by Ethan Galstad and MySQL example code)
+ *
+ * Adapted by J. Javier Sianes - skyo@rotxa.org
+ *
+ *
+ * Command line: check_mysql <host> [user] [passwd] [db] [port]
+ *      <host> can be the FQDN or the IP-Adress
+ *      [user], [passwd], [db] and [port] are optional
+ *
+ * Description:
+ *
+ * This plugin attempts to connect to an MySQL Server
+ * with the optional specified parameters user, passwd and db.
+ * Normaly the host and a user HAVE to assigned.
+ *
+ * The plugin returns
+ * STATE_OK and the Version Number of the Server when all is fine
+ * STATE_CRITICAL if the Connection can't be esablished
+ * STATE_WARNING if the connection was established but the
+ * program can't get the Versoin Number
+ * STATE_UNKNOWN if to many parameters are given
+ *
+ * Copyright (c) 1999 by Tim Weippert
+ *
+ * Changes:
+ *   16.12.1999: Changed the return codes from numbers to statements
+ *   20.06.2006: Included new db and port parameters
+ *   20.06.2006: Adapted for using new MySQL5 API
+ *
+ *******************************************************************/
+
+/*****************************************************************
+ *
+ * Note that all includes are related to Nagios and MySQL default installation.
+ * If you have installed them on a different location, you may change
+ * the following include lines in order to make it works.
+ *
+ * To compile the agent, in a shell use the following command, for example:
+ *
+ * gcc -lmysqlclient -o check_mysql check_mysql.c
+ *
+ *******************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "/usr/include/nagios/config.h"
+#include "/usr/include/nagios/common.h"
+#include "/usr/include/nagios/nagios.h"
+#include "/usr/include/mysql/mysql.h"
+
+MYSQL mysql;
+
+int main(int argc, char **argv)
+{
+  uint i = 0;
+  int mport;
+  char *host;
+  char *user;
+  char *passwd;
+  char *db;
+
+  char *status;
+  char *version;
+
+  if ( ( argc > 6 ) || ( argc < 2 ) ) {
+    printf("Incorrect number of arguments supplied - %i .\n", argc);
+    printf("Usage: %s <host> [user] [passwd] [db] [port]\n", argv[0]);
+    return STATE_UNKNOWN;
+  }
+
+  (host = argv[1]) || (host = NULL);
+  (user = argv[2]) || (user = NULL);
+  (passwd = argv[3]) || (passwd = NULL);
+  (db = argv[4]) || (db = "mysql");
+  if (argc==6) { mport = atoi(argv[5]); } else { mport = 3306;  }
+
+  mysql_init(&mysql);
+  mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"check_mysql");
+
+  if (!mysql_real_connect(&mysql,host,user,passwd,db,(unsigned int)mport,NULL,0)) {
+    printf("Connect ERROR, Failed to connect to database '%s': %s\n",db,mysql_error(&mysql));
+    return STATE_CRITICAL;
+  }
+
+  if ( !(version = mysql_get_server_info(&mysql)) ) {
+    printf("Connect OK, but can't get Serverinfo ... something wrong !\n");
+    return STATE_WARNING;
+  }
+
+  printf("MYSQL OK - Running Version: %s\n", version);
+
+  mysql_close(&mysql);
+  return STATE_OK;
+}
diff --git a/web/attachments/182602-check_mailq-nullmailer.diff b/web/attachments/182602-check_mailq-nullmailer.diff
new file mode 100644
index 0000000..f61486f
--- /dev/null
+++ b/web/attachments/182602-check_mailq-nullmailer.diff
@@ -0,0 +1,73 @@
+--- check_mailq 2005-05-08 17:15:26.000000000 +0200
++++ check_mailq 2006-06-22 16:29:57.000000000 +0200
+@@ -378,7 +378,7 @@
+                 #        }
+                 #}
+         }
+-} # end of ($mailq eq "postfixl")
++} # end of ($mailq eq "postfix")
+ elsif ( $mailq eq "qmail" ) {
+ 
+        # open qmail-qstat 
+@@ -502,6 +502,43 @@
+        }
+ } # end of ($mailq eq "exim")
+ 
++elsif ( $mailq eq "nullmailer" ) {
++       ## open mailq 
++       if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++               if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
++                       print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
++                       exit $ERRORS{'UNKNOWN'};
++               }
++       }elsif( defined $utils::PATH_TO_MAILQ){
++               unless (-x $utils::PATH_TO_MAILQ) {
++                       print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
++                       exit $ERRORS{'UNKNOWN'};
++               }
++       } else {
++               print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
++               exit $ERRORS{'UNKNOWN'};
++       }
++
++       while (<MAILQ>) {
++           #2006-06-22 16:00:00  282 bytes
++
++           if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) { 
++               $msg_q++ ;
++           }
++       }
++       close(MAILQ) ;
++       if ($msg_q < $opt_w) {
++               $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
++               $state = $ERRORS{'OK'};
++       }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
++               $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
++               $state = $ERRORS{'WARNING'};
++       }else {
++               $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
++               $state = $ERRORS{'CRITICAL'};
++       }
++} # end of ($mailq eq "nullmailer")
++
+ # Perfdata support
+ print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
+ exit $state;
+@@ -561,7 +598,7 @@
+        }
+ 
+        if (defined $opt_M) {
+-               if ($opt_M =~ /^(sendmail|qmail|postfix|exim)$/) {
++               if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
+                        $mailq = $opt_M ;
+                }elsif( $opt_M eq ''){
+                        $mailq = 'sendmail';
+@@ -593,7 +630,7 @@
+        print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
+        print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+        print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
+-       print "-M (--mailserver) = [ sendmail | qmail | postfix | exim ] (default = sendmail)\n";
++       print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = sendmail)\n";
+        print "-h (--help)\n";
+        print "-V (--version)\n";
+        print "-v (--verbose)   = debugging output\n";
diff --git a/web/attachments/183551-partfix.tar b/web/attachments/183551-partfix.tar
new file mode 100644
index 0000000..3e7d632
--- /dev/null
+++ b/web/attachments/183551-partfix.tar
diff --git a/web/attachments/183681-check_pgsql.c b/web/attachments/183681-check_pgsql.c
new file mode 100644
index 0000000..eeee495
--- /dev/null
+++ b/web/attachments/183681-check_pgsql.c
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-7 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378821686" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378821686" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378821686" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378821686" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378821686');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1516150&group_id=29880&atid=397600&file_id=183681"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/183682-pgslq.png b/web/attachments/183682-pgslq.png
new file mode 100644
index 0000000..81995b1
--- /dev/null
+++ b/web/attachments/183682-pgslq.png
diff --git a/web/attachments/183683-check_pgsql.c b/web/attachments/183683-check_pgsql.c
new file mode 100644
index 0000000..0879cf6
--- /dev/null
+++ b/web/attachments/183683-check_pgsql.c
@@ -0,0 +1,164 @@
+/*****************************************************************
+ *
+ * Program: check_pgsql.c
+ * License: GPL
+ *
+ * Written by J. Javier Sianes - skyo@rotxa.org
+ * Based on MySQL check program written by Tim Weippert
+ *
+ * Command line: check_pgsql <host> user passwd [db] [port]
+ *      <host> can be the FQDN or the IP-Adress
+ *      [db] and [port] are optional
+ *      
+ * Description:
+ * 
+ * This plugin attempts to connect to an PostgreSQL Server
+ * with the optional specified parameters db and port.
+ *
+ * The plugin returns 
+ * STATE_OK and the Version Number of the Server when all is fine
+ * STATE_CRITICAL if the Connection can't be esablished
+ * STATE_WARNING if the connection was established but the 
+ * program can't get the Versoin Number
+ * STATE_UNKNOWN if to many parameters are given
+ *
+ * Copyright (c) 2006 by J. Javier Sianes
+ *
+ *******************************************************************/
+
+/*****************************************************************
+ *
+ * Note that all includes are related to Nagios and PostgreSQL default installation.
+ * If you have installed them on a different location, you may change
+ * the following include lines in order to make it works. 
+ * 
+ * To compile the agent, in a shell use the following command, for example:
+ *
+ * gcc -lpq -o check_pgsql check_pgsql.c
+ *
+ *******************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "/usr/include/nagios/config.h"
+#include "/usr/include/nagios/common.h"
+#include "/usr/include/nagios/nagios.h"
+#include "/usr/include/libpq-fe.h"
+#define TAM_BLK 1024
+
+PGconn *ConexionPG=NULL;
+
+char *PGVersion(int version) {
+  int i=0,j=0,k=0,len,par=1,cont=0;
+  char *cad=NULL,*res=NULL,num[3];
+
+  cad=(char *)malloc(TAM_BLK*sizeof(char));
+  res=(char *)malloc(TAM_BLK*sizeof(char));
+  if ((cad==NULL)||(res==NULL)){
+    free(cad);
+    free(res);
+    return NULL;
+  } 
+
+  for (k=0;k<TAM_BLK;k++) { cad[k]='\0'; res[k]='\0'; } 
+  for (k=0;k<3;k++) { num[k]='\0'; }
+
+  sprintf(cad,"%d",version);
+  len=strlen(cad);
+  if (len%2!=0) { par=0; }
+
+  for (i=0;i<len;i++) {
+    if (cont==2) {
+      cont=0;
+      if (num[1]=='0') {
+        res[j++]=num[0];
+        res[j++]='.';
+      } else {
+        res[j++]=num[0];
+        res[j++]=num[1];
+        res[j++]='.';
+      }
+      for (k=0;k<3;k++) { num[k]='\0'; }
+    }
+
+    num[cont]=cad[i];
+    
+    if (i==(len-1)) {
+      if (par) {
+        res[j++]=num[0];
+        res[j++]=num[1];
+      } else {
+        res[j++]=num[0];
+      }
+    }
+
+    cont++; 
+  }
+
+  free(cad);
+  return res;
+}
+
+int main(int argc, char **argv)
+{
+  uint i = 0;
+  int version,mport;
+  char *host;
+  char *user;
+  char *passwd;
+  char *db;
+  char *PgConnectChain=NULL;
+  char *cversion=NULL;
+  
+  PgConnectChain=(char *)malloc(TAM_BLK*sizeof(char));
+
+  if (PgConnectChain==NULL) {
+    printf("PGSQL UNKNOWN - Not enough memory to allocate data !");
+    return STATE_UNKNOWN;
+  }
+
+  if ( ( argc > 6 ) || ( argc < 4 ) ) {
+    printf("Incorrect number of arguments supplied - %i .\n", argc);
+    printf("Usage: %s <host> user passwd [db] [port]\n", argv[0]);
+    free(PgConnectChain);
+    return STATE_UNKNOWN;
+  }
+
+  host = argv[1];
+  user = argv[2];
+  passwd = argv[3];
+  (db = argv[4]) || (db = "postgres");
+  if (argc==6) { mport = atoi(argv[5]); } else { mport = 5432; }
+ 
+  sprintf(PgConnectChain, "host=%s port=%d dbname=%s user=%s password=%s",host,mport,db,user,passwd);
+  ConexionPG=PQconnectdb(PgConnectChain);
+
+  if (PQstatus(ConexionPG) != CONNECTION_OK)
+  {
+    printf("PGSQL ERROR - Connection to database '%s' failed: %s",db,PQerrorMessage(ConexionPG));
+    free(PgConnectChain);
+    PQfinish(ConexionPG);
+    return STATE_CRITICAL;
+  }
+  
+  version=PQserverVersion(ConexionPG);
+  if (version > 0 ) {
+    cversion=PGVersion(version);
+    if (cversion==NULL) {
+      printf("PGSQL UNKNOWN - Not enough memory to allocate data !");
+      free(PgConnectChain);
+      PQfinish(ConexionPG);
+      return STATE_UNKNOWN;
+    }
+    printf("PGSQL OK - Running Version: postmaster (PostgreSQL) %s\n",cversion);
+  } else {
+    printf("Connect OK, but can't get Serverinfo ... something wrong !\n");
+    free(PgConnectChain);
+    PQfinish(ConexionPG);
+    return STATE_WARNING;
+  }
+
+  free(PgConnectChain);
+  PQfinish(ConexionPG);
+  return STATE_OK;
+}
diff --git a/web/attachments/184991-autoconf-fix.patch b/web/attachments/184991-autoconf-fix.patch
new file mode 100644
index 0000000..34f65c7
--- /dev/null
+++ b/web/attachments/184991-autoconf-fix.patch
@@ -0,0 +1,13 @@
+--- configure.in.old    2006-07-15 00:01:50.000000000 -0500
++++ configure.in        2006-07-15 00:02:18.000000000 -0500
+@@ -1639,7 +1639,9 @@
+                #endif],
+                [va_list args;],
+                [AC_MSG_RESULT(yes)],
+-               [NEED_VA_LIST=-DNEED_VA_LIST AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)])
++               [NEED_VA_LIST=-DNEED_VA_LIST 
++                AC_SUBST(NEED_VA_LIST) 
++                AC_MSG_RESULT(no)])
+ 
+ case $host in
+        *bsd*)
diff --git a/web/attachments/186091-check_mem.pl.patch b/web/attachments/186091-check_mem.pl.patch
new file mode 100644
index 0000000..9eaec75
--- /dev/null
+++ b/web/attachments/186091-check_mem.pl.patch
@@ -0,0 +1,17 @@
+*** check_mem.pl        2006-05-24 15:47:09.000000000 -0700
+--- modified_check_mem.pl       2006-07-24 13:58:06.000000000 -0700
+***************
+*** 46,51 ****
+  
+  # Define the calculating scalars
+! $used_memory  = $memlist[0];
+! $free_memory  = $memlist[1];
+  $total_memory = $used_memory + $free_memory;
+  
+--- 46,51 ----
+  
+  # Define the calculating scalars
+! $used_memory  = $memlist[1];
+! $free_memory  = $memlist[0];
+  $total_memory = $used_memory + $free_memory;
+  
diff --git a/web/attachments/187009-check_disk.diff b/web/attachments/187009-check_disk.diff
new file mode 100644
index 0000000..bc98702
--- /dev/null
+++ b/web/attachments/187009-check_disk.diff
@@ -0,0 +1,45 @@
+60a61,63
+> /* If nonzero, display percents as % of space used rather than free */
+> static int show_used_pct = 0;
+> 
+160c163
+<   double dused_inodes_percent;
+---
+>   double dused_inodes_percent, dfree_inodes_percent;
+249a253
+>       dfree_inodes_percent = 100 - dused_inodes_percent;
+278,286d281
+<       
+< 
+< 
+< 
+<       /* Moved this computation up here so we can add it
+<        * to perf */
+<       inode_space_pct = (1 - dused_inodes_percent) * 100;
+< 
+< 
+304c299
+<                   dfree_pct);
+---
+>                   (show_used_pct ? dused_pct : dfree_pct));
+308c303
+<           asprintf(&output, "%s inode=%.0f%%);", output, (1 - dused_inodes_percent) * 100);
+---
+>           asprintf(&output, "%s inode=%.0f%%);", output, (show_used_pct ? dused_inodes_percent : dfree_inodes_percent) );
+385a381
+>     {"used", no_argument, 0, 'f'},
+404c400
+<     c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklME", longopts, &option);
+---
+>     c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklMEU", longopts, &option);
+548a545,547
+>     case 'U': /* Display output percentage as % free */
+>       show_used_pct = 1;
+>       break;
+720a720,721
+>   printf (" %s\n", "-U --used");
+>   printf ("    %s\n", _("Display output percentage as % free"));
+737c738
+<   printf ("[-m] [-e] [-W limit] [-K limit] [-v] [-q] [-E]\n");
+---
+>   printf ("[-m] [-e] [-W limit] [-K limit] [-v] [-q] [-E] [-U]\n");
diff --git a/web/attachments/190509-check_disk.patch b/web/attachments/190509-check_disk.patch
new file mode 100644
index 0000000..ba4a9ed
--- /dev/null
+++ b/web/attachments/190509-check_disk.patch
@@ -0,0 +1,42 @@
+--- check_disk.c.old    2006-08-24 14:23:56.131294343 -0400
++++ check_disk.c        2006-08-24 14:25:19.000294237 -0400
+@@ -339,6 +339,7 @@ process_arguments (int argc, char **argv
+     return ERROR;
+ 
+   se = (struct name_list *) malloc (sizeof (struct name_list));
++  memset(se,0,sizeof(struct name_list));
+   se->name = strdup ("iso9660");
+   se->name_next = NULL;
+   se->found = 0;
+@@ -456,6 +457,7 @@ process_arguments (int argc, char **argv
+       break;
+     case 'p':                 /* select path */
+       se = (struct name_list *) malloc (sizeof (struct name_list));
++      memset(se,0,sizeof(struct name_list));
+       se->name = optarg;
+       se->name_next = NULL;
+       se->w_df = w_df;
+@@ -469,6 +471,7 @@ process_arguments (int argc, char **argv
+       break;
+     case 'x':                 /* exclude path or partition */
+       se = (struct name_list *) malloc (sizeof (struct name_list));
++      memset(se,0,sizeof(struct name_list));
+       se->name = optarg;
+       se->name_next = NULL;
+ 
+@@ -487,6 +490,7 @@ process_arguments (int argc, char **argv
+       break;
+     case 'X':                 /* exclude file system type */
+       se = (struct name_list *) malloc (sizeof (struct name_list));
++      memset(se,0,sizeof(struct name_list));
+       se->name = optarg;
+       se->name_next = NULL;
+                         /* If you don't clear the w_fd etc values here, they
+@@ -541,6 +545,7 @@ process_arguments (int argc, char **argv
+ 
+   if (argc > c && path == NULL) {
+     se = (struct name_list *) malloc (sizeof (struct name_list));
++    memset(se,0,sizeof(struct name_list));
+     se->name = strdup (argv[c++]);
+     se->name_next = NULL;
+     se->w_df = w_df;
diff --git a/web/attachments/194456-check_http_patch.txt b/web/attachments/194456-check_http_patch.txt
new file mode 100644
index 0000000..45c84cf
--- /dev/null
+++ b/web/attachments/194456-check_http_patch.txt
@@ -0,0 +1,15 @@
+diff -uNr nagios-plugins-1.4.3/plugins/check_http.c nagios-plugins-1.4.3_new/plugins/check_http.c
+--- nagios-plugins-1.4.3/plugins/check_http.c   2006-04-05 00:58:27.000000000 -0700
++++ nagios-plugins-1.4.3_new/plugins/check_http.c       2006-08-30 02:34:35.000000000 -0700
+@@ -1073,9 +1073,8 @@
+    die (STATE_UNKNOWN, _("Could not allocate url\n"));
+
+  while (pos) {
+-
+-    if (sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i) < 1) {
+-
++    sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i);
++    if (i == 0) {
+      pos += (size_t) strcspn (pos, "\r\n");
+      pos += (size_t) strspn (pos, "\r\n");
+      if (strlen(pos) == 0)
diff --git a/web/attachments/195732-utils.pm-1.4.3.patch b/web/attachments/195732-utils.pm-1.4.3.patch
new file mode 100644
index 0000000..987e4b8
--- /dev/null
+++ b/web/attachments/195732-utils.pm-1.4.3.patch
@@ -0,0 +1,11 @@
+--- utils.pm.orig       Thu Sep 28 14:05:56 2006
++++ utils.pm    Thu Sep 28 14:06:01 2006
+@@ -73,7 +73,7 @@
+ 
+ sub is_hostname {
+        my $host1 = shift;
+-       if ($host1 && $host1 =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9][-a-zA-Z0-9]+(\.[a-zA-Z][-a-zA-Z0-9]+)*)$/) {
++       if ($host1 && $host1 =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9][-a-zA-Z0-9]+(\.[a-zA-Z0-9][-a-zA-Z0-9]+)*\.[a-zA-Z][-a-zA-Z0-9]+)$/) {
+                return 1;
+        }else{
+                return 0;
diff --git a/web/attachments/197609-check_real_options.patch b/web/attachments/197609-check_real_options.patch
new file mode 100644
index 0000000..a2f069e
--- /dev/null
+++ b/web/attachments/197609-check_real_options.patch
@@ -0,0 +1,16 @@
+Index: plugins/check_real.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
+retrieving revision 1.26
+diff -u -r1.26 check_real.c
+--- plugins/check_real.c        20 Jun 2006 11:17:02 -0000      1.26
++++ plugins/check_real.c        10 Oct 2006 22:24:03 -0000
+@@ -299,7 +299,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVI:H:e:u:p:w:c:t:", longopts,
++               c = getopt_long (argc, argv, "+hVvI:H:e:u:p:w:c:t:", longopts,
+                                                                         &option);
+ 
+                if (c == -1 || c == EOF)
diff --git a/web/attachments/199141-is_hostname.diff b/web/attachments/199141-is_hostname.diff
new file mode 100644
index 0000000..8d6e498
--- /dev/null
+++ b/web/attachments/199141-is_hostname.diff
@@ -0,0 +1,16 @@
+Index: plugins-scripts/utils.pm.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-scripts/utils.pm.in,v
+retrieving revision 1.9
+diff -u -r1.9 utils.pm.in
+--- plugins-scripts/utils.pm.in 19 Oct 2006 18:44:53 -0000      1.9
++++ plugins-scripts/utils.pm.in 20 Oct 2006 15:57:37 -0000
+@@ -76,7 +76,7 @@
+ 
+ sub is_hostname {
+        my $host1 = shift;
+-       if ($host1 && $host1 =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*)$/) {
++       if ($host1 && $host1 =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9][-a-zA-Z0-9]+(\.[a-zA-Z0-9][-a-zA-Z0-9]+)*)$/) {
+                return 1;
+        }else{
+                return 0;
diff --git a/web/attachments/200576-ssh_connect_parse.patch b/web/attachments/200576-ssh_connect_parse.patch
new file mode 100644
index 0000000..7f7e707
--- /dev/null
+++ b/web/attachments/200576-ssh_connect_parse.patch
@@ -0,0 +1,95 @@
+diff -ruN nagios-plugins-1.4.4.orig/plugins/check_ssh.c nagios-plugins-1.4.4/plugins/check_ssh.c
+--- nagios-plugins-1.4.4.orig/plugins/check_ssh.c       2006-06-21 07:05:00.000000000 -0400
++++ nagios-plugins-1.4.4/plugins/check_ssh.c    2006-10-29 20:20:11.000000000 -0500
+@@ -50,6 +50,7 @@
+ int port = -1;
+ char *server_name = NULL;
+ char *remote_version = NULL;
++char *parse_remote_version = NULL;
+ int verbose = FALSE;
+ 
+ int process_arguments (int, char **);
+@@ -57,7 +58,7 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-int ssh_connect (char *haddr, int hport, char *remote_version);
++int ssh_connect (char *haddr, int hport, char *remote_version, char *parse_remote_version);
+ 
+ 
+ 
+@@ -79,7 +80,7 @@
+        alarm (socket_timeout);
+ 
+        /* ssh_connect exits if error is found */
+-       result = ssh_connect (server_name, port, remote_version);
++       result = ssh_connect (server_name, port, remote_version, parse_remote_version);
+ 
+        alarm (0);
+ 
+@@ -105,6 +106,7 @@
+                {"timeout", required_argument, 0, 't'},
+                {"verbose", no_argument, 0, 'v'},
+                {"remote-version", required_argument, 0, 'r'},
++               {"parse-remote-version", required_argument, 0, 's'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -116,7 +118,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+Vhv46t:r:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "+Vhv46t:r:s:H:p:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -152,6 +154,9 @@
+                case 'r':                                                                       /* remote version */
+                        remote_version = optarg;
+                        break;
++                case 's':                                                                       /* remote version */
++                        parse_remote_version = optarg;
++                        break;
+                case 'H':                                                                       /* host */
+                        if (is_host (optarg) == FALSE)
+                                usage2 (_("Invalid hostname/address"), optarg);
+@@ -206,7 +211,7 @@
+ 
+ 
+ int
+-ssh_connect (char *haddr, int hport, char *remote_version)
++ssh_connect (char *haddr, int hport, char *remote_version, char *parse_remote_version)
+ {
+        int sd;
+        int result;
+@@ -248,6 +253,11 @@
+                                (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
+                                 ssh_server, ssh_proto, remote_version);
+                        exit (STATE_WARNING);
++               } else if (parse_remote_version && !strstr(parse_remote_version, ssh_server)) {
++                       printf
++                                (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
++                                 ssh_server, ssh_proto, parse_remote_version);
++                        exit (STATE_WARNING);
+                }
+                
+                printf
+@@ -285,6 +295,9 @@
+ 
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ 
++       printf (" %s\n", "-s, --parse-remote-version=STRING");
++  printf ("    %s\n", _("Warn if STRING isnt in server version(ex: SSH)"));
++
+        printf (" %s\n", "-r, --remote-version=STRING");
+   printf ("    %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
+        
+@@ -299,6 +312,6 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-       printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
++       printf ("%s [-46] [-t <timeout>] [-r <remote version> | -s <remote string>] [-p <port>] <host>\n", progname);
+ }
+ 
diff --git a/web/attachments/200842-check_swap.c.patch b/web/attachments/200842-check_swap.c.patch
new file mode 100644
index 0000000..c75a369
--- /dev/null
+++ b/web/attachments/200842-check_swap.c.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378822046" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378822046" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378822046" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378822046" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378822046');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1588031&group_id=29880&atid=397599&file_id=200842"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/200960-check_swap.c.patch b/web/attachments/200960-check_swap.c.patch
new file mode 100644
index 0000000..d4f8176
--- /dev/null
+++ b/web/attachments/200960-check_swap.c.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-1 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378822045" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378822045" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378822045" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378822045" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378822045');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1588031&group_id=29880&atid=397599&file_id=200960"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/202053-check_swap.c.patch b/web/attachments/202053-check_swap.c.patch
new file mode 100644
index 0000000..34e6a5d
--- /dev/null
+++ b/web/attachments/202053-check_swap.c.patch
@@ -0,0 +1,92 @@
+*** check_swap.c.orig   Fri Oct 20 00:53:28 2006
+--- check_swap.c        Tue Nov  7 14:54:35 2006
+***************
+*** 37,42 ****
+--- 37,48 ----
+  const char *copyright = "2000-2006";
+  const char *email = "nagiosplug-devel@lists.sourceforge.net";
+  
++ /* required to work correctly on solaris (else gets 'Bad Address' errors) */
++ /* #ifdef HAVE_SYS_STAT_H - using this one doesnt work on solaris */
++ #ifdef __sun__
++ #include <sys/stat.h>
++ #endif
++ 
+  #include "common.h"
+  #include "popen.h"
+  #include "utils.h"
+***************
+*** 236,257 ****
+  #  ifdef CHECK_SWAP_SWAPCTL_SVR4
+  
+        /* get the number of active swap devices */
+!       nswaps=swapctl(SC_GETNSWP, NULL);
+  
+        /* initialize swap table + entries */
+        tbl=(swaptbl_t*)malloc(sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
+        memset(tbl, 0, sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
+        tbl->swt_n=nswaps;
+        for(i=0;i<nswaps;i++){
+!               ent=&tbl->swt_ent[i];
+!               ent->ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN);
+        }
+  
+        /* and now, tally 'em up */
+        swapctl_res=swapctl(SC_LIST, tbl);
+        if(swapctl_res < 0){
+!               perror(_("swapctl failed: "));
+!               result = STATE_WARNING;
+        }
+  
+        for(i=0;i<nswaps;i++){
+--- 242,273 ----
+  #  ifdef CHECK_SWAP_SWAPCTL_SVR4
+  
+        /* get the number of active swap devices */
+!       if((nswaps=swapctl(SC_GETNSWP, NULL))== -1)
+!               perror(_(argv[0])), exit(STATE_UNKNOWN);
+  
++       if(nswaps == 0)
++               (void)printf("No swap devices defined\n"), exit(STATE_OK);
++ 
++       if(verbose > 0)
++               (void)printf("Found %d swap device(s)\n",nswaps);
++ 
+        /* initialize swap table + entries */
+        tbl=(swaptbl_t*)malloc(sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
++ 
++       if(tbl==NULL)
++               perror(_(argv[0])), exit(STATE_UNKNOWN);
++ 
+        memset(tbl, 0, sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
+        tbl->swt_n=nswaps;
+        for(i=0;i<nswaps;i++){
+!               if((tbl->swt_ent[i].ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN)) == NULL)
+!                       perror(_(argv[0])), exit(STATE_UNKNOWN);
+        }
+  
+        /* and now, tally 'em up */
+        swapctl_res=swapctl(SC_LIST, tbl);
+        if(swapctl_res < 0){
+!               perror(_("swapctl failed")), exit(STATE_UNKNOWN);
+        }
+  
+        for(i=0;i<nswaps;i++){
+***************
+*** 292,299 ****
+        /* and now, tally 'em up */
+        swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
+        if(swapctl_res < 0){
+!               perror(_("swapctl failed: "));
+!               result = STATE_WARNING;
+        }
+  
+        for(i=0;i<nswaps;i++){
+--- 308,314 ----
+        /* and now, tally 'em up */
+        swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
+        if(swapctl_res < 0){
+!               perror(_("swapctl failed")), exit(STATE_UNKNOWN);
+        }
+  
+        for(i=0;i<nswaps;i++){
diff --git a/web/attachments/206987-check_procs.p1 b/web/attachments/206987-check_procs.p1
new file mode 100644
index 0000000..51070bc
--- /dev/null
+++ b/web/attachments/206987-check_procs.p1
@@ -0,0 +1,46 @@
+Index: check_procs.c
+===================================================================
+--- check_procs.c       (revision 1)
++++ check_procs.c       (working copy)
+@@ -303,7 +303,8 @@
+                        printf (_("%d crit, %d warn out of "), crit, warn);
+                }
+        } 
+-       printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs);
++
++       printf (ngettext ("%d process|processes=%d;;;0", "%d processes|processes=%d;;;0", (unsigned long) procs), procs, procs, procs);
+        
+        if (strcmp(fmt,"") != 0) {
+                printf (_(" with %s"), fmt);
+@@ -437,8 +438,8 @@
+                                break;
+                        else
+                                prog = optarg;
+-                       asprintf (&fmt, _("%s%scommand name '%s'"), (fmt ? fmt : ""), (options ? ", " : ""),
+-                                 prog);
++                       asprintf (&fmt, _("%s%s"), (fmt ? fmt : ""), (options ? ", " : ""),
++                                 prog);
+                        options |= PROG;
+                        break;
+                case 'a':                                                                       /* args (full path name with args) */
+@@ -447,7 +448,6 @@
+                                break;
+                        else
+                                args = optarg;
+-                       asprintf (&fmt, "%s%sargs '%s'", (fmt ? fmt : ""), (options ? ", " : ""), args);
+                        options |= ARGS;
+                        break;
+                case 'r':                                       /* RSS */
+Index: check_procs.c
+===================================================================
+--- check_procs.c       (revision 2)
++++ check_procs.c       (working copy)
+@@ -304,7 +304,7 @@
+                }
+        } 
+ 
+-       printf (ngettext ("%d process|processes=%d;;;0", "%d processes|processes=%d;;;0", (unsigned long) procs), procs, procs, procs);
++       printf (ngettext ("%d process|processes=%d;;;0", "%d processes|processes=%d;%d;%d;0", (unsigned long) procs), procs, warn, crit, procs, procs);
+        
+        if (strcmp(fmt,"") != 0) {
+                printf (_(" with %s"), fmt);
diff --git a/web/attachments/206988-check_apt.p1 b/web/attachments/206988-check_apt.p1
new file mode 100644
index 0000000..0d8c584
--- /dev/null
+++ b/web/attachments/206988-check_apt.p1
@@ -0,0 +1,24 @@
+Index: check_apt.c
+===================================================================
+--- check_apt.c (revision 2)
++++ check_apt.c (working copy)
+@@ -115,7 +115,7 @@
+                result = max_state(result, STATE_OK);
+        }
+ 
+-       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",
+@@ -123,7 +123,9 @@
+               (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;
diff --git a/web/attachments/206989-check_swap.p1 b/web/attachments/206989-check_swap.p1
new file mode 100644
index 0000000..2bafa2c
--- /dev/null
+++ b/web/attachments/206989-check_swap.p1
@@ -0,0 +1,39 @@
+Index: pkg/solaris/pkginfo
+===================================================================
+--- pkg/solaris/pkginfo (revision 1)
++++ pkg/solaris/pkginfo (working copy)
+@@ -1,12 +1,12 @@
+ PKG="NAGplugin"
+ NAME="nagios-plugins"
+ DESC="Nagios network monitoring plugins"
+-ARCH="powerpc"
+-VERSION="1.4.5,REV=2006.11.01.21.25"
++ARCH=""
++VERSION="1.4.5,REV=2006.12.12.09.37"
+ CATEGORY="application"
+ VENDOR="Nagios Plugin Development Team"
+ EMAIL="nagiosplug-devel@lists.sourceforge.net"
+-PSTAMP="nag20061101212546"
++PSTAMP="nag20061212093733"
+ BASEDIR="/"
+ CLASSES="none"
+ 
+Index: plugins/check_swap.c
+===================================================================
+--- plugins/check_swap.c        (revision 2)
++++ plugins/check_swap.c        (working copy)
+@@ -334,10 +334,10 @@
+                        state_text (result),
+                        (100 - percent_used), (int) free_swap_mb, (int) total_swap_mb, status);
+ 
+-       puts (perfdata ("swap", (long) free_swap_mb, "MB",
+-                       TRUE, (long) max (warn_size_bytes/(1024 * 1024), warn_percent/100.0*total_swap_mb),
+-                       TRUE, (long) max (crit_size_bytes/(1024 * 1024), crit_percent/100.0*total_swap_mb),
+-                       TRUE, 0,
++       puts (perfdata ("swap", (long) total_swap_mb-free_swap_mb, "MB",
++                       TRUE, total_swap_mb-((long) max (warn_size_bytes/(1024 * 1024),(warn_percent/100.0*total_swap_mb))),
++                       TRUE, total_swap_mb-((long) max (crit_size_bytes/(1024 * 1024),(crit_percent/100.0*total_swap_mb))),
++                       TRUE, 0,
+                        TRUE, (long) total_swap_mb));
+ 
+        return result;
diff --git a/web/attachments/207725-check_by_ssh.patch b/web/attachments/207725-check_by_ssh.patch
new file mode 100644
index 0000000..be15032
--- /dev/null
+++ b/web/attachments/207725-check_by_ssh.patch
@@ -0,0 +1,36 @@
+--- check_by_ssh.c      2006-10-18 20:25:16.000000000 -0400
++++ check_by_ssh_new.c  2006-12-18 10:51:04.000000000 -0500
+@@ -166,6 +166,7 @@
+                {"proto2", no_argument, 0, '2'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
++               {"quiet", no_argument, 0, 'q'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -177,7 +178,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "Vvh1246ft:H:O:p:i:u:l:C:S:n:s:", longopts,
++               c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S:n:s:", longopts,
+                                 &option);
+ 
+                if (c == -1 || c == EOF)
+@@ -238,6 +239,7 @@
+                case '2':                                                                       /* 1 to force version 1, 2 to force version 2 */
+                case '4':                                                                       /* -4 for IPv4 */
+                case '6':                                                               /* -6 for IPv6 */
++               case 'q':                                                           /* Quiet ssh output to suppress motd */
+                case 'f':                                                                       /* fork to background */
+                        asprintf (&comm, "%s -%c", comm, c);
+                        break;
+@@ -328,6 +330,8 @@
+   printf ("    %s\n", _("tell ssh to use Protocol 1"));
+   printf (" %s\n", "-2, --proto2");
+   printf ("    %s\n", _("tell ssh to use Protocol 2"));
++  printf (" %s\n", "-q, --quiet");
++  printf ("    %s\n", _("tell ssh to use quiet mode"));  
+   printf (" %s\n", "-S, --skiplines=n");
+   printf ("    %s\n", _("Ignore first n lines on STDERR (to suppress a logon banner)"));
+   printf (" %s\n", "-f");
diff --git a/web/attachments/209675-check_procs.c-1.4.5-zombies-patch b/web/attachments/209675-check_procs.c-1.4.5-zombies-patch
new file mode 100644
index 0000000..6923bf5
--- /dev/null
+++ b/web/attachments/209675-check_procs.c-1.4.5-zombies-patch
@@ -0,0 +1,26 @@
+diff -Naur nagios-plugins-1.4.5/plugins/check_procs.c nagios-plugins-1.4.5-patched/plugins/check_procs.c
+--- nagios-plugins-1.4.5/plugins/check_procs.c  2006-10-23 00:03:31.000000000 +0200
++++ nagios-plugins-1.4.5-patched/plugins/check_procs.c  2007-01-04 12:00:46.512560576 +0100
+@@ -181,6 +181,7 @@
+                strcpy (procprog, "");
+                asprintf (&procargs, "%s", "");
+ 
++               pos = 0;
+                cols = sscanf (input_line, PS_FORMAT, PS_VARLIST);
+ 
+                /* Zombie processes do not give a procprog command */
+@@ -189,8 +190,12 @@
+                }
+                if ( cols >= expected_cols ) {
+                        resultsum = 0;
+-                       asprintf (&procargs, "%s", input_line + pos);
+-                       strip (procargs);
++                       if (strstr(procstat, zombie)) {
++                               procargs = "";
++                       } else {
++                               asprintf (&procargs, "%s", input_line + pos);
++                               strip (procargs);
++                       }
+ 
+                        /* Some ps return full pathname for command. This removes path */
+                        procprog = base_name(procprog);
diff --git a/web/attachments/209934-check_ping-1.4.5-filtered-packets.diff b/web/attachments/209934-check_ping-1.4.5-filtered-packets.diff
new file mode 100644
index 0000000..e738d27
--- /dev/null
+++ b/web/attachments/209934-check_ping-1.4.5-filtered-packets.diff
@@ -0,0 +1,40 @@
+diff -r -u nagios-plugins-1.4.5.old/plugins/check_ping.c nagios-plugins-1.4.5/plugins/check_ping.c
+--- nagios-plugins-1.4.5.old/plugins/check_ping.c       2006-10-19 01:25:16.000000000 +0100
++++ nagios-plugins-1.4.5/plugins/check_ping.c   2007-01-05 18:17:12.000000000 +0000
+@@ -503,6 +503,27 @@
+ int
+ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
+ {
++       /*
++        * This constant shouldn't be here.  It is bad practice, and just
++        * generally offensive to the sensibilities.  Unfortunately, the
++        * relevant constant, MAX_HOST_ADDRESS_LENGTH, is an enum, which means
++        * I can't compile-time cat it into a scanf format string.
++        *
++        * I could change the common header to work around this, but that's
++        * invasive.  I could sprintf a scanf string, but then I need about 5
++        * times the memory (for a sprintf buffer of unknown length).  Since I
++        * intend to report my problem as a bug to the Nagios maintainers I'll
++        * just leave it for them to fix as they feel best fits the
++        * application -- they're the experts, after all, I'm just a device
++        * for ensuring RFC1925 Section 2(1) compliancy, and this does it.  I
++        * would never put this in my own code, got it?  I'm just not sure
++        * what the house style dictates in this case.
++        *
++        * Maybe this variable shouldn't even be here -- it looks awfully
++        * lonely, doesn't it?  Dunno.  It works for me, though.
++        */
++       char filter_host[256+1];
++
+        if (strstr (buf, "Network is unreachable"))
+                die (STATE_CRITICAL, _("CRITICAL - Network unreachable (%s)"), addr);
+        else if (strstr (buf, "Destination Host Unreachable"))
+@@ -511,6 +532,8 @@
+                die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
+        else if (strstr (buf, "Time to live exceeded"))
+                die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr);
++       else if (sscanf (buf, "From %256s %*s Packet filtered", filter_host) == 1)
++               die (STATE_CRITICAL, _("CRITICAL - Packet filtered by %s (%s)"), filter_host, addr);
+ 
+        if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
+                if (warn_text == NULL)
diff --git a/web/attachments/209994-check_ping.response_handling.patch b/web/attachments/209994-check_ping.response_handling.patch
new file mode 100644
index 0000000..f86141c
--- /dev/null
+++ b/web/attachments/209994-check_ping.response_handling.patch
@@ -0,0 +1,32 @@
+Index: plugins/check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.55
+diff -u -r1.55 check_ping.c
+--- plugins/check_ping.c        6 Jan 2007 04:52:58 -0000       1.55
++++ plugins/check_ping.c        6 Jan 2007 06:08:11 -0000
+@@ -503,10 +503,22 @@
+ int
+ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
+ {
+-       if (strstr (buf, "Network is unreachable"))
+-               die (STATE_CRITICAL, _("CRITICAL - Network unreachable (%s)"), addr);
++       if (strstr (buf, "Network is unreachable") ||
++               strstr (buf, "Destination Net Unreachable")
++               )
++               die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)"), addr);
+        else if (strstr (buf, "Destination Host Unreachable"))
+                die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)"), addr);
++       else if (strstr (buf, "Destination Port Unreachable"))
++               die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)"), addr);
++       else if (strstr (buf, "Destination Protocol Unreachable"))
++               die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"), addr);
++       else if (strstr (buf, "Destination Net Prohibited"))
++               die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)"), addr);
++       else if (strstr (buf, "Destination Host Prohibited"))
++               die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)"), addr);
++       else if (strstr (buf, "Packet filtered"))
++               die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)"), addr);
+        else if (strstr (buf, "unknown host" ))
+                die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
+        else if (strstr (buf, "Time to live exceeded"))
diff --git a/web/attachments/210121-check_disk.multiple_perfdata.patch b/web/attachments/210121-check_disk.multiple_perfdata.patch
new file mode 100644
index 0000000..bf2d265
--- /dev/null
+++ b/web/attachments/210121-check_disk.multiple_perfdata.patch
@@ -0,0 +1,30 @@
+Index: plugins/check_disk.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
+retrieving revision 1.81
+diff -u -r1.81 check_disk.c
+--- plugins/check_disk.c        20 Dec 2006 19:25:59 -0000      1.81
++++ plugins/check_disk.c        7 Jan 2007 07:01:22 -0000
+@@ -164,8 +164,8 @@
+   double dfree_pct = -1, dused_pct = -1;
+   double dused_units, dfree_units, dtotal_units;
+   double dused_inodes_percent, dfree_inodes_percent;
+-  double warning_high_tide = UINT_MAX;
+-  double critical_high_tide = UINT_MAX;
++  double warning_high_tide;
++  double critical_high_tide;
+   int temp_result;
+ 
+   struct mount_entry *me;
+@@ -300,6 +300,11 @@
+          Hack here. Trying to get warn/crit levels from freespace_(units|percent) for perf
+          data. Assumption that start=0. Roll on new syntax...
+       */
++
++      /* *_high_tide must be reinitialized at each run */
++      warning_high_tide = UINT_MAX;
++      critical_high_tide = UINT_MAX;
++
+       if (path->freespace_units->warning != NULL) {
+         warning_high_tide = dtotal_units - path->freespace_units->warning->end;
+       }
diff --git a/web/attachments/210386-nagios-plugins-check_procs-procprog-fix.diff b/web/attachments/210386-nagios-plugins-check_procs-procprog-fix.diff
new file mode 100644
index 0000000..6eb498e
--- /dev/null
+++ b/web/attachments/210386-nagios-plugins-check_procs-procprog-fix.diff
@@ -0,0 +1,19 @@
+*** nagios-plugins-1.4.5/plugins/check_procs.c  Sun Oct 22 17:03:31 2006
+--- nagios-plugins-1.4.5/plugins/check_procs.c.new      Mon Jan  8 14:28:10 2007
+***************
+*** 193,199 ****
+                        strip (procargs);
+  
+                        /* Some ps return full pathname for command. This removes path */
+!                       procprog = base_name(procprog);
+  
+                        /* we need to convert the elapsed time to seconds */
+                        procseconds = convert_to_seconds(procetime);
+--- 193,199 ----
+                        strip (procargs);
+  
+                        /* Some ps return full pathname for command. This removes path */
+!                       strcpy(procprog, base_name(procprog));
+  
+                        /* we need to convert the elapsed time to seconds */
+                        procseconds = convert_to_seconds(procetime);
diff --git a/web/attachments/210598-printf_fmt.patch b/web/attachments/210598-printf_fmt.patch
new file mode 100644
index 0000000..c6e0f6a
--- /dev/null
+++ b/web/attachments/210598-printf_fmt.patch
@@ -0,0 +1,26 @@
+Index: plugins/check_ldap.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
+retrieving revision 1.33
+diff -r1.33 check_ldap.c
+381c381
+<   printf (" %s\n," "-D [--bind]");
+---
+>   printf (" %s\n", "-D [--bind]");
+383c383
+<   printf (" %s\n," "-P [--pass]");
+---
+>   printf (" %s\n", "-P [--pass]");
+413c413
+<   printf ("[-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n",
+---
+>   printf ("[-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
+Index: plugins/check_http.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
+retrieving revision 1.97
+diff -r1.97 check_http.c
+1272c1272
+<   printf (" %s\n," "-P, --post=STRING");
+---
+>   printf (" %s\n", "-P, --post=STRING");
diff --git a/web/attachments/212731-check_radius.c.diff b/web/attachments/212731-check_radius.c.diff
new file mode 100644
index 0000000..b9f70f3
--- /dev/null
+++ b/web/attachments/212731-check_radius.c.diff
@@ -0,0 +1,10 @@
+--- nagios-plugins-HEAD-200610282352/plugins/check_radius.c.orig        2006-10-20 08:53:28.000000000 +0900
++++ nagios-plugins-HEAD-200610282352/plugins/check_radius.c     2006-10-29 17:30:31.000000000 +0900
+@@ -139,6 +139,7 @@
+ 
+        service = PW_AUTHENTICATE_ONLY;
+ 
++       memset (&data, 0, sizeof data);
+        if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+                                rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
+                                rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
diff --git a/web/attachments/212735-check_tcp.c.diff b/web/attachments/212735-check_tcp.c.diff
new file mode 100644
index 0000000..ed32a84
--- /dev/null
+++ b/web/attachments/212735-check_tcp.c.diff
@@ -0,0 +1,10 @@
+--- nagios-plugins-1.4.5/plugins/check_tcp.c.old        2007-01-24 01:17:45.000000000 +0900
++++ nagios-plugins-1.4.5/plugins/check_tcp.c    2007-01-24 01:17:50.000000000 +0900
+@@ -520,6 +520,7 @@
+                                usage4 (_("Maxbytes must be a positive integer"));
+                        else
+                                maxbytes = strtol (optarg, NULL, 0);
++                       break;
+                case 'q':
+                        if (escape)
+                                server_quit = np_escaped_string(optarg);
diff --git a/web/attachments/212748-check_ssh_hostname_opt_fix.diff b/web/attachments/212748-check_ssh_hostname_opt_fix.diff
new file mode 100644
index 0000000..0411a2e
--- /dev/null
+++ b/web/attachments/212748-check_ssh_hostname_opt_fix.diff
@@ -0,0 +1,10 @@
+--- nagios-plugins-HEAD-200701231300/plugins/check_ssh.c.orig   2007-01-23 19:43:04.000000000 +0200
++++ nagios-plugins-HEAD-200701231300/plugins/check_ssh.c        2007-01-23 19:43:16.000000000 +0200
+@@ -103,6 +103,7 @@
+                {"help", no_argument, 0, 'h'},
+                {"version", no_argument, 0, 'V'},
+                {"host", required_argument, 0, 'H'},
++               {"hostname", required_argument, 0, 'H'},
+                {"port", required_argument, 0, 'p'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
diff --git a/web/attachments/213131-check_log b/web/attachments/213131-check_log
new file mode 100644
index 0000000..a9aebbe
--- /dev/null
+++ b/web/attachments/213131-check_log
@@ -0,0 +1,217 @@
+#! /bin/sh
+#
+# Log file pattern detector plugin for Nagios
+# Written by Ethan Galstad (nagios@nagios.org)
+# Last Modified: 07-31-1999
+#
+# Usage: ./check_log <log_file> <old_log_file> <pattern>
+#
+# Description:
+#
+# This plugin will scan a log file (specified by the <log_file> option)
+# for a specific pattern (specified by the <pattern> option).  Successive
+# calls to the plugin script will only report *new* pattern matches in the
+# log file, since an copy of the log file from the previous run is saved
+# to <old_log_file>.
+#
+# Output:
+#
+# On the first run of the plugin, it will return an OK state with a message
+# of "Log check data initialized".  On successive runs, it will return an OK
+# state if *no* pattern matches have been found in the *difference* between the
+# log file and the older copy of the log file.  If the plugin detects any 
+# pattern matches in the log diff, it will return a CRITICAL state and print
+# out a message is the following format: "(x) last_match", where "x" is the
+# total number of pattern matches found in the file and "last_match" is the
+# last entry in the log file which matches the pattern.
+#
+# Notes:
+#
+# If you use this plugin make sure to keep the following in mind:
+#
+#    1.  The "max_attempts" value for the service should be 1, as this
+#        will prevent Nagios from retrying the service check (the
+#        next time the check is run it will not produce the same results).
+#
+#    2.  The "notify_recovery" value for the service should be 0, so that
+#        Nagios does not notify you of "recoveries" for the check.  Since
+#        pattern matches in the log file will only be reported once and not
+#        the next time, there will always be "recoveries" for the service, even
+#        though recoveries really don't apply to this type of check.
+#
+#    3.  You *must* supply a different <old_file_log> for each service that
+#        you define to use this plugin script - even if the different services
+#        check the same <log_file> for pattern matches.  This is necessary
+#        because of the way the script operates.
+#
+# Examples:
+#
+# Check for login failures in the syslog...
+#
+#   check_log /var/log/messages ./check_log.badlogins.old "LOGIN FAILURE"
+#
+# Check for port scan alerts generated by Psionic's PortSentry software...
+#
+#   check_log /var/log/message ./check_log.portscan.old "attackalert"
+#
+
+# Paths to commands used in this script.  These
+# may have to be modified to match your system setup.
+
+PATH=""
+
+ECHO="/bin/echo"
+GREP="/bin/grep"
+DIFF="/usr/bin/diff"
+TAIL="/usr/bin/tail"
+CAT="/bin/cat"
+RM="/bin/rm"
+
+PROGNAME=`/bin/basename $0`
+PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+REVISION=`echo '$Revision: 1.4 $' | /bin/sed -e 's/[^0-9.]//g'`
+
+. $PROGPATH/utils.sh
+
+print_usage() {
+    echo "Usage: $PROGNAME -F logfile -O oldlog -q query"
+    echo "Usage: $PROGNAME --help"
+    echo "Usage: $PROGNAME --version"
+}
+
+print_help() {
+    print_revision $PROGNAME $REVISION
+    echo ""
+    print_usage
+    echo ""
+    echo "Log file pattern detector plugin for Nagios"
+    echo ""
+    support
+}
+
+# Make sure the correct number of command line
+# arguments have been supplied
+
+if [ $# -lt 1 ]; then
+    print_usage
+    exit $STATE_UNKNOWN
+fi
+
+# Grab the command line arguments
+
+#logfile=$1
+#oldlog=$2
+#query=$3
+exitstatus=$STATE_WARNING #default
+while test -n "$1"; do
+    case "$1" in
+        --help)
+            print_help
+            exit $STATE_OK
+            ;;
+        -h)
+            print_help
+            exit $STATE_OK
+            ;;
+        --version)
+            print_revision $PROGNAME $VERSION
+            exit $STATE_OK
+            ;;
+        -V)
+            print_revision $PROGNAME $VERSION
+            exit $STATE_OK
+            ;;
+        --filename)
+            logfile=$2
+            shift
+            ;;
+        -F)
+            logfile=$2
+            shift
+            ;;
+        --oldlog)
+            oldlog=$2
+            shift
+            ;;
+        -O)
+            oldlog=$2
+            shift
+            ;;
+        --query)
+            query=$2
+            shift
+            ;;
+        -q)
+            query=$2
+            shift
+            ;;
+        -x)
+            exitstatus=$2
+            shift
+            ;;
+        --exitstatus)
+            exitstatus=$2
+            shift
+            ;;
+        *)
+            echo "Unknown argument: $1"
+            print_usage
+            exit $STATE_UNKNOWN
+            ;;
+    esac
+    shift
+done
+
+# If the source log file doesn't exist, exit
+
+if [ ! -e $logfile ]; then
+    $ECHO "Log check error: Log file $logfile does not exist!\n"
+    exit $STATE_UNKNOWN
+elif [ ! -r $logfile ] ; then
+    $ECHO "Log check error: Log file $logfile is not readable!\n"
+    exit $STATE_UNKNOWN
+fi
+
+# If the old log file doesn't exist, this must be the first time
+# we're running this test, so copy the original log file over to
+# the old diff file and exit
+
+if [ ! -e $oldlog ]; then
+    $CAT $logfile > $oldlog
+    $ECHO "Log check data initialized...\n"
+    exit $STATE_OK
+fi
+
+# The old log file exists, so compare it to the original log now
+
+# The temporary file that the script should use while
+# processing the log file.
+if [ -x /bin/mktemp ]; then
+    tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX`
+else
+    tempdiff=`/bin/date '+%H%M%S'`
+    tempdiff="/tmp/check_log.${tempdiff}"
+    /bin/touch $tempdiff
+    chmod 600 $tempdiff
+fi
+
+$DIFF $logfile $oldlog | $GREP -v "^>" > $tempdiff
+
+# Count the number of matching log entries we have
+count=`$GREP -c "$query" $tempdiff`
+
+# Get the last matching entry in the diff file
+lastentry=`$GREP "$query" $tempdiff | $TAIL --lines=1`
+
+$RM -f $tempdiff
+$CAT $logfile > $oldlog
+
+if [ "$count" = "0" ]; then # no matches, exit with no error
+    $ECHO "Log check ok - 0 pattern matches found\n"
+    exitstatus=$STATE_OK
+else # Print total matche count and the last entry we found
+    $ECHO "($count) $lastentry"
+    exitstatus=$STATE_CRITICAL
+fi
+
+exit $exitstatus
diff --git a/web/attachments/213396-check_disk.reverse_perfdata.patch b/web/attachments/213396-check_disk.reverse_perfdata.patch
new file mode 100644
index 0000000..7f2a94d
--- /dev/null
+++ b/web/attachments/213396-check_disk.reverse_perfdata.patch
@@ -0,0 +1,69 @@
+Index: plugins/check_disk.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
+retrieving revision 1.82
+diff -u -r1.82 check_disk.c
+--- plugins/check_disk.c        7 Jan 2007 07:14:04 -0000       1.82
++++ plugins/check_disk.c        27 Jan 2007 18:01:18 -0000
+@@ -306,16 +306,16 @@
+       critical_high_tide = UINT_MAX;
+ 
+       if (path->freespace_units->warning != NULL) {
+-        warning_high_tide = dtotal_units - path->freespace_units->warning->end;
++        warning_high_tide = path->freespace_units->warning->end;
+       }
+       if (path->freespace_percent->warning != NULL) {
+-        warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_units ));
++        warning_high_tide = abs( min( (double) warning_high_tide, (double) path->freespace_percent->warning->end/100*dtotal_units ));
+       }
+       if (path->freespace_units->critical != NULL) {
+-        critical_high_tide = dtotal_units - path->freespace_units->critical->end;
++        critical_high_tide = path->freespace_units->critical->end;
+       }
+       if (path->freespace_percent->critical != NULL) {
+-        critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units ));
++        critical_high_tide = abs( min( (double) critical_high_tide, (double) path->freespace_percent->critical->end/100*dtotal_units ));
+       }
+ 
+       asprintf (&perf, "%s %s", perf,
+Index: plugins/t/check_disk.t
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_disk.t,v
+retrieving revision 1.16
+diff -u -r1.16 check_disk.t
+--- plugins/t/check_disk.t      8 Jan 2007 11:05:55 -0000       1.16
++++ plugins/t/check_disk.t      27 Jan 2007 18:01:18 -0000
+@@ -24,7 +24,7 @@
+ if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
+        plan skip_all => "Need 2 mountpoints to test";
+ } else {
+-       plan tests => 57;
++       plan tests => 61;
+ }
+ 
+ $result = NPTest->testCmd( 
+@@ -76,6 +76,24 @@
+        die "Two mountpoints with same inodes free - cannot do rest of test";
+ }
+ 
++# Verify performance data
++# First check absolute thresholds...
++$result = NPTest->testCmd(
++        "./check_disk -w 20 -c 10 -p $mountpoint_valid"
++        );
++$_ = $result->perf_output;
++my ($warn_absth_data, $crit_absth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;\d+/);
++is ($warn_absth_data, 20, "Wrong warning in perf data using absolute thresholds");
++is ($crit_absth_data, 10, "Wrong critical in perf data using absolute thresholds");
++
++# Then check percent thresholds.
++$result = NPTest->testCmd(
++        "./check_disk -w 20% -c 10% -p $mountpoint_valid"
++        );
++$_ = $result->perf_output;
++my ($warn_percth_data, $crit_percth_data, $total_percth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/);
++is ($warn_percth_data, int($total_percth_data/100*20), "Wrong warning in perf data using percent thresholds");
++is ($crit_percth_data, int($total_percth_data/100*10), "Wrong critical in perf data using percent thresholds");
+ 
+ 
+ # Check when order of mount points are reversed, that perf data remains same
diff --git a/web/attachments/214858-patch-plugins_check_swap_c b/web/attachments/214858-patch-plugins_check_swap_c
new file mode 100644
index 0000000..42efa9f
--- /dev/null
+++ b/web/attachments/214858-patch-plugins_check_swap_c
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- plugins/check_swap.c.orig   Wed Feb  7 10:05:35 2007
++++ plugins/check_swap.c        Wed Feb  7 10:06:28 2007
+@@ -42,14 +42,14 @@ const char *email = "nagiosplug-devel@li
+ #include "utils.h"
+ 
+ #ifdef HAVE_DECL_SWAPCTL
++# ifdef HAVE_SYS_PARAM_H
++#  include <sys/param.h>
++# endif
+ # ifdef HAVE_SYS_SWAP_H
+ #  include <sys/swap.h>
+ # endif
+ # ifdef HAVE_SYS_STAT_H
+ #  include <sys/stat.h>
+-# endif
+-# ifdef HAVE_SYS_PARAM_H
+-#  include <sys/param.h>
+ # endif
+ #endif
+ 
diff --git a/web/attachments/215428-check_http.c.diff b/web/attachments/215428-check_http.c.diff
new file mode 100644
index 0000000..30fbfba
--- /dev/null
+++ b/web/attachments/215428-check_http.c.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378822323" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378822323" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378822323" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378822323" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378822323');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1657280&group_id=29880&atid=397599&file_id=215428"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/215430-check_http.c.diff b/web/attachments/215430-check_http.c.diff
new file mode 100644
index 0000000..488f549
--- /dev/null
+++ b/web/attachments/215430-check_http.c.diff
@@ -0,0 +1,30 @@
+--- nagios-plugins-1.4.6.orig/plugins/check_http.c      2007-01-29 06:46:40.000000000 +0900
++++ nagios-plugins-1.4.6/plugins/check_http.c   2007-02-11 21:03:21.000000000 +0900
+@@ -175,15 +175,16 @@
+   int option = 0;
+   static struct option longopts[] = {
+     STD_LONG_OPTS,
+-    {"file",required_argument,0,'F'},
+     {"link", no_argument, 0, 'L'},
+     {"nohtml", no_argument, 0, 'n'},
+     {"ssl", no_argument, 0, 'S'},
+-    {"verbose", no_argument, 0, 'v'},
+     {"post", required_argument, 0, 'P'},
+     {"IP-address", required_argument, 0, 'I'},
+     {"url", required_argument, 0, 'u'},
++    {"port", required_argument, 0, 'p'},
++    {"authorization", required_argument, 0, 'a'},
+     {"string", required_argument, 0, 's'},
++    {"expect", required_argument, 0, 'e'},
+     {"regex", required_argument, 0, 'r'},
+     {"ereg", required_argument, 0, 'r'},
+     {"eregi", required_argument, 0, 'R'},
+@@ -1295,7 +1296,7 @@
+   printf ("    %s\n", _("String to be sent in http header as \"User Agent\""));
+   printf (" %s\n", "-k, --header=STRING");
+   printf ("    %s\n", _(" Any other tags to be sent in http header. Use multiple times for additional headers"));
+-  printf (" %s\n", "-L, --link=URL");
++  printf (" %s\n", "-L, --link");
+   printf ("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
+   printf (" %s\n", "-f, --onredirect=<ok|warning|critical|follow>");
+   printf ("    %s\n", _("How to handle redirected pages"));
diff --git a/web/attachments/216171-check_hpjd_jetreadysupport.patch b/web/attachments/216171-check_hpjd_jetreadysupport.patch
new file mode 100644
index 0000000..f33c934
--- /dev/null
+++ b/web/attachments/216171-check_hpjd_jetreadysupport.patch
@@ -0,0 +1,77 @@
+diff -Naur nagios-plugins-1.4.5-orig/plugins/check_hpjd.c nagios-plugins-1.4.5/plugins/check_hpjd.c
+--- nagios-plugins-1.4.5-orig/plugins/check_hpjd.c      2006-10-18 20:25:16.000000000 -0400
++++ nagios-plugins-1.4.5/plugins/check_hpjd.c   2007-02-15 12:31:34.000000000 -0500
+@@ -64,6 +64,11 @@
+ 
+ #define ONLINE         0
+ #define OFFLINE                1
++#define JAONLINE               1
++#define JAOFFLINE              0
++
++#define JETDIRECT      0
++#define JETREADY       1
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -71,6 +76,7 @@
+ void print_usage (void);
+ 
+ char *community = NULL;
++char *jd_type = JETDIRECT;             // default to JetDirect type
+ char *address = NULL;
+ 
+ int
+@@ -245,8 +251,8 @@
+                        result = STATE_WARNING;
+                        strcpy (errmsg, _("Out of Paper"));
+                }
+-               else if (line_status == OFFLINE) {
+-                       if (strcmp (errmsg, "POWERSAVE ON") != 0) {
++               else if ((line_status == OFFLINE && jd_type == JETDIRECT) || (line_status == JAOFFLINE && jd_type == JETREADY)) {
++                       if ((strcmp (errmsg, "POWERSAVE ON") != 0) || (strcmp (errmsg, "Sleep mode on") != 0)) {
+                                result = STATE_WARNING;
+                                strcpy (errmsg, _("Printer Offline"));
+                        }
+@@ -317,6 +323,7 @@
+ /*             {"critical",       required_argument,0,'c'}, */
+ /*             {"warning",        required_argument,0,'w'}, */
+ /*             {"port",           required_argument,0,'P'}, */
++               {"jetready", no_argument, 0, 'A'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {0, 0, 0, 0}
+@@ -327,7 +334,7 @@
+ 
+        
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVH:C:", longopts, &option);
++               c = getopt_long (argc, argv, "+hVAH:C:", longopts, &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+@@ -344,6 +351,9 @@
+                case 'C':                                                                       /* community */
+                        community = strscpy (community, optarg);
+                        break;
++               case 'A':                                                                       /* change jd type */
++                       jd_type = JETREADY;
++                       break;
+                case 'V':                                                                       /* version */
+                        print_revision (progname, revision);
+                        exit (STATE_OK);
+@@ -400,6 +410,8 @@
+ 
+        printf (_(UT_HELP_VRSN));
+ 
++       printf (" %s\n", "-A, --jetready");
++  printf ("    %s", _("Change logic from assuming JetDirect to JetReady support"));
+        printf (" %s\n", "-C, --community=STRING");
+   printf ("    %s", _("The SNMP community name "));
+   printf (_("(default=%s)"), DEFAULT_COMMUNITY);
+@@ -413,5 +425,5 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-       printf ("%s -H host [-C community]\n", progname);
++       printf ("%s -H host [-a] [-C community]\n", progname);
+ }
diff --git a/web/attachments/216487-check_ntp.patch b/web/attachments/216487-check_ntp.patch
new file mode 100644
index 0000000..6fbea15
--- /dev/null
+++ b/web/attachments/216487-check_ntp.patch
@@ -0,0 +1,150 @@
+*** nagios-plugins-1.4.6-orig/plugins/check_ntp.c       2007-01-28 16:46:40.000000000 -0500
+--- nagios-plugins-1.4.6/plugins/check_ntp.c    2007-02-17 17:17:20.000000000 -0500
+*************** static double ocrit=120;
+*** 53,58 ****
+--- 53,62 ----
+  static short do_jitter=0;
+  static double jwarn=5000;
+  static double jcrit=10000;
++ static short do_stratum=0;
++ static int swarn=4;
++ static int scrit=15;
++ static int max_stratum=0;
+  
+  int process_arguments (int, char **);
+  void print_help (void);
+*************** double offset_request(const char *host, 
+*** 447,452 ****
+--- 451,459 ----
+                                if(verbose) {
+                                        printf("offset %.10g\n", servers[i].offset[respnum]);
+                                }
++                               if (req[i].stratum > max_stratum) {
++                                       max_stratum = req[i].stratum;
++                               }
+                                servers[i].stratum=req[i].stratum;
+                                servers[i].rtdisp=NTP32asDOUBLE(req[i].rtdisp);
+                                servers[i].rtdelay=NTP32asDOUBLE(req[i].rtdelay);
+*************** int process_arguments(int argc, char **a
+*** 631,636 ****
+--- 638,645 ----
+                {"zero-offset", no_argument, 0, 'O'},
+                {"jwarn", required_argument, 0, 'j'},
+                {"jcrit", required_argument, 0, 'k'},
++               {"swarn", required_argument, 0, 's'},
++               {"scrit", required_argument, 0, 'S'},
+                {"timeout", required_argument, 0, 't'},
+                {"hostname", required_argument, 0, 'H'},
+                {0, 0, 0, 0}
+*************** int process_arguments(int argc, char **a
+*** 641,647 ****
+                usage ("\n");
+  
+        while (1) {
+!               c = getopt_long (argc, argv, "Vhv46w:c:Oj:k:t:H:", longopts, &option);
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+  
+--- 650,656 ----
+                usage ("\n");
+  
+        while (1) {
+!               c = getopt_long (argc, argv, "Vhv46w:c:Oj:k:t:H:s:S:", longopts, &option);
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+  
+*************** int process_arguments(int argc, char **a
+*** 671,676 ****
+--- 680,693 ----
+                        do_jitter=1;
+                        jcrit = atof(optarg);
+                        break;
++               case 's':
++                       do_stratum=1;
++                       swarn = atoi(optarg);
++                       break;
++               case 'S':
++                       do_stratum=1;
++                       scrit = atoi(optarg);
++                       break;
+                case 'H':
+                        if(is_host(optarg) == FALSE)
+                                usage2(_("Invalid hostname/address"), optarg);
+*************** int process_arguments(int argc, char **a
+*** 703,712 ****
+                usage4(_("Critical offset should be larger than warning offset"));
+        }
+  
+!       if (ocrit < owarn){
+                usage4(_("Critical jitter should be larger than warning jitter"));
+        }
+  
+        if(server_address == NULL){
+                usage4(_("Hostname was not supplied"));
+        }
+--- 720,733 ----
+                usage4(_("Critical offset should be larger than warning offset"));
+        }
+  
+!       if (jcrit < jwarn){
+                usage4(_("Critical jitter should be larger than warning jitter"));
+        }
+  
++       if (scrit < swarn){
++               usage4(_("Critical stratum should be larger than warning stratum"));
++       }
++ 
+        if(server_address == NULL){
+                usage4(_("Hostname was not supplied"));
+        }
+*************** int main(int argc, char *argv[]){
+*** 758,763 ****
+--- 779,792 ----
+        }
+        result=max_state(result, jitter_result);
+  
++       if(do_stratum){
++               if (max_stratum >= scrit){
++                       result - max_state(result, STATE_CRITICAL);
++               } else if(max_stratum >= swarn) {
++                       result = max_state(result, STATE_WARNING);
++               }
++       }
++ 
+        switch (result) {
+                case STATE_CRITICAL :
+                        printf("NTP CRITICAL: ");
+*************** int main(int argc, char *argv[]){
+*** 778,784 ****
+                if(offset_result==STATE_WARNING){
+                        printf("Unable to fully sample sync server. ");
+                }
+!               printf("Offset %.10g secs|offset=%.10g", offset, offset);
+        }
+        if (do_jitter) printf(" jitter=%f", jitter);
+        printf("\n");
+--- 807,817 ----
+                if(offset_result==STATE_WARNING){
+                        printf("Unable to fully sample sync server. ");
+                }
+!               printf("Offset %.10g secs", offset);
+!               if (do_stratum) {
+!                       printf(", max Stratum %d", max_stratum);
+!               }
+!               printf("|offset=%.10g", offset);
+        }
+        if (do_jitter) printf(" jitter=%f", jitter);
+        printf("\n");
+*************** void print_help(void){
+*** 804,809 ****
+--- 837,846 ----
+        printf (_(UT_HOST_PORT), 'p', "123");
+        printf (_(UT_WARN_CRIT));
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
++       printf (" -j, --jwarn=DOUBLE\n    Jitter level to result in warning status\n");
++       printf (" -k, --jcrit=DOUBLE\n    Jitter level to result in critical status\n");
++       printf (" -s, --swarn=INTEGER\n    Stratum clock level to result in warning status\n");
++       printf (" -S, --scrit=INTEGER\n    Stratum clock level to result in critical status\n");
+        printf (_(UT_VERBOSE));
+        printf (_(UT_SUPPORT));
+  }
diff --git a/web/attachments/216525-check_dhcp-osx.patch b/web/attachments/216525-check_dhcp-osx.patch
new file mode 100644
index 0000000..16c5319
--- /dev/null
+++ b/web/attachments/216525-check_dhcp-osx.patch
@@ -0,0 +1,20 @@
+--- plugins-root/check_dhcp.c   28 Jan 2007 21:46:41 -0000      1.8
++++ plugins-root/check_dhcp.c   18 Feb 2007 08:05:59 -0000
+@@ -65,7 +65,7 @@
+ #include <linux/if_ether.h>
+ #include <features.h>
+ 
+-#elif defined (__bsd__)
++#elif defined (__bsd__) || defined (__APPLE__)
+ 
+ #include <netinet/if_ether.h>
+ #include <sys/param.h>
+@@ -301,7 +301,7 @@
+ 
+        memcpy(&client_hardware_address[0],&ifr.ifr_hwaddr.sa_data,6);
+ 
+-#elif defined(__bsd__)
++#elif defined(__bsd__) || defined(__APPLE__)
+                                                /* King 2004    see ACKNOWLEDGEMENTS */
+ 
+         int                     mib[6], len;
diff --git a/web/attachments/217297-check_procs b/web/attachments/217297-check_procs
new file mode 100644
index 0000000..4c67842
--- /dev/null
+++ b/web/attachments/217297-check_procs
diff --git a/web/attachments/217472-check_dhcp.c.patch b/web/attachments/217472-check_dhcp.c.patch
new file mode 100644
index 0000000..d9b69e0
--- /dev/null
+++ b/web/attachments/217472-check_dhcp.c.patch
@@ -0,0 +1,93 @@
+--- nagios-plugins-HEAD-200702121300/plugins-root/check_dhcp.c  2007-01-28 22:46:41.000000000 +0100
++++ nagios-plugins-HEAD-200702121300/plugins-root/check_dhcp.c  2007-02-23 22:36:30.200102288 +0100
+@@ -182,6 +182,7 @@ typedef struct requested_server_struct{
+ #define DHCP_OPTION_BROADCAST_ADDRESS   28
+ #define DHCP_OPTION_REQUESTED_ADDRESS   50
+ #define DHCP_OPTION_LEASE_TIME          51
++#define DHCP_OPTION_SERVER_IDENTIFIER   54
+ #define DHCP_OPTION_RENEWAL_TIME        58
+ #define DHCP_OPTION_REBINDING_TIME      59
+ 
+@@ -768,6 +769,7 @@ int add_dhcp_offer(struct in_addr source
+        int y;
+        unsigned option_type;
+        unsigned option_length;
++       struct in_addr serv_ident = {0};
+ 
+        if(offer_packet==NULL)
+                return ERROR;
+@@ -789,23 +791,27 @@ int add_dhcp_offer(struct in_addr source
+                        printf("Option: %d (0x%02X)\n",option_type,option_length);
+ 
+                /* get option data */
+-               if(option_type==DHCP_OPTION_LEASE_TIME){
+-                       memcpy(&dhcp_lease_time, &offer_packet->options[x],sizeof(dhcp_lease_time));
++               switch(option_type) {
++               case DHCP_OPTION_LEASE_TIME:
++                       memcpy(&dhcp_lease_time,offer_packet->options+x,sizeof dhcp_lease_time);
+                        dhcp_lease_time = ntohl(dhcp_lease_time);
+-                       }
+-               if(option_type==DHCP_OPTION_RENEWAL_TIME){
+-                       memcpy(&dhcp_renewal_time, &offer_packet->options[x],sizeof(dhcp_renewal_time));
++                       break;
++               case DHCP_OPTION_RENEWAL_TIME:
++                       memcpy(&dhcp_renewal_time,offer_packet->options+x,sizeof dhcp_renewal_time);
+                        dhcp_renewal_time = ntohl(dhcp_renewal_time);
+-                       }
+-               if(option_type==DHCP_OPTION_REBINDING_TIME){
+-                       memcpy(&dhcp_rebinding_time, &offer_packet->options[x],sizeof(dhcp_rebinding_time));
++                       break;
++               case DHCP_OPTION_REBINDING_TIME:
++                       memcpy(&dhcp_rebinding_time,offer_packet->options+x,sizeof dhcp_rebinding_time);
+                        dhcp_rebinding_time = ntohl(dhcp_rebinding_time);
+-                       }
+-
++                       break;
++               case DHCP_OPTION_SERVER_IDENTIFIER:
++                       memcpy(&serv_ident.s_addr,offer_packet->options+x,sizeof serv_ident.s_addr);
++                       break;
++               }
+                /* skip option data we're ignoring */
+-               else
+-                       for(y=0;y<option_length;y++,x++);
+-               }
++               if(option_type!=DHCP_OPTION_REBINDING_TIME)
++                       x+=option_length;
++       }
+ 
+        if(verbose){
+                if(dhcp_lease_time==DHCP_INFINITE_TIME)
+@@ -819,14 +825,14 @@ int add_dhcp_offer(struct in_addr source
+                if(dhcp_rebinding_time==DHCP_INFINITE_TIME)
+                        printf(_("Rebinding Time: Infinite\n"));
+                printf(_("Rebinding Time: %lu seconds\n"),(unsigned long)dhcp_rebinding_time);
+-               }
++       }
+ 
+        new_offer=(dhcp_offer *)malloc(sizeof(dhcp_offer));
+ 
+        if(new_offer==NULL)
+                return ERROR;
+ 
+-       new_offer->server_address=source;
++       new_offer->server_address=serv_ident.s_addr?serv_ident:source;
+        new_offer->offered_address=offer_packet->yiaddr;
+        new_offer->lease_time=dhcp_lease_time;
+        new_offer->renewal_time=dhcp_renewal_time;
+@@ -836,14 +842,14 @@ int add_dhcp_offer(struct in_addr source
+        if(verbose){
+                printf(_("Added offer from server @ %s"),inet_ntoa(new_offer->server_address));
+                printf(_(" of IP address %s\n"),inet_ntoa(new_offer->offered_address));
+-               }
++       }
+ 
+        /* add new offer to head of list */
+        new_offer->next=dhcp_offer_list;
+        dhcp_offer_list=new_offer;
+ 
+        return OK;
+-        }
++}
+ 
+ 
+ /* frees memory allocated to DHCP OFFER list */
diff --git a/web/attachments/221749-check_snmp_sourceip.patch b/web/attachments/221749-check_snmp_sourceip.patch
new file mode 100644
index 0000000..2bba2f4
--- /dev/null
+++ b/web/attachments/221749-check_snmp_sourceip.patch
@@ -0,0 +1,78 @@
+--- check_snmp.c.orig   2007-03-22 15:24:22.000000000 +0100
++++ check_snmp.c        2007-03-22 15:23:00.000000000 +0100
+@@ -103,6 +103,7 @@
+ int errcode, excode;
+ 
+ char *server_address = NULL;
++char *client_address = NULL;
+ char *community = NULL;
+ char *authpriv = NULL;
+ char *proto = NULL;
+@@ -183,11 +184,22 @@
+ 
+        /* create the command line to execute */
+                if(usesnmpgetnext == TRUE) {
++               if (client_address != NULL)
++               asprintf(&command_line, "%s --clientaddr=%s -t %d -r %d -m %s -v %s %s %s:%s %s",
++                                   PATH_TO_SNMPGETNEXT, client_address, timeout_interval, retries, miblist, proto,
++                                               authpriv, server_address, port, oid);
++               if (client_address == NULL)
+                asprintf(&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+                                    PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
+                                                authpriv, server_address, port, oid);
+        }else{
+ 
++               if (client_address != NULL)
++               asprintf (&command_line, "%s --clientaddr=%s -t %d -r %d -m %s -v %s %s %s:%s %s",
++                 PATH_TO_SNMPGET, client_address, timeout_interval, retries, miblist, proto,
++                 authpriv, server_address, port, oid);
++
++               if (client_address == NULL)
+                asprintf (&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+                  PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+                  authpriv, server_address, port, oid);
+@@ -398,6 +410,7 @@
+        static struct option longopts[] = {
+                STD_LONG_OPTS,
+                {"community", required_argument, 0, 'C'},
++               {"source", required_argument, 0, 'S'},
+                {"oid", required_argument, 0, 'o'},
+                {"object", required_argument, 0, 'o'},
+                {"delimiter", required_argument, 0, 'd'},
+@@ -436,7 +449,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "nhvVt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:L:U:a:A:X:",
++               c = getopt_long (argc, argv, "nhvVt:c:w:H:S:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:L:U:a:A:X:",
+                                                                         longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+@@ -462,6 +475,9 @@
+                case 'H':                                                                       /* Host or server */
+                        server_address = optarg;
+                        break;
++               case 'S':                                                               /* Client source address */
++                       client_address = optarg;
++                       break;
+                case 'p':       /* TCP port number */
+                        port = optarg;
+                        break;
+@@ -919,6 +935,8 @@
+        /* SNMP and Authentication Protocol */
+        printf (" %s\n", "-n, --next");
+   printf ("    %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
++  printf (" %s\n", "-S, --source=ADDRESS");
++  printf ("    %s\n", _("Specify SNMP client source address"));
+   printf (" %s\n", "-P, --protocol=[1|2c|3]");
+   printf ("    %s\n", _("SNMP protocol version"));
+   printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
+@@ -1005,7 +1023,7 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-       printf ("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n",progname);
++       printf ("%s -H <ip_address> -o <OID> [-S source_ip_address] [-w warn_range] [-c crit_range]\n",progname);
+   printf ("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
+   printf ("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
+   printf ("[-m miblist] [-P snmp version] [-L seclevel] [-U secname] [-a authproto]\n");
diff --git a/web/attachments/222424-check_icmp.32bit-pid_t.patch b/web/attachments/222424-check_icmp.32bit-pid_t.patch
new file mode 100644
index 0000000..a3154ed
--- /dev/null
+++ b/web/attachments/222424-check_icmp.32bit-pid_t.patch
@@ -0,0 +1,17 @@
+Index: plugins-root/check_icmp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-root/check_icmp.c,v
+retrieving revision 1.11
+diff -u -r1.11 check_icmp.c
+--- plugins-root/check_icmp.c   8 Mar 2007 09:09:38 -0000       1.11
++++ plugins-root/check_icmp.c   27 Mar 2007 06:29:32 -0000
+@@ -395,7 +395,8 @@
+        environ = NULL;
+ 
+        /* use the pid to mark packets as ours */
+-       pid = getpid();
++       /* Some systems have 32-bit pid_t so mask off only 16 bits */
++       pid = getpid() & 0xffff;
+        /* printf("pid = %u\n", pid); */
+ 
+        /* get calling name the old-fashioned way for portability instead
diff --git a/web/attachments/222519-check_smtp.c.patch b/web/attachments/222519-check_smtp.c.patch
new file mode 100644
index 0000000..96e6f9d
--- /dev/null
+++ b/web/attachments/222519-check_smtp.c.patch
@@ -0,0 +1,14 @@
+--- check_smtp.c.orig   2007-03-27 10:20:06.000000000 -0400
++++ check_smtp.c        2007-03-27 10:20:58.000000000 -0400
+@@ -190,9 +190,9 @@
+                        printf(_("gethostname() failed!\n"));
+                        return STATE_CRITICAL;
+                }
+-       } else {
+-               helocmd = localhostname;
+        }
++       helocmd = localhostname;
++
+        if(use_ehlo)
+                asprintf (&helocmd, "%s%s%s", SMTP_EHLO, helocmd, "\r\n");
+        else
diff --git a/web/attachments/222809-check_ntp.startofvalue.patch b/web/attachments/222809-check_ntp.startofvalue.patch
new file mode 100644
index 0000000..998102b
--- /dev/null
+++ b/web/attachments/222809-check_ntp.startofvalue.patch
@@ -0,0 +1,17 @@
+Index: plugins/check_ntp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ntp.c,v
+retrieving revision 1.13
+diff -u -r1.13 check_ntp.c
+--- plugins/check_ntp.c 28 Jan 2007 21:46:40 -0000      1.13
++++ plugins/check_ntp.c 29 Mar 2007 11:33:26 -0000
+@@ -590,7 +590,8 @@
+                                if(verbose) {
+                                        printf("parsing jitter from peer %.2x: ", peers[i].assoc);
+                                }
+-                               startofvalue = strchr(req.data, '=') + 1;
++                               startofvalue = strchr(req.data, '=');
++                               if(startofvalue != NULL) startofvalue++;
+                                if(startofvalue != NULL) {
+                                        jitter = strtod(startofvalue, &nptr);
+                                }
diff --git a/web/attachments/226292-check_by_ssh.c b/web/attachments/226292-check_by_ssh.c
new file mode 100644
index 0000000..237d5b6
--- /dev/null
+++ b/web/attachments/226292-check_by_ssh.c
@@ -0,0 +1,388 @@
+/******************************************************************************

+*

+* Nagios check_by_ssh plugin

+*

+* License: GPL

+* Copyright (c) 1999-2006 nagios-plugins team

+*

+* Last Modified: $Date: 2007/01/28 21:46:40 $

+*

+* Description:

+*

+* This file contains the check_by_ssh plugin

+*

+* License Information:

+*

+* 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 2 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, write to the Free Software

+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+*

+* $Id: check_by_ssh.c,v 1.41 2007/01/28 21:46:40 hweiss Exp $

+* 

+******************************************************************************/

+ 

+const char *progname = "check_by_ssh";

+const char *revision = "$Revision: 1.41 $";

+const char *copyright = "2000-2006";

+const char *email = "nagiosplug-devel@lists.sourceforge.net";

+

+#include "common.h"

+#include "netutils.h"

+#include "utils.h"

+#include "runcmd.h"

+

+int process_arguments (int, char **);

+int validate_arguments (void);

+void print_help (void);

+void print_usage (void);

+

+int commands = 0;

+int services = 0;

+int skip = 0;

+char *remotecmd = NULL;

+char *comm = NULL;

+char *hostname = NULL;

+char *outputfile = NULL;

+char *host_shortname = NULL;

+char **service;

+int passive = FALSE;

+int verbose = FALSE;

+

+int

+main (int argc, char **argv)

+{

+

+        char *status_text;

+        int cresult;

+        int result = STATE_UNKNOWN;

+        int i;

+        time_t local_time;

+        FILE *fp = NULL;

+        struct output chld_out, chld_err;

+

+        remotecmd = "";

+        comm = strdup (SSH_COMMAND);

+

+        setlocale (LC_ALL, "");

+        bindtextdomain (PACKAGE, LOCALEDIR);

+        textdomain (PACKAGE);

+

+        /* process arguments */

+        if (process_arguments (argc, argv) == ERROR)

+                usage_va(_("Could not parse arguments"));

+

+        /* Set signal handling and alarm timeout */

+        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {

+                usage_va(_("Cannot catch SIGALRM"));

+        }

+        alarm (timeout_interval);

+

+        /* run the command */

+        if (verbose)

+                printf ("%s\n", comm);

+

+        result = np_runcmd(comm, &chld_out, &chld_err, 0);

+        /* UNKNOWN if output found on stderr */

+        if(chld_err.buflen && !skip) {

+                printf(_("Remote command execution failed: %s\n"),

+                           chld_err.buflen ? chld_err.buf : _("Unknown error"));

+                return STATE_UNKNOWN;

+        }

+

+        /* this is simple if we're not supposed to be passive.

+         * Wrap up quickly and keep the tricks below */

+        if(!passive) {

+                printf ("%s\n", skip < chld_out.lines ? chld_out.line[skip] : chld_out.buf);

+                return result;  /* return error status from remote command */

+        }

+

+

+        /*

+         * Passive mode

+         */

+

+        /* process output */

+        if (!(fp = fopen (outputfile, "a"))) {

+                printf (_("SSH WARNING: could not open %s\n"), outputfile);

+                exit (STATE_UNKNOWN);

+        }

+

+        local_time = time (NULL);

+        commands = 0;

+        for(i = skip; chld_out.line[i]; i++) {

+                status_text = strstr (chld_out.line[i], "STATUS CODE: ");

+                if (status_text == NULL) {

+                        printf ("%s", chld_out.line[i]);

+                        return result;

+                }

+                if (service[commands] && status_text

+                        && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1)

+                {

+                        fprintf (fp, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n",

+                                 (int) local_time, host_shortname, service[commands++],

+                                 cresult, chld_out.line[i]);

+                }

+        }

+        

+        /* force an OK state */

+        return result;

+}

+

+/* process command-line arguments */

+int

+process_arguments (int argc, char **argv)

+{

+        int c;

+        char *p1, *p2;

+

+        int option = 0;

+        static struct option longopts[] = {

+                {"version", no_argument, 0, 'V'},

+                {"help", no_argument, 0, 'h'},

+                {"verbose", no_argument, 0, 'v'},

+                {"fork", no_argument, 0, 'f'},

+                {"timeout", required_argument, 0, 't'},

+                {"host", required_argument, 0, 'H'},

+                {"port", required_argument,0,'p'},

+                {"output", required_argument, 0, 'O'},

+                {"name", required_argument, 0, 'n'},

+                {"services", required_argument, 0, 's'},

+                {"identity", required_argument, 0, 'i'},

+                {"user", required_argument, 0, 'u'},

+                {"logname", required_argument, 0, 'l'},

+                {"command", required_argument, 0, 'C'},

+                {"skip", required_argument, 0, 'S'},

+                {"proto1", no_argument, 0, '1'},

+                {"proto2", no_argument, 0, '2'},

+                {"use-ipv4", no_argument, 0, '4'},

+                {"use-ipv6", no_argument, 0, '6'},

+                {"ssh-option", required_argument, 0, 'o'},

+                {"quiet", no_argument, 0, 'q'},

+                {0, 0, 0, 0}

+        };

+

+        if (argc < 2)

+                return ERROR;

+

+        for (c = 1; c < argc; c++)

+                if (strcmp ("-to", argv[c]) == 0)

+                        strcpy (argv[c], "-t");

+

+        while (1) {

+                c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S:n:s:o:", longopts,

+                                 &option);

+

+                if (c == -1 || c == EOF)

+                        break;

+

+                switch (c) {

+                case 'V':                                                                       /* version */

+                        print_revision (progname, revision);

+                        exit (STATE_OK);

+                case 'h':                                                                       /* help */

+                        print_help ();

+                        exit (STATE_OK);

+                case 'v':                                                                       /* help */

+                        verbose = TRUE;

+                        break;

+                case 't':                                                                       /* timeout period */

+                        if (!is_integer (optarg))

+                                usage_va(_("Timeout interval must be a positive integer"));

+                        else

+                                timeout_interval = atoi (optarg);

+                        break;

+                case 'H':                                                                       /* host */

+                        host_or_die(optarg);

+                        hostname = optarg;

+                        break;

+                case 'p': /* port number */

+                        if (!is_integer (optarg))

+                                usage_va(_("Port must be a positive integer"));

+                        asprintf (&comm,"%s -p %s", comm, optarg);

+                        break;

+                case 'O':                                                                       /* output file */

+                        outputfile = optarg;

+                        passive = TRUE;

+                        break;

+                case 's':                                                                       /* description of service to check */

+                        p1 = optarg;

+                        service = realloc (service, (++services) * sizeof(char *));

+                        while ((p2 = index (p1, ':'))) {

+                                *p2 = '\0';

+                                service[services - 1] = p1;

+                                service = realloc (service, (++services) * sizeof(char *));

+                                p1 = p2 + 1;

+                        }

+                        service[services - 1] = p1;

+                        break;

+                case 'n':                                                                       /* short name of host in nagios configuration */

+                        host_shortname = optarg;

+                        break;

+

+                case 'u':

+                        c = 'l';

+                case 'l':                                                                       /* login name */

+                case 'i':                                                                       /* identity */

+                        asprintf (&comm, "%s -%c %s", comm, c, optarg);

+                        break;

+

+                case '1':                                                                       /* Pass these switches directly to ssh */

+                case '2':                                                                       /* 1 to force version 1, 2 to force version 2 */

+                case '4':                                                                       /* -4 for IPv4 */

+                case '6':                                                               /* -6 for IPv6 */

+                case 'f':                                                                       /* fork to background */

+                        asprintf (&comm, "%s -%c", comm, c);

+                        break;

+                case 'C':                                                                       /* Command for remote machine */

+                        commands++;

+                        if (commands > 1)

+                                asprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);

+                        asprintf (&remotecmd, "%s%s", remotecmd, optarg);

+                        break;

+                case 'S':                                                                       /* Skip n lines in the output to ignore system banner */

+                        if (!is_integer (optarg))

+                                usage_va(_("skip lines must be an integer"));

+                        else

+                                skip = atoi (optarg);

+                        break;

+                case 'o':                                                                       /* Extra options for the ssh command */

+                        asprintf (&comm, "%s -%c '%s'", comm, c, optarg);

+                        break;

+                case 'q':                                                                       /* Tell the ssh command to be quiet */

+                        asprintf (&comm, "%s -%c", comm, c);

+                        break;

+                default:                                                                        /* help */

+                        usage5();

+                }

+        }

+

+        c = optind;

+        if (hostname == NULL) {

+                if (c <= argc) {

+                        die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);

+                }

+                host_or_die(argv[c]);

+                hostname = argv[c++];

+        }

+

+        if (strlen(remotecmd) == 0) {

+                for (; c < argc; c++)

+                        if (strlen(remotecmd) > 0)

+                                asprintf (&remotecmd, "%s %s", remotecmd, argv[c]);

+                        else

+                                asprintf (&remotecmd, "%s", argv[c]);

+        }

+

+        if (commands > 1)

+                asprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);

+

+        if (remotecmd == NULL || strlen (remotecmd) <= 1)

+                usage_va(_("No remotecmd"));

+

+        asprintf (&comm, "%s %s '%s'", comm, hostname, remotecmd);

+

+        return validate_arguments ();

+}

+

+

+

+int

+validate_arguments (void)

+{

+        if (remotecmd == NULL || hostname == NULL)

+                return ERROR;

+

+        if (passive && commands != services)

+                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);

+

+        if (passive && host_shortname == NULL)

+                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname);

+

+        return OK;

+}

+

+

+void

+print_help (void)

+{

+        print_revision (progname, revision);

+

+        printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");

+        printf (COPYRIGHT, copyright, email);

+

+        printf (_("This plugin uses SSH to execute commands on a remote host"));

+

+  printf ("\n\n");

+  

+        print_usage ();

+

+        printf (_(UT_HELP_VRSN));

+

+        printf (_(UT_HOST_PORT), 'p', "none");

+

+        printf (_(UT_IPv46));

+

+  printf (" %s\n", "-1, --proto1");

+  printf ("    %s\n", _("tell ssh to use Protocol 1"));

+  printf (" %s\n", "-2, --proto2");

+  printf ("    %s\n", _("tell ssh to use Protocol 2"));

+  printf (" %s\n", "-S, --skip=n");

+  printf ("    %s\n", _("Ignore first n lines on STDERR (to suppress a logon banner)"));

+  printf (" %s\n", "-f");

+  printf ("    %s\n", _("tells ssh to fork rather than create a tty"));

+  printf (" %s\n","-C, --command='COMMAND STRING'");

+  printf ("    %s\n", _("command to execute on the remote machine"));

+  printf (" %s\n","-l, --logname=USERNAME");

+  printf ("    %s\n", _("SSH user name on remote host [optional]"));

+  printf (" %s\n","-i, --identity=KEYFILE");

+  printf ("    %s\n", _("identity of an authorized key [optional]"));

+  printf (" %s\n","-O, --output=FILE");

+  printf ("    %s\n", _("external command file for nagios [optional]"));

+  printf (" %s\n","-s, --services=LIST");

+  printf ("    %s\n", _("list of nagios service names, separated by ':' [optional]"));

+  printf (" %s\n","-n, --name=NAME");

+  printf ("    %s\n", _("short name of host in nagios configuration [optional]"));

+  printf (" %s\n","-o, --ssh-option=OPTION");

+  printf ("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));

+  printf (" %s\n","-q, --quiet");

+  printf ("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));

+        printf (_(UT_WARN_CRIT));

+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);

+  printf (" %s\n", _("The most common mode of use is to refer to a local identity file with"));

+  printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));

+  printf (" %s\n", _("passphrase and the public key should be listed in the authorized_keys"));

+  printf (" %s\n", _("file of the remote host. Usually the key will be restricted to running"));

+  printf (" %s\n", _("only one command on the remote server. If the remote SSH server tracks"));

+  printf (" %s\n", _("invocation arguments, the one remote program may be an agent that can"));

+  printf (" %s\n", _("execute additional commands as proxy"));

+  printf (" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));

+  printf (" %s\n", _("all of -O, -s, and -n options (servicelist order must match '-C'options)"));

+  printf ("\n");

+  printf ("%s\n", _("Examples:"));

+  printf (" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C uptime -O /tmp/foo");

+  printf (" %s\n", "$ cat /tmp/foo");

+  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days");

+  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days");

+  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");

+        printf (_(UT_SUPPORT));

+}

+

+

+

+void

+print_usage (void)

+{

+        printf (_("Usage:"));

+  printf(" %s [-fq46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>",progname);

+  printf(" [-n name] [-s servicelist] [-O outputfile] [-p port] [-o ssh-option]\n");

+}

diff --git a/web/attachments/227858-check_httppatch.txt b/web/attachments/227858-check_httppatch.txt
new file mode 100644
index 0000000..08bf2ff
--- /dev/null
+++ b/web/attachments/227858-check_httppatch.txt
@@ -0,0 +1,103 @@
+--- check_http.c        2007-03-06 14:45:57.000000000 -0800

++++ -   2007-05-04 11:00:35.226089000 -0700

+@@ -110,7 +110,7 @@

+ int http_opt_headers_count = 0;

+ int onredirect = STATE_OK;

+ int use_ssl = FALSE;

+-int verbose = FALSE;

++int verbose = TRUE;

+ int sd;

+ int min_page_len = 0;

+ int max_page_len = 0;

+@@ -751,6 +751,17 @@

+   char *header;

+   char *page;

+   char *auth;

++/* Patched by T.P -- binary data */

++  char bindata[MAX_INPUT_BUFFER];

++  int bindatalen = 0;

++  int bindatafound = 0;

++  int bufpos=0;

++  int mybuflen=0;

++  char *pointer = http_post_data;

++  unsigned long ascii = 0;

++  char code[3] = {0};

++  char *end = NULL;

++/* End patch */

+   int http_status;

+   int i = 0;

+   size_t pagesize = 0;

+@@ -800,14 +811,42 @@

+ 

+   /* either send http POST data */

+   if (http_post_data) {

++/*  Patched by T.P -- binary data */

++    while (*pointer) {

++      if (*pointer == '%') {

++        /* Interpret the next two hex chars -- no error checking */

++        memcpy(code,++pointer,2);

++        ascii = strtoul(code,&end,16);

++        bindata[bindatalen] = (char)ascii;

++        pointer += 2;

++      } else if (*pointer == '\\') {

++        /* Skip the escape char -- no error checking */

++        pointer++;

++        bindata[bindatalen++] = *pointer++;

++      } else {

++        /* Just copy the char */

++        bindata[bindatalen] = *pointer++;

++      }

++      bindatalen++;

++    }

++    /* Truncate the original string at the shorter length for future use */

++    http_post_data[bindatalen] = (char)0;

++/* End patch */

+     if (http_content_type) {

+       asprintf (&buf, "%sContent-Type: %s\r\n", buf, http_content_type);

+     } else {

+       asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);

+     }

+     

++/* Patched by T.P -- binary data */

++    /* original line

+     asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen (http_post_data));

++    */

++    asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, bindatalen);

++    /* Print the original (ascii, truncated) string to fill space */

+     asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);

++    bufpos = strlen(buf) - bindatalen - 2;

++/* End patch */

+   }

+   else {

+     /* or just a newline so the server knows we're done with the request */

+@@ -815,13 +854,29 @@

+   }

+ 

+   if (verbose) printf ("%s\n", buf);

+-  my_send (buf, strlen (buf));

++/* Patched by T.P -- binary data */

++  if (bindatalen) {

++    mybuflen = strlen(buf);

++    /* Overwrite it with the (possibly) binary data */

++    for (i=0;i<bindatalen;i++) {

++      buf[i+bufpos] = bindata[i];

++    }

++    my_send (buf, mybuflen);

++  } else {

++  /* original line */

++    my_send (buf, strlen (buf));

++  }

+ 

+   /* fetch the page */

+   full_page = strdup("");

++  pointer=full_page;

+   while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {

++    /* Original lines

+     buffer[i] = '\0';

+     asprintf (&full_page, "%s%s", full_page, buffer);

++    */

++    memcpy(pointer+pagesize,buffer,i);

++/* End patch */

+     pagesize += i;

+ 

+                 if (no_body && document_headers_done (full_page)) {
\ No newline at end of file
diff --git a/web/attachments/228497-check_disk_smb.pl-diff b/web/attachments/228497-check_disk_smb.pl-diff
new file mode 100644
index 0000000..496d1a4
--- /dev/null
+++ b/web/attachments/228497-check_disk_smb.pl-diff
@@ -0,0 +1,17 @@
+Index: check_disk_smb.pl
+===================================================================
+RCS file: /usr/local/share/cvs/MyNagiosTools/check_disk_smb.pl,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -r1.1 -r1.2
+26c26
+< use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose);
+---
+> use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_I $verbose);
+51a52
+>        "I=s" => \$opt_I, "ipaddess=s" => \$opt_I,
+63a65,68
+> #
+> # by Rene Fertig
+> #
+> $smbclientoptions.= $opt_I ? "-I $opt_I " : "";
diff --git a/web/attachments/229809-c b/web/attachments/229809-c
new file mode 100644
index 0000000..5f311fc
--- /dev/null
+++ b/web/attachments/229809-c
@@ -0,0 +1,19 @@
+*** check_by_ssh.c      18 Apr 2007 21:31:29 +0200      1.43
+--- check_by_ssh.c      19 May 2007 17:15:55 +0200      
+***************
+*** 393,398 ****
+--- 393,406 ----
+    printf (" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));
+    printf (" %s\n", _("all of -O, -s, and -n options (servicelist order must match '-C'options)"));
+    printf ("\n");
++   printf (" %s\n", _("The -C command is not evaluated by a shell, it is parsed by a custom algorithm."));
++   printf (" %s\n", _("Double quotes are forbiden. "));
++   printf (" %s\n", _("Single quotes are allowed if not surrounded by spaces but"));
++   printf (" %s\n", _("will not have the expected result because they are parsed"));
++   printf (" %s\n", _("in a way that was not designed specificaly for ssh invocation."));
++   printf (" %s\n", _("Backslash can be used as in the following example:"));
++   printf (" %s\n", _("... -C 'check_mysql_query -q select\ count\(serial\)\ from\ counter -u nagios -d pokernetwork -H localhost -c 0' ... "));
++   printf ("\n");
+    printf ("%s\n", _("Examples:"));
+    printf (" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C uptime -O /tmp/foo");
+    printf (" %s\n", "$ cat /tmp/foo");
diff --git a/web/attachments/230229-nagios-checkdns.patch b/web/attachments/230229-nagios-checkdns.patch
new file mode 100644
index 0000000..591cbf8
--- /dev/null
+++ b/web/attachments/230229-nagios-checkdns.patch
@@ -0,0 +1,86 @@
+diff -ru nagios-plugins-HEAD-200705220000/plugins/check_dns.c nagios-plugins/plugins/check_dns.c
+--- nagios-plugins-HEAD-200705220000/plugins/check_dns.c        2007-01-28 22:46:40.000000000 +0100
++++ nagios-plugins/plugins/check_dns.c  2007-05-23 12:06:06.000000000 +0200
+@@ -62,12 +62,24 @@
+ int expect_authority = FALSE;
+ thresholds *time_thresholds = NULL;
+ 
++static int
++qstrcmp(const void *p1, const void *p2)
++{
++       /* The actual arguments to this function are "pointers to
++          pointers to char", but strcmp() arguments are "pointers
++          to char", hence the following cast plus dereference */
++       return strcmp(* (char * const *) p1, * (char * const *) p2);
++}
++
++
+ int
+ main (int argc, char **argv)
+ {
+   char *command_line = NULL;
+   char input_buffer[MAX_INPUT_BUFFER];
+   char *address = NULL;
++  char **addresses = NULL;
++  int n_addresses = 0;
+   char *msg = NULL;
+   char *temp_buffer = NULL;
+   int non_authoritative = FALSE;
+@@ -141,16 +153,17 @@
+              NSLOOKUP_COMMAND);
+       }
+ 
+-      if (address == NULL)
+-        address = strdup (temp_buffer);
+-      else
+-        asprintf(&address, "%s,%s", address, temp_buffer);
++      if (addresses == NULL) 
++       addresses = malloc(sizeof(*addresses)*10);
++      else if (!(n_addresses % 10))
++       addresses = realloc(addresses,sizeof(*addresses) * (n_addresses + 10));
++      addresses[n_addresses++] = strdup(temp_buffer);
+     }
+-
+     else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
+       non_authoritative = TRUE;
+     }
+ 
++
+     result = error_scan (chld_out.line[i]);
+     if (result != STATE_OK) {
+       msg = strchr (chld_out.line[i], ':');
+@@ -171,9 +184,21 @@
+     }
+   }
+ 
+-  /* If we got here, we should have an address string,
+-   * and we can segfault if we do not */
+-  if (address==NULL || strlen(address)==0)
++  if (addresses) {
++    int i,slen;
++    char *adrp;
++    qsort(addresses, n_addresses, sizeof(*addresses), qstrcmp);
++    for(i=0, slen=1; i < n_addresses; i++) {
++      slen += strlen(addresses[i])+1;
++    }
++    adrp = address = malloc(slen);
++    for(i=0; i < n_addresses; i++) {
++      if (i) *adrp++ = ',';
++      strcpy(adrp, addresses[i]);
++      adrp += strlen(addresses[i]);
++    }
++    *adrp = 0;
++  } else
+     die (STATE_CRITICAL,
+          _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
+          NSLOOKUP_COMMAND);
+@@ -428,7 +453,8 @@
+   printf (" -s, --server=HOST\n");
+   printf ("    %s\n", _("Optional DNS server you want to use for the lookup"));
+   printf (" -a, --expected-address=IP-ADDRESS|HOST\n");
+-  printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with ."));
++  printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with .\n\
++Multiple addresses can be separated with commas, and need to be sorted."));
+   printf (" -A, --expect-authority\n");
+   printf ("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
+   printf (" -w, --warning=seconds\n");
diff --git a/web/attachments/230926-check_ntp.c.patch b/web/attachments/230926-check_ntp.c.patch
new file mode 100644
index 0000000..7b59002
--- /dev/null
+++ b/web/attachments/230926-check_ntp.c.patch
@@ -0,0 +1,70 @@
+--- check_ntp.c.orig    2007-04-10 08:17:18.000000000 +0100
++++ check_ntp.c 2007-05-29 12:41:58.000000000 +0100
+@@ -47,6 +47,7 @@
+ 
+ static char *server_address=NULL;
+ static int verbose=0;
++static int max_hosts=0;
+ static double owarn=60;
+ static double ocrit=120;
+ static short do_jitter=0;
+@@ -372,7 +373,15 @@
+        }
+ 
+        /* count the number of returned hosts, and allocate stuff accordingly */
+-       for(ai_tmp=ai; ai_tmp!=NULL; ai_tmp=ai_tmp->ai_next){ num_hosts++; }
++       for(ai_tmp=ai; ai_tmp!=NULL; ai_tmp=ai_tmp->ai_next){
++               num_hosts++;
++               /* Reached max # hosts to compare ? */
++               if(max_hosts && num_hosts >= max_hosts && ai_tmp->ai_next) {
++printf("chopping at %d\n", num_hosts);
++                       freeaddrinfo(ai_tmp->ai_next);
++                       ai_tmp->ai_next = NULL;
++               }
++       }
+        req=(ntp_message*)malloc(sizeof(ntp_message)*num_hosts);
+        if(req==NULL) die(STATE_UNKNOWN, "can not allocate ntp message array");
+        socklist=(int*)malloc(sizeof(int)*num_hosts);
+@@ -651,6 +660,7 @@
+                {"critical", required_argument, 0, 'c'},
+                {"jwarn", required_argument, 0, 'j'},
+                {"jcrit", required_argument, 0, 'k'},
++               {"maxhosts", required_argument, 0, 'm'},
+                {"timeout", required_argument, 0, 't'},
+                {"hostname", required_argument, 0, 'H'},
+                {0, 0, 0, 0}
+@@ -661,7 +671,7 @@
+                usage ("\n");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "Vhv46w:c:j:k:t:H:", longopts, &option);
++               c = getopt_long (argc, argv, "Vhv46w:c:j:k:t:H:m:", longopts, &option);
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+ 
+@@ -677,6 +687,9 @@
+                case 'v':
+                        verbose++;
+                        break;
++               case 'm':
++                       max_hosts = atoi(optarg);
++                       break;
+                case 'w':
+                        owarn = atof(optarg);
+                        break;
+@@ -848,6 +861,8 @@
+        printf ("    %s\n", _("Warning value for jitter"));
+        printf (" %s\n", "-k, --critical=DOUBLE");
+        printf ("    %s\n", _("Critical value for jitter"));
++       printf (" %s\n", "-m, --maxhosts=INTEGER");
++       printf ("    %s\n", _("Max hosts to check - for where host expands to multiple addresses"));
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (_(UT_VERBOSE));
+        printf (_(UT_SUPPORT));
+@@ -857,5 +872,5 @@
+ print_usage(void)
+ {
+   printf (_("Usage:"));
+-  printf("%s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname);
++  printf("%s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose] [-m <max hosts to check>]\n", progname);
+ }
diff --git a/web/attachments/231381-check_ntp-jitterfix.diff b/web/attachments/231381-check_ntp-jitterfix.diff
new file mode 100644
index 0000000..d6d6d78
--- /dev/null
+++ b/web/attachments/231381-check_ntp-jitterfix.diff
@@ -0,0 +1,11 @@
+--- nagios-plugins-HEAD-200706011200/plugins-scripts/check_ntp.pl       2005-11-29 16:49:47.000000000 -0800
++++ nagios-plugins/plugins-scripts/check_ntp.pl 2007-06-01 09:40:41.000000000 -0700
+@@ -312,6 +312,8 @@
+                                } else {
+                                        $jitter_error = $ERRORS{'OK'};
+                                }
++                               # We found the associated host, no need to process any more
++                               last;
+                        } else {
+                                print "No match!\n" if $verbose;
+                                $jitter = '(not parsed)';
diff --git a/web/attachments/234288-check_smtp.c.patch b/web/attachments/234288-check_smtp.c.patch
new file mode 100644
index 0000000..9a69cce
--- /dev/null
+++ b/web/attachments/234288-check_smtp.c.patch
@@ -0,0 +1,53 @@
+*** check_smtp.c.orig   Wed Jun 13 12:19:37 2007
+--- check_smtp.c        Wed Jun 13 12:22:30 2007
+*************** process_arguments (int argc, char **argv
+*** 582,603 ****
+                        break;
+                case 'C':                                                                       /* commands  */
+                        if (ncommands >= command_size) {
+!                               commands = realloc (commands, command_size+8);
+                                if (commands == NULL)
+                                        die (STATE_UNKNOWN,
+                                             _("Could not realloc() units [%d]\n"), ncommands);
+                        }
+!                       commands[ncommands] = optarg;
+                        ncommands++;
+                        break;
+                case 'R':                                                                       /* server responses */
+                        if (nresponses >= response_size) {
+!                               responses = realloc (responses, response_size+8);
+                                if (responses == NULL)
+                                        die (STATE_UNKNOWN,
+                                             _("Could not realloc() units [%d]\n"), nresponses);
+                        }
+!                       responses[nresponses] = optarg;
+                        nresponses++;
+                        break;
+                case 'c':                                                                       /* critical time threshold */
+--- 582,607 ----
+                        break;
+                case 'C':                                                                       /* commands  */
+                        if (ncommands >= command_size) {
+!                                 command_size+=8;
+!                                 commands = realloc (commands, sizeof(char **)*command_size);
+                                if (commands == NULL)
+                                        die (STATE_UNKNOWN,
+                                             _("Could not realloc() units [%d]\n"), ncommands);
+                        }
+!                         commands[ncommands] = (char *)malloc (sizeof(char)*255);
+!                         strncpy (commands[ncommands], optarg, 250);
+                        ncommands++;
+                        break;
+                case 'R':                                                                       /* server responses */
+                        if (nresponses >= response_size) {
+!                                 response_size += 8;
+!                                 responses = realloc (responses, sizeof(char **)*response_size);
+                                if (responses == NULL)
+                                        die (STATE_UNKNOWN,
+                                             _("Could not realloc() units [%d]\n"), nresponses);
+                        }
+!                         responses[nresponses] = (char *)malloc (sizeof(char)*255);
+!                         strncpy (responses[nresponses], optarg, 250);
+                        nresponses++;
+                        break;
+                case 'c':                                                                       /* critical time threshold */
diff --git a/web/attachments/239325-check_file_age.patch b/web/attachments/239325-check_file_age.patch
new file mode 100644
index 0000000..9381765
--- /dev/null
+++ b/web/attachments/239325-check_file_age.patch
@@ -0,0 +1,84 @@
+--- check_file_age.bak  2007-07-27 14:24:15.000000000 +0100
++++ check_file_age      2007-07-27 14:31:20.000000000 +0100
+@@ -33,22 +33,23 @@
+ sub print_help ();
+ sub print_usage ();
+ 
+-my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
+-my ($result, $message, $age, $size, $st);
+-
+ $PROGNAME="check_file_age";
+ 
+-$opt_w = 240;
+-$opt_c = 600;
+-$opt_W = 0;
+-$opt_C = 0;
+-$opt_f = "";
++my $opt_V = undef;
++my $opt_w = 240;
++my $opt_c = 600;
++my $opt_W = 0;
++my $opt_C = 0;
++my $opt_f = "";
++my $opt_d = "";
++my $opt_h = "";
+ 
+ Getopt::Long::Configure('bundling');
+ GetOptions(
+        "V"   => \$opt_V, "version"     => \$opt_V,
+        "h"   => \$opt_h, "help"        => \$opt_h,
+        "f=s" => \$opt_f, "file"        => \$opt_f,
++       "d=s" => \$opt_d, "dir"         => \$opt_d,
+        "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
+        "W=f" => \$opt_W, "warning-size=f" => \$opt_W,
+        "c=f" => \$opt_c, "critical-age=f" => \$opt_c,
+@@ -64,25 +65,32 @@
+        exit $ERRORS{'OK'};
+ }
+ 
+-$opt_f = shift unless ($opt_f);
++$opt_f = shift unless ($opt_f or $opt_d);
+ 
+-if (! $opt_f) {
+-       print "No file specified\n";
++if (not $opt_f and not $opt_d) {
++       print "No file or directory specified\n";
+        exit $ERRORS{'UNKNOWN'};
+ }
+ 
+ # Examine the file.
+-unless (-f $opt_f) {
++if ($opt_f and not -f $opt_f)
++{
+        print "$opt_f: File not found\n";
+        exit $ERRORS{'UNKNOWN'};
+ }
++elsif ($opt_d and not -d $opt_d)
++{
++       print "$opt_d: Directory not found\n";
++       exit $ERRORS{'UNKNOWN'};
++}
+ 
+-$st = File::stat::stat($opt_f);
+-$age = time - $st->mtime;
+-$size = $st->size;
++my $file = $opt_f || $opt_d;
+ 
++my $st = File::stat::stat($file);
++my $age = time - $st->mtime;
++my $size = $st->size;
+ 
+-$result = 'OK';
++my $result = 'OK';
+ 
+ if (($opt_c and $age > $opt_c) or ($opt_C and $size < $opt_C)) {
+        $result = 'CRITICAL';
+@@ -91,7 +99,7 @@
+        $result = 'WARNING';
+ }
+ 
+-print "$result - $opt_f is $age seconds old and $size bytes\n";
++print "$result - $file is $age seconds old and $size bytes\n";
+ exit $ERRORS{$result};
+ 
+ sub print_usage () {
diff --git a/web/attachments/239424-check_email_loop.diff b/web/attachments/239424-check_email_loop.diff
new file mode 100644
index 0000000..e06de63
--- /dev/null
+++ b/web/attachments/239424-check_email_loop.diff
@@ -0,0 +1,48 @@
+Index: etch/contrib/check_email_loop.pl

+===================================================================

+--- etch/contrib/check_email_loop.pl    (revision 172)

++++ etch/contrib/check_email_loop.pl    (working copy)

+@@ -112,6 +112,7 @@

+ # creating new serial id

+ my $serial = time();

+ $serial = "ID#" . $serial . "#$$";

++push @messageids, $serial;

+

+

+ # sending new ping email

+@@ -136,6 +137,7 @@

+ # no the interessting part: let's if they are receiving ;-)

+

+ $pop = Net::POP3->new( $pophost,

++                Debug=>$debug,

+                 Timeout=>$poptimeout)

+        || nsexit("POP3 connect timeout (>$poptimeout s, host: $pophost)",'CRITICAL');

+

+@@ -154,6 +156,7 @@

+   @msglines = @{$pop->top($msgcount,1)};

+   for (my $i=0; $i < scalar @messageids; $i++) {

+     if (messagematchsid(\@msglines,$messageids[$i])) {

++      warn "Found message $messageids[$i]\n" if $debug;

+       $matchcount++;

+       # newest received mail than the others, ok remeber id.

+       if (!defined $newestid) {

+@@ -177,6 +180,7 @@

+        chomp @msgsubject;

+        # Scan Subject if email is an Email-Ping. In fact we match and delete also successfully retrieved messages here again.

+        if (!defined $keeporphaned && $msgsubject[0] =~ /E-Mail Ping \[/) {

++               warn "Deleting orphan: $msgsubject[0]\n";

+            $pop->delete($msgcount);  # remove E-Mail from POP3 server

+        }

+

+@@ -200,10 +204,7 @@

+ }

+

+ # Write list to id-Database

+-foreach my $id (@messageids) {

+-  print STATF  "$id\n";

+-}

+-print STATF "$serial\n";     # remember send mail of this session

++print STATF map { "$_\n" } @messageids;

+ close STATF;

+

+ # ok - count lost and pending mails;

diff --git a/web/attachments/239804-check_ifstatus.pl.patch b/web/attachments/239804-check_ifstatus.pl.patch
new file mode 100644
index 0000000..6dd90a0
--- /dev/null
+++ b/web/attachments/239804-check_ifstatus.pl.patch
@@ -0,0 +1,4 @@
+209c209

+< my $perfdata = sprintf("up=%d,down=%d,dormant=%d,excluded=%d,unused=%d",$ifup,$ifdown,$ifdormant,$ifexclude,$ifunused);

+---

+> my $perfdata = sprintf("up=%d down=%d dormant=%d excluded=%d unused=%d",$ifup,$ifdown,$ifdormant,$ifexclude,$ifunused);

diff --git a/web/attachments/240316-check_by_ssh.c.patch b/web/attachments/240316-check_by_ssh.c.patch
new file mode 100644
index 0000000..4f4982e
--- /dev/null
+++ b/web/attachments/240316-check_by_ssh.c.patch
@@ -0,0 +1,12 @@
+--- nagios-plugins-trunk-200708071200/plugins/check_by_ssh.c    2007-06-13 01:18:13.000000000 +0200
++++ nagios-plugins-trunk-200708071200-check_by_ssh_patch/plugins/check_by_ssh.c 2007-08-07 20:31:57.000000000 +0200
+@@ -110,7 +110,8 @@
+         * Wrap up quickly and keep the tricks below */
+        if(!passive) {
+                if (chld_out.lines > skip_stdout)
+-                       puts (chld_out.line[skip_stdout]);
++                       for (i = skip_stdout; i < chld_out.lines; i++)
++                               puts (chld_out.line[i]);
+                else
+                        printf (_("%s - check_by_ssh: Remote command '%s' returned status %d\n"),
+                                state_text(result), remotecmd, result);
diff --git a/web/attachments/240318-configure.patch b/web/attachments/240318-configure.patch
new file mode 100644
index 0000000..c9dc127
--- /dev/null
+++ b/web/attachments/240318-configure.patch
@@ -0,0 +1,20 @@
+--- configure.in        2007-08-07 23:21:00.000000000 +0200
++++ configure_radiusclientng.in 2007-08-07 23:20:54.000000000 +0200
+@@ -218,8 +218,15 @@
+        RADIUSLIBS="-lradiusclient"
+   AC_SUBST(RADIUSLIBS)
+ else
+-  AC_MSG_WARN([Skipping radius plugin])
+-  AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
++  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"
++    AC_SUBST(RADIUSLIBS)
++  else
++    AC_MSG_WARN([Skipping radius plugin])
++    AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
++  fi
+ fi
+ LIBS="$_SAVEDLIBS"
+ 
diff --git a/web/attachments/240319-wrapper.patch b/web/attachments/240319-wrapper.patch
new file mode 100644
index 0000000..0d852ef
--- /dev/null
+++ b/web/attachments/240319-wrapper.patch
@@ -0,0 +1,146 @@
+--- check_radius_orig.c 2007-08-07 22:34:39.000000000 +0200
++++ check_radius.c      2007-08-07 23:07:46.000000000 +0200
+@@ -43,12 +43,28 @@
+ #include "utils.h"
+ #include "netutils.h"
+ 
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++#include <radiusclient-ng.h>
++rc_handle *rch = NULL;
++#else
+ #include <radiusclient.h>
++#endif
+ 
+ int process_arguments (int, char **);
+ void print_help (void);
+ void print_usage (void);
+ 
++/* libradiusclient(-ng) wrapper functions */
++int my_rc_read_dictionary(const char *);
++VALUE_PAIR *my_rc_avpair_add(VALUE_PAIR **, int, void *, int);
++UINT4 my_rc_own_ipaddress();
++void my_rc_buildreq(SEND_DATA *, int, char *, unsigned short, int, int);
++int my_rc_send_server(SEND_DATA *, char *);
++char *my_rc_conf_str(char *);
++int my_rc_read_config(char *);
++
++
++
+ char *server = NULL;
+ char *username = NULL;
+ char *password = NULL;
+@@ -133,33 +149,33 @@
+                usage4 (_("Could not parse arguments"));
+ 
+        str = strdup ("dictionary");
+-       if ((config_file && rc_read_config (config_file)) ||
+-                       rc_read_dictionary (rc_conf_str (str)))
++       if ((config_file && my_rc_read_config (config_file)) ||
++                       my_rc_read_dictionary (my_rc_conf_str (str)))
+                die (STATE_UNKNOWN, _("Config file error"));
+ 
+        service = PW_AUTHENTICATE_ONLY;
+ 
+        memset (&data, 0, sizeof(data));
+-       if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+-                               rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
+-                               rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
+-                               (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
++       if (!(my_rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
++                               my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
++                               my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
++                               (nasid==NULL || my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
+                die (STATE_UNKNOWN, _("Out of Memory?"));
+ 
+        /* 
+         * Fill in NAS-IP-Address 
+         */
+ 
+-       if ((client_id = rc_own_ipaddress ()) == 0)
++       if ((client_id = my_rc_own_ipaddress ()) == 0)
+                return (ERROR_RC);
+ 
+-       if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
++       if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
+                        NULL) return (ERROR_RC);
+ 
+-       rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
++       my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+                     retries);
+ 
+-       result = rc_send_server (&data, msg);
++       result = my_rc_send_server (&data, msg);
+        rc_avpair_free (data.send_pairs);
+        if (data.receive_pairs)
+                rc_avpair_free (data.receive_pairs);
+@@ -350,3 +366,70 @@
+        printf ("%s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\
+                   [-t timeout] [-r retries] [-e expect]\n", progname);
+ }
++
++
++
++
++int my_rc_read_dictionary(const char * a)
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       return rc_read_dictionary(rch, a);
++#else
++       return rc_read_dictionary(a);
++#endif
++}
++
++VALUE_PAIR *my_rc_avpair_add(VALUE_PAIR ** a, int b, void * c, int d)
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       return rc_avpair_add(rch, a, b, c, -1, d);
++#else
++       return rc_avpair_add(a, b, c, d);
++#endif
++}
++
++UINT4 my_rc_own_ipaddress()
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       return rc_own_ipaddress(rch);
++#else
++       return rc_own_ipaddress();
++#endif
++}
++
++void my_rc_buildreq(SEND_DATA * a, int b, char * c, unsigned short d, int e, int f)
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       return rc_buildreq(rch, a, b, c, d, e, f);
++#else
++       return rc_buildreq(a, b, c, d, e, f);
++#endif
++}
++
++int my_rc_send_server(SEND_DATA * a, char * b)
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       return rc_send_server(rch, a, b);
++#else
++       return rc_send_server(a, b);
++#endif
++}
++
++int my_rc_read_config(char * a)
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       rch = rc_read_config(a);
++       return (rch == NULL) ? 1 : 0;
++#else
++       return rc_read_config(a);
++#endif
++}
++
++char *my_rc_conf_str(char * a)
++{
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       return rc_conf_str(rch, a);
++#else
++       return rc_conf_str(a);
++#endif
++}
diff --git a/web/attachments/240320-ifdef.patch b/web/attachments/240320-ifdef.patch
new file mode 100644
index 0000000..983a1ce
--- /dev/null
+++ b/web/attachments/240320-ifdef.patch
@@ -0,0 +1,75 @@
+--- check_radius_orig.c 2007-08-07 22:34:39.000000000 +0200
++++ check_radius_ifdef.c        2007-08-07 22:34:01.000000000 +0200
+@@ -42,8 +42,12 @@
+ #include "common.h"
+ #include "utils.h"
+ #include "netutils.h"
+-
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++#include <radiusclient-ng.h>
++rc_handle *rch = NULL;
++#else
+ #include <radiusclient.h>
++#endif
+ 
+ int process_arguments (int, char **);
+ void print_help (void);
+@@ -133,26 +137,49 @@
+                usage4 (_("Could not parse arguments"));
+ 
+        str = strdup ("dictionary");
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       if ((config_file && ! (rch = rc_read_config (config_file))) ||
++                       rc_read_dictionary (rch, rc_conf_str (rch, str)))
++#else
+        if ((config_file && rc_read_config (config_file)) ||
+                        rc_read_dictionary (rc_conf_str (str)))
++#endif
+                die (STATE_UNKNOWN, _("Config file error"));
+ 
+        service = PW_AUTHENTICATE_ONLY;
+ 
+        memset (&data, 0, sizeof(data));
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       if (!(rc_avpair_add (rch, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) &&
++                               rc_avpair_add (rch, &data.send_pairs, PW_USER_NAME, username, -1, 0) &&
++                               rc_avpair_add (rch, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0) &&
++                               (nasid==NULL || rc_avpair_add (rch, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -1, 0))))
++#else
+        if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+                                rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
+                                rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
+                                (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
++#endif
+                die (STATE_UNKNOWN, _("Out of Memory?"));
+ 
+        /* 
+         * Fill in NAS-IP-Address 
+         */
+ 
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       if ((client_id = rc_own_ipaddress (rch)) == 0)
++#else
+        if ((client_id = rc_own_ipaddress ()) == 0)
++#endif
+                return (ERROR_RC);
+ 
++#ifdef HAVE_LIBRADIUSCLIENT_NG
++       if (rc_avpair_add (rch, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id,-1, 0) ==
++                       NULL) return (ERROR_RC);
++       rc_buildreq (rch, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
++                    retries);
++       result = rc_send_server (rch, &data, msg);
++#else
+        if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
+                        NULL) return (ERROR_RC);
+ 
+@@ -160,6 +187,8 @@
+                     retries);
+ 
+        result = rc_send_server (&data, msg);
++#endif
++
+        rc_avpair_free (data.send_pairs);
+        if (data.receive_pairs)
+                rc_avpair_free (data.receive_pairs);
diff --git a/web/attachments/241185-check_mailq.pl.patch b/web/attachments/241185-check_mailq.pl.patch
new file mode 100644
index 0000000..906234b
--- /dev/null
+++ b/web/attachments/241185-check_mailq.pl.patch
@@ -0,0 +1,46 @@
+--- check_mailq.pl.orig 2006-07-05 15:45:57.000000000 +0200
++++ check_mailq.pl      2007-08-14 13:32:15.463385010 +0200
+@@ -29,7 +29,7 @@
+ use POSIX;
+ use strict;
+ use Getopt::Long;
+-use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t
++use vars qw($opt_d $opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t
+                                        $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines
+                                        %srcdomains %dstdomains);
+ use lib  utils.pm;
+@@ -515,12 +515,17 @@
+                ("V"   => \$opt_V, "version"    => \$opt_V,
+                 "v"   => \$opt_v, "verbose"    => \$opt_v,
+                 "h"   => \$opt_h, "help"               => \$opt_h,
++                "d:s" => \$opt_d, "configdir:s" => \$opt_d, 
+                 "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default     sendmail)
+                 "w=i" => \$opt_w, "warning=i"  => \$opt_w,   # warning if above this number
+                 "c=i" => \$opt_c, "critical=i" => \$opt_c,       # critical if above this number
+                 "t=i" => \$opt_t, "timeout=i"  => \$opt_t 
+                 );
+ 
++       if ($opt_d) {
++               $ENV{'MAIL_CONFIG'}=$opt_d;
++       }
++
+        if ($opt_V) {
+                print_revision($PROGNAME,'$Revision: 1.7 $ ');
+                exit $ERRORS{'OK'};
+@@ -576,7 +581,7 @@
+ }
+ 
+ sub print_usage () {
+-       print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-v verbose]\n";
++       print "Usage: $PROGNAME -d <configdir> -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-v verbose]\n";
+ }
+ 
+ sub print_help () {
+@@ -587,6 +592,7 @@
+        print "\n";
+        print "   Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n";
+        print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
++       print "-d (--configdir) = Use configdir for postfix command (MAIL_CONFIG)\n";
+        print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
+        print "-c (--critical)  = Min. number of messages in queu to generate critical alert ( w < c )\n";
+        print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
diff --git a/web/attachments/241808-configure.in_check_dig.c.diff b/web/attachments/241808-configure.in_check_dig.c.diff
new file mode 100644
index 0000000..3ba9b50
--- /dev/null
+++ b/web/attachments/241808-configure.in_check_dig.c.diff
@@ -0,0 +1,126 @@
+diff -Nru configure.in.orig configure.in
+--- configure.in.orig   2007-07-28 17:40:54.000000000 +0000
++++ configure.in        2007-07-28 13:38:11.000000000 +0000
+@@ -93,6 +93,7 @@
+ PKG_ARCH=`uname -p`
+ REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
+ REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
++first_ip=`/sbin/ifconfig | egrep "inet addr:" | sed -n '1p' | sed 's/ Bcast.*$//' | sed 's/^\s*inet addr://'`
+ 
+ AC_SUBST(PKG_ARCH)
+ AC_SUBST(REV_DATESTAMP)
+@@ -771,14 +772,14 @@
+        fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+-       $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
++       $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+         with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+         with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+@@ -786,52 +787,52 @@
+   ac_cv_ping_has_timeout=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+         with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
++elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n %s -c %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
++elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING %s -n %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
++elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
++elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -c %d %s"
+@@ -1034,7 +1035,7 @@
+        if test -n "$PATH_TO_NSLOOKUP"
+        then
+                AC_MSG_CHECKING(for nslookup syntax)
+-               if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
++               if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null
+                then
+                        ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
+                        AC_MSG_RESULT([$ac_cv_nslookup_command])
+diff -Nru plugins/check_dig.c.orig plugins/check_dig.c                  
+--- plugins/check_dig.c.orig    2007-07-29 20:59:04.000000000 +0200
++++ plugins/check_dig.c 2007-07-29 20:53:15.000000000 +0200
+@@ -59,6 +59,7 @@
+ char *record_type = "A";
+ char *expected_address = NULL;
+ char *dns_server = NULL;
++char server_name[256];
+ int verbose = FALSE;
+ int server_port = DEFAULT_PORT;
+ double warning_interval = UNDEFINED;
+@@ -277,8 +278,13 @@
+       dns_server = argv[c];
+     }
+     else {
+-      dns_server = strdup ("127.0.0.1");
+-    }
++      if(gethostname(server_name, 255) != 0) {
++       host_or_die("Can't get local hostname");
++      }
++      else {
++        dns_server = strdup (server_name);
++      }
++    }  
+   }
+ 
+   return validate_arguments ();
+
diff --git a/web/attachments/242023-check_ifstatus.patch b/web/attachments/242023-check_ifstatus.patch
new file mode 100644
index 0000000..76f490d
--- /dev/null
+++ b/web/attachments/242023-check_ifstatus.patch
@@ -0,0 +1,241 @@
+1a2,12

+> # vim:foldmethod=syntax:tabstop=4:shiftwidth=4

+> #

+> # matthew.martin, Tuesday August 14, 2007

+> # Problems with check_ifstatus.pl

+> #     1) "No response from remote host" should be unknown, not critical, right?

+> #     2) Serial link "dormant" should be critical, not okay

+> #     3) dormant, excluded and unused interfaces are not correctly counted

+> #     4) default exclusions were broken, fix that and add a couple default exclusions

+> #     5) made the formatting in this file more consistent

+> #

+> # check_ifstatus.pl - nagios plugin

+3,4d13

+< # check_ifstatus.pl - nagios plugin 

+< # 

+29c38

+< # 

+---

+> #

+36c45

+< use lib "/opt/csw/libexec/nagios-plugins" ;

+---

+> use lib "/opt/csw/libexec/nagios-plugins";

+49d57

+< 

+94c102

+< my %excluded ;

+---

+> my %excluded;

+97,100d104

+< 

+< 

+< 

+< 

+103,104c107,108

+<      print ("ERROR: No snmp response from $hostname (alarm timeout)\n");

+<      exit $ERRORS{"UNKNOWN"};

+---

+>       print ("ERROR: No snmp response from $hostname (alarm timeout)\n");

+>       exit $ERRORS{"UNKNOWN"};

+107,108c111

+< 

+< #Option checking

+---

+> # Option checking

+111,112c114

+< if ($status != 0)

+< {

+---

+> if ($status != 0) {

+117d118

+< 

+127,129d127

+< 

+< 

+< 

+131,135c129,135

+< 

+<    if (!defined($response = $session->get_table($snmpoid))) {

+<       $answer=$session->error;

+<       $session->close;

+<       $state = 'CRITICAL';

+---

+>       if (!defined($response = $session->get_table($snmpoid))) {

+>               $answer=$session->error;

+>               $session->close;

+>               # matthew.martin. Tuesday August 14, 2007

+>               # I think a SNMP error should give UNKNOWN, not CRITICAL

+>               #$state = 'CRITICAL';

+>               $state = 'UNKNOWN';

+138c138

+<                       }else{

+---

+>                       } else {

+141,142c141,142

+<       exit $ERRORS{$state};

+<    }

+---

+>       exit $ERRORS{$state};

+>       }

+144,148c144,148

+<    foreach $snmpkey (keys %{$response}) {

+<       $snmpkey =~ /.*\.(\d+)$/;

+<       $key = $1;

+<       $ifStatus{$key}{$snmpoid} = $response->{$snmpkey};

+<    }

+---

+>       foreach $snmpkey (keys %{$response}) {

+>               $snmpkey =~ /.*\.(\d+)$/;

+>               $key = $1;

+>               $ifStatus{$key}{$snmpoid} = $response->{$snmpkey};

+>       }

+151d150

+< 

+155a155,156

+> # matthew.martin. This script cannot tell that specific logical interfaces are

+> # associated with their phys IF so it checks them all.

+158c159,160

+<       # skip unused interfaces

+---

+>       # Skip interfaces flagged with -u (--unused_ports)

+>       # "A comma separated list of ifIndex values that should be excluded"

+160,163c162,166

+<               # check only if interface is administratively up

+<     if ($ifStatus{$key}{$snmpIfAdminStatus} == 1 ) {

+<     

+<                       # check only if interface type is not listed in %excluded

+---

+> 

+>               # Further checking only if interface is administratively up

+>               if ($ifStatus{$key}{$snmpIfAdminStatus} == 1 ) {

+> 

+>                       # Check only if interface type is not listed in %excluded

+170,172c173,175

+<                                 $ifStatus{$key}{$snmpIfName},

+<                                                                                                                               $ifStatus{$key}{$snmpIfAlias});

+<                                                               }else{

+---

+>                                                                                                                       $ifStatus{$key}{$snmpIfName},

+>                                                                                                                       $ifStatus{$key}{$snmpIfAlias});

+>                                                               } else {

+174c177

+<                                                                                                                               $ifStatus{$key}{$snmpIfDescr});

+---

+>                                                                                                                       $ifStatus{$key}{$snmpIfDescr});

+178c181,182

+<                       }else{

+---

+>                       # matthew.martin Interface is listed in %excluded

+>                       } else {

+181c185,187

+<               

+---

+>               # matthew.martin If not administratively up, mark as unused.

+>               } elsif ($ifStatus{$key}{$snmpIfAdminStatus} == 2 ) {

+>                       $ifunused++;

+183,184c189,195

+<       }else{

+<               $ifunused++;

+---

+>       } else {

+>               # matthew.martin. Original line:

+>               # $ifunused++;

+>               # actually matches the flag 

+>               # -u (--unused_ports) A comma separated list of ifIndex values that should be excluded

+>               # They should be marked as excluded, not unused.

+>               $ifexclude++;

+188,208c199,224

+<    if ($ifdown > 0) {

+<       $state = 'CRITICAL';

+<       $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, excluded: %d, unused: %d<BR>",

+<                         $hostname,

+<                       $ifup,

+<                       $ifdown,

+<                       $ifdormant,

+<                       $ifexclude,

+<                       $ifunused);

+<       $answer = $answer . $ifmessage . "\n";

+<    }

+<    else {

+<       $state = 'OK';

+<       $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, excluded: %d, unused: %d",

+<                         $hostname,

+<                       $ifup,

+<                       $ifdown,

+<                       $ifdormant,

+<                       $ifexclude,

+<                       $ifunused);

+<    }

+---

+> # matthew.martin

+> # The original has dormant serial interfaces return status of "OK".

+> # A dormant serial connection should be CRITICAL, right?

+> # I changed the following line to address this:

+> #if ($ifdown > 0) {

+> if (($ifdown > 0) || ($ifdormant > 0)) {

+>       $state = 'CRITICAL';

+>       $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, excluded: %d, unused: %d<BR>",

+>               $hostname,

+>               $ifup,

+>               $ifdown,

+>               $ifdormant,

+>               $ifexclude,

+>               $ifunused);

+>       $answer = $answer . $ifmessage . "\n";

+> } else {

+>       $state = 'OK';

+>       $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, excluded: %d, unused: %d",

+>               $hostname,

+>               $ifup,

+>               $ifdown,

+>               $ifdormant,

+>               $ifexclude,

+>               $ifunused);

+> }

+> 

+248c264

+<       printf "                     in hex with 0x prefix generated by using   \"snmpkey\" utility\n"; 

+---

+>       printf "                     in hex with 0x prefix generated by using   \"snmpkey\" utility\n";

+252c268

+<       printf "                     in hex with 0x prefix generated by using   \"snmpkey\" utility\n"; 

+---

+>       printf "                     in hex with 0x prefix generated by using   \"snmpkey\" utility\n";

+323c339

+<                               }else{

+---

+>                               } else {

+326c342

+<                                       }else{

+---

+>                                       } else {

+338c354

+<                               }else{

+---

+>                               } else {

+341c357

+<                                       }else{

+---

+>                                       } else {

+370,371d385

+<               }else{

+<                       $excluded{23} = 1; # default PPP(23) if empty list - note (AIX seems to think PPP is 22 according to a post)

+372a387,391

+>       # matthew.martin, Tuesday August 14, 2007. In the original this else was nested wrong and never matched

+>       } else {

+>               $excluded{23} = 1; # default PPP(23) if empty list - note (AIX seems to think PPP is 22 according to a post)

+>               $excluded{24} = 1; # matthew.martin, Tuesday August 14, 2007, Nokia, ifDescr.6 = loop0c0 Software Loopback Layer -- ifType.6 = softwareLoopback(24) (taken from a Nokia IP330)

+>               $excluded{25} = 1; # matthew.martin, Tuesday August 14, 2007, Nokia, ifDescr.1 = pppoe0 Ethernet Layer -- ifType.1 = eon(25) (from a Nokia IP350)

+378c397

+<               foreach $key (@unused_ports) { 

+---

+>               foreach $key (@unused_ports) {

+392c411

+<       }else{

+---

+>       } else {

+450c469

+<       }else{

+---

+>       } else {

diff --git a/web/attachments/24487-check_rbl.c b/web/attachments/24487-check_rbl.c
new file mode 100644
index 0000000..e9a7725
--- /dev/null
+++ b/web/attachments/24487-check_rbl.c
@@ -0,0 +1,329 @@
+/******************************************************************************
+*
+* check_rbl.c
+*
+* Modified by Tim Bell <bhat@trinity.unimelb.edu.au> 2002-06-05
+* based on:
+*
+* * check_dig.c
+* *
+* * Program: dig plugin for NetSaint
+* * License: GPL
+* * Copyright (c) 2000
+* * 
+* * $Id: check_dig.c,v 1.4.2.1 2001/04/13 20:19:47 karldebisschop Exp $
+*
+*****************************************************************************/
+
+#include "config.h"
+#include "common.h"
+#include "utils.h"
+#include "popen.h"
+#include "string.h"
+
+#define PROGNAME "check_rbl"
+
+int process_arguments(int, char **);
+int call_getopt(int, char **);
+int validate_arguments(void);
+int check_disk(int usp,int free_disk);
+void print_help(void);
+void print_usage(void);
+char *reverse_ipaddr(char *ipaddr);
+
+char *query_address=NULL;
+char *query_address_rev=NULL;
+char *dns_server=NULL;
+char *rbl_name=NULL;
+int verbose=FALSE;
+
+int main(int argc, char **argv){
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *command_line=NULL;
+        char *output=NULL;
+        int result=STATE_OK;
+
+        /* Set signal handling and alarm */
+        if (signal(SIGALRM,popen_timeout_alarm_handler)==SIG_ERR)
+                usage("Cannot catch SIGALRM\n");
+
+        if (process_arguments(argc,argv)!=OK)
+                usage("Could not parse arguments\n");
+
+        /* reverse the octets in the IP address */
+        query_address_rev = reverse_ipaddr(query_address);
+
+        /* build the command to run */
+        if (dns_server) {
+          command_line=ssprintf(command_line,"%s @%s %s.%s",
+                                PATH_TO_DIG,dns_server,
+                                query_address_rev, rbl_name);
+        } else {
+          command_line=ssprintf(command_line,"%s %s.%s",
+                                PATH_TO_DIG,
+                                query_address_rev, rbl_name);
+        }
+        alarm(timeout_interval);
+        time(&start_time);
+
+        if (verbose)
+                printf("%s\n",command_line);
+        /* run the command */
+        child_process=spopen(command_line);
+        if (child_process==NULL) {
+                printf("Could not open pipe: %s\n",command_line);
+                return STATE_UNKNOWN;
+        }
+
+        child_stderr=fdopen(child_stderr_array[fileno(child_process)],"r");
+        if(child_stderr==NULL)
+                printf("Could not open stderr for %s\n",command_line);
+
+        output=strscpy(output,"");
+
+        while (fgets(input_buffer,MAX_INPUT_BUFFER-1,child_process)) {
+
+                /* the server is responding, we just got the host name... */
+                if (strstr(input_buffer,";; ANSWER SECTION:")) {
+
+                        /* get the host address */
+                        if (!fgets(input_buffer,MAX_INPUT_BUFFER-1,child_process))
+                                break;
+
+                        if (strpbrk(input_buffer,"\r\n"))
+                                input_buffer[strcspn(input_buffer,"\r\n")] = '\0';
+
+                        if (strstr(input_buffer,query_address_rev)==input_buffer) {
+                                output=strscpy(output,input_buffer);
+                                /* we found it, which means it's listed! */
+                                result=STATE_CRITICAL;
+                        } else {
+                                strcpy(output,"Server not RBL listed.");
+                                result=STATE_OK;
+                        }
+
+                        continue;
+                }
+
+        }
+        
+        /*
+        if (result!=STATE_OK) {
+                strcpy(output,"No ANSWER SECTION found");
+        }
+        */
+
+        while (fgets(input_buffer,MAX_INPUT_BUFFER-1,child_stderr)) {
+                /* If we get anything on STDERR, at least set warning */
+                result=error_set(result,STATE_WARNING);
+                printf("%s",input_buffer);
+                if (!strcmp(output,""))
+                        strcpy(output,1+index(input_buffer,':'));
+        }
+
+        (void)fclose(child_stderr);
+
+        /* close the pipe */
+        if (spclose(child_process)) {
+                result=error_set(result,STATE_WARNING);
+                if (!strcmp(output,""))
+                        strcpy(output,"nslookup returned error status");
+        }
+        
+        (void)time(&end_time);
+
+        if (result==STATE_OK)
+                printf("RBL check okay - not listed.\n");
+        else if (result==STATE_WARNING)
+                printf("RBL WARNING - %s\n",!strcmp(output,"")?" Probably a non-existent host/domain":output);
+        else if (result==STATE_CRITICAL)
+                printf("RBL CRITICAL - %s is listed on %s\n",query_address, rbl_name);
+        else
+                printf("DNS problem - %s\n",!strcmp(output,"")?" Probably a non-existent host/domain":output);
+
+        return result;
+}
+
+/* reverse the ipaddr */
+char *reverse_ipaddr(char *ipaddr)
+{
+  static char revip[MAX_HOST_ADDRESS_LENGTH];
+  int a, b, c, d;
+
+  if (strlen(ipaddr) >= MAX_HOST_ADDRESS_LENGTH ||
+      sscanf(ipaddr, "%d.%d.%d.%d", &a, &b, &c, &d) != 4) {
+    usage("IP address invalid or too long");
+  }
+  sprintf(revip, "%d.%d.%d.%d", d, c, b, a);
+
+  return revip;
+}
+
+
+/* process command-line arguments */
+int process_arguments(int argc, char **argv)
+{
+  int c;
+
+  if(argc<2)
+    return ERROR;
+
+
+  c=0;
+  while((c+=(call_getopt(argc-c,&argv[c])))<argc){
+
+                if (is_option(argv[c]))
+                        continue;
+
+    if (query_address==NULL) {
+                        if (is_host(argv[c])) {
+                                query_address=argv[c];
+                        } else {
+                                usage("Invalid host name");
+                        }
+                }
+  }
+
+  return validate_arguments();
+}
+
+
+
+
+
+
+int call_getopt(int argc, char **argv)
+{
+  int c,i=0;
+
+#ifdef HAVE_GETOPT_H
+        int option_index = 0;
+        static struct option long_options[] =
+        { 
+                {"hostname",       required_argument,0,'H'},
+                {"server",         required_argument,0,'s'},
+                {"rblname",        required_argument,0,'r'},
+                {"verbose",        no_argument,      0,'v'},
+                {"version",        no_argument,      0,'V'},
+                {"help",           no_argument,      0,'h'},
+                {0,0,0,0}
+        };
+#endif
+
+  while (1){
+#ifdef HAVE_GETOPT_H
+    c = getopt_long(argc,argv,"+hVvt:s:H:r:",long_options,&option_index);
+#else
+    c = getopt(argc,argv,"+?hVvt:s:H:r:");
+#endif
+
+    i++;
+
+    if(c==-1||c==EOF||c==1)
+      break;
+
+    switch (c)
+      {
+      case 't':
+      case 'l':
+      case 'H':
+                                i++;
+      }
+
+    switch (c)
+      {
+      case 'H': /* hostname */
+                                if (is_host(optarg)) {
+                                        query_address=optarg;
+                                } else {
+                                        usage("Invalid host name (-H)\n");
+                                }
+                                break;
+      case 's': /* server */
+                                if (is_host(optarg)) {
+                                        dns_server=optarg;
+                                } else {
+                                        usage("Invalid host name (-s)\n");
+                                }
+                                break;
+      case 'r': /* rblname */
+                                rbl_name=optarg;
+                                break;
+      case 'v': /* verbose */
+                                verbose=TRUE;
+                                break;
+      case 't': /* timeout */
+                                if (is_intnonneg(optarg)) {
+                                        timeout_interval=atoi(optarg);
+                                } else {
+                                        usage("Time interval must be a nonnegative integer\n");
+                                }
+                                break;
+      case 'V': /* version */
+                                print_revision(PROGNAME,"$Revision: 1.4.2.1 $");
+                                exit(STATE_OK);
+      case 'h': /* help */
+                                print_help();
+                                exit(STATE_OK);
+      case '?': /* help */
+                                usage("Invalid argument\n");
+                        }
+  }
+  return i;
+}
+
+
+
+
+
+int validate_arguments(void)
+{
+  if (query_address == NULL || rbl_name == NULL)
+    return ERROR;
+  else
+    return OK;
+}
+
+
+
+
+
+void print_help(void)
+{
+        print_revision(PROGNAME,"$Revision: 1.4.2.1 $");
+        printf
+                ("Copyright (c) 2000 Karl DeBisschop\n\n"
+                 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");
+        print_usage();
+        printf
+                ("\nOptions:\n"
+                 " -H, --hostname=IPADDRESS\n"
+                 "   Check status of indicated host\n"
+                 " -s, --server=STRING or IPADDRESS\n"
+                 "   DNS server to use\n"
+                 " -r, --rblname=STRING\n"
+                 "   RBL domain name to use (e.g. relays.ordb.org)\n"
+                 " -t, --timeout=INTEGER\n"
+                 "   Seconds before connection attempt times out (default: %d)\n"
+                 " -v, --verbose\n"
+                 "   Print extra information (command-line use only)\n"
+                 " -h, --help\n"
+                 "   Print detailed help screen\n"
+                 " -V, --version\n"
+                 "   Print version information\n\n",
+                 DEFAULT_SOCKET_TIMEOUT);
+                support();
+}
+
+
+
+
+
+void print_usage(void)
+{
+        printf
+                ("Usage: %s -H hostip -r rblname [-s server] [-t timeout] [-v]\n"
+                 "       %s --help\n"
+                 "       %s --version\n",
+                 PROGNAME,PROGNAME,PROGNAME);
+}
diff --git a/web/attachments/246468-check_ntp_flags.patch b/web/attachments/246468-check_ntp_flags.patch
new file mode 100644
index 0000000..e659ec5
--- /dev/null
+++ b/web/attachments/246468-check_ntp_flags.patch
@@ -0,0 +1,47 @@
+*** nagios-plugins-1.4.9/plugins/check_ntp.c    2007-04-10 09:17:18.000000000 +0200
+--- nagios-plugins-1.4.9_flags/plugins/check_ntp.c      2007-09-20 15:14:54.000000000 +0200
+***************
+*** 86,91 ****
+--- 86,92 ----
+        double rtdelay;         /* converted from the ntp_message */
+        double rtdisp;          /* converted from the ntp_message */
+        double offset[AVG_NUM]; /* offsets from each response */
++       uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
+  } ntp_server_results;
+  
+  /* this structure holds everything in an ntp control message as per rfc1305 */
+***************
+*** 302,307 ****
+--- 303,314 ----
+  
+        /* for each server */
+        for(cserver=0; cserver<nservers; cserver++){
++               /* sort out servers with error flags */
++               if ( LI(slist[cserver].flags) != LI_NOWARNING ){
++                       if (verbose) printf("discarding peer id %d: flags=%d\n", cserver, LI(slist[cserver].flags));
++                       break;
++               }
++ 
+                /* compare it to each of the servers already in the candidate list */
+                for(i=0; i<csize; i++){
+                        /* does it have an equal or better stratum? */
+***************
+*** 450,455 ****
+--- 457,463 ----
+                                servers[i].rtdisp=NTP32asDOUBLE(req[i].rtdisp);
+                                servers[i].rtdelay=NTP32asDOUBLE(req[i].rtdelay);
+                                servers[i].waiting=0;
++                               servers[i].flags=req[i].flags;
+                                servers_readable--;
+                                one_read = 1;
+                                if(servers[i].num_responses==AVG_NUM) servers_completed++;
+***************
+*** 808,813 ****
+--- 816,822 ----
+        }
+        if(offset_result==STATE_CRITICAL){
+                asprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
++               asprintf(&perfdata_line, "%s", "no perfdata");
+        } else {
+                if(offset_result==STATE_WARNING){
+                        asprintf(&result_line, "%s %s", result_line, _("Unable to fully sample sync server"));
diff --git a/web/attachments/249657-nagiosplugins-checkhttp-crash.patch b/web/attachments/249657-nagiosplugins-checkhttp-crash.patch
new file mode 100644
index 0000000..d128581
--- /dev/null
+++ b/web/attachments/249657-nagiosplugins-checkhttp-crash.patch
@@ -0,0 +1,11 @@
+--- plugins/check_http.c.old    2007-07-21 18:29:01.000000000 +0200
++++ plugins/check_http.c        2007-10-14 22:05:26.000000000 +0200
+@@ -1092,7 +1092,7 @@ redir (char *pos, char *status_line)
+     die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n"));
+ 
+   while (pos) {
+-    sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i);
++    sscanf (pos, "%1[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i);
+     if (i == 0) {
+       pos += (size_t) strcspn (pos, "\r\n");
+       pos += (size_t) strspn (pos, "\r\n");
diff --git a/web/attachments/24999-check_snmp.patch.txt b/web/attachments/24999-check_snmp.patch.txt
new file mode 100644
index 0000000..f56dd49
--- /dev/null
+++ b/web/attachments/24999-check_snmp.patch.txt
@@ -0,0 +1,124 @@
+*** check_snmp.c.orig   Wed Jun 12 20:13:42 2002

+--- check_snmp.c        Wed Jun 12 20:15:07 2002

+*************** int errcode, excode;

+*** 94,99 ****

+--- 94,100 ----

+

+  char *server_address = NULL;

+  char *community = NULL;

++ char *mibslist = NULL;

+  char oid[MAX_INPUT_BUFFER] = "";

+  char *label = NULL;

+  char *units = NULL;

+*************** main (int argc, char **argv)

+*** 143,152 ****

+                usage ("Incorrect arguments supplied\n");

+

+        /* create the command line to execute */

+!       command_line = ssprintf

+!               (command_line,

+!                "%s -m ALL -v 1 %s %s %s",

+!                PATH_TO_SNMPGET, server_address, community, oid);

+

+        /* run the command */

+        child_process = spopen (command_line);

+--- 144,159 ----

+                usage ("Incorrect arguments supplied\n");

+

+        /* create the command line to execute */

+!         if (mibslist == NULL)

+!               command_line = ssprintf

+!                       (command_line,

+!                        "%s -v 1 %s %s %s",

+!                        PATH_TO_SNMPGET, server_address, community, oid);

+!       else

+!               command_line = ssprintf

+!                       (command_line,

+!                        "%s -m %s -v 1 %s %s %s",

+!                        PATH_TO_SNMPGET, mibslist, server_address, community, oid);

+

+        /* run the command */

+        child_process = spopen (command_line);

+*************** call_getopt (int argc, char **argv)

+*** 368,373 ****

+--- 375,381 ----

+                {"warning", required_argument, 0, 'w'},

+                {"hostname", required_argument, 0, 'H'},

+                {"community", required_argument, 0, 'C'},

++               {"mibslist", required_argument, 0, 'm'},

+                {"oid", required_argument, 0, 'o'},

+                {"object", required_argument, 0, 'o'},

+                {"delimiter", required_argument, 0, 'd'},

+*************** call_getopt (int argc, char **argv)

+*** 385,394 ****

+        while (1) {

+  #ifdef HAVE_GETOPT_H

+                c =

+!                       getopt_long (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:",

+                                                                         long_options, &option_index);

+  #else

+!               c = getopt (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:");

+  #endif

+

+                if (c == -1 || c == EOF)

+--- 393,402 ----

+        while (1) {

+  #ifdef HAVE_GETOPT_H

+                c =

+!                       getopt_long (argc, argv, "+?hVt:c:w:H:C:m:o:d:D:s:R:r:l:u:",

+                                                                         long_options, &option_index);

+  #else

+!               c = getopt (argc, argv, "+?hVt:c:w:H:C:m:o:d:D:s:R:r:l:u:");

+  #endif

+

+                if (c == -1 || c == EOF)

+*************** call_getopt (int argc, char **argv)

+*** 401,406 ****

+--- 409,415 ----

+                case 'w':

+                case 'H':

+                case 'C':

++               case 'm':

+                case 'o':

+                case 'd':

+                case 'D':

+*************** call_getopt (int argc, char **argv)

+*** 466,471 ****

+--- 475,483 ----

+                case 'C':                                                                       /* group or community */

+                        community = strscpy (community, optarg);

+                        break;

++               case 'm':                                                                       /* mibs list */

++                       mibslist = strscpy (mibslist, optarg);

++                       break;

+                case 'o':                                                                       /* object identifier */

+                        for (ptr = optarg; (ptr = index (ptr, ',')); ptr++)

+                                ptr[0] = ' ';

+*************** void

+*** 577,583 ****

+  print_usage (void)

+  {

+        printf

+!               ("Usage: check_snmp -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n"

+                 "                  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n"

+                 "                  [-l label] [-u units] [-d delimiter] [-D output-delimiter]\n"

+                 "       check_snmp --help\n" "       check_snmp --version\n");

+--- 589,595 ----

+  print_usage (void)

+  {

+        printf

+!               ("Usage: check_snmp -m <mibs_list> -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n"

+                 "                  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n"

+                 "                  [-l label] [-u units] [-d delimiter] [-D output-delimiter]\n"

+                 "       check_snmp --help\n" "       check_snmp --version\n");

+*************** print_help (char *cmd)

+*** 595,600 ****

+--- 607,614 ----

+                 "    Print detailed help screen\n"

+                 " -V, --version\n"

+                 "    Print version information\n"

++                " -m, --mibslist=STRING\n"

++                "    Specify which mibs to use (defaults to default mib list)\n"

+                 " -H, --hostname=HOST\n"

+                 "    Name or IP address of the device you wish to query\n"

+                 " -o, --oid=OID(s)\n"

diff --git a/web/attachments/250217-nagiosplugins-checksnmp-crash.patch b/web/attachments/250217-nagiosplugins-checksnmp-crash.patch
new file mode 100644
index 0000000..6fc9540
--- /dev/null
+++ b/web/attachments/250217-nagiosplugins-checksnmp-crash.patch
@@ -0,0 +1,37 @@
+--- plugins/check_snmp.c.old    2007-05-29 07:22:32.000000000 +0200
++++ plugins/check_snmp.c        2007-10-17 22:08:49.000000000 +0200
+@@ -219,12 +219,16 @@ main (int argc, char **argv)
+ 
+        ptr = output;
+ 
+-       strcat(perfstr, "| ");
++       strncat(perfstr, "| ", sizeof(perfstr)-strlen(perfstr)-1);
+        while (ptr) {
+                char *foo;
++               unsigned int copylen;
+ 
+                foo = strstr (ptr, delimiter);
+-               strncat(perfstr, ptr, foo-ptr);
++               copylen = foo-ptr;
++               if (copylen > sizeof(perfstr)-strlen(perfstr)-1)
++                       copylen = sizeof(perfstr)-strlen(perfstr)-1;
++               strncat(perfstr, ptr, copylen);
+                ptr = foo; 
+ 
+                if (ptr == NULL)
+@@ -357,11 +361,11 @@ main (int argc, char **argv)
+ 
+                i++;
+ 
+-               strcat(perfstr, "=");
+-               strcat(perfstr, show);
++               strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
++               strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
+                if (type)
+-                       strcat(perfstr, type);
+-               strcat(perfstr, " ");
++                       strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
++               strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
+ 
+        }       /* end while (ptr) */
+ 
diff --git a/web/attachments/250664-check_http.c.diff b/web/attachments/250664-check_http.c.diff
new file mode 100644
index 0000000..add888d
--- /dev/null
+++ b/web/attachments/250664-check_http.c.diff
@@ -0,0 +1,40 @@
+Index: nagios-plugins-trunk/plugins/check_http.c
+===================================================================
+--- nagios-plugins-trunk/plugins/check_http.c   (revision 1808)
++++ nagios-plugins-trunk/plugins/check_http.c   (working copy)
+@@ -247,7 +247,7 @@
+       break;
+     case 'c': /* critical time threshold */
+       if (!is_nonnegative (optarg))
+-        usage2 (_("Critical threshold must be integer"), optarg);
++        usage2 (_("Critical threshold must be non-negative number"), optarg);
+       else {
+         critical_time = strtod (optarg, NULL);
+         check_critical_time = TRUE;
+@@ -255,7 +255,7 @@
+       break;
+     case 'w': /* warning time threshold */
+       if (!is_nonnegative (optarg))
+-        usage2 (_("Warning threshold must be integer"), optarg);
++        usage2 (_("Warning threshold must be non-negative number"), optarg);
+       else {
+         warning_time = strtod (optarg, NULL);
+         check_warning_time = TRUE;
+@@ -982,14 +982,14 @@
+   microsec = deltime (tv);
+   elapsed_time = (double)microsec / 1.0e6;
+   asprintf (&msg,
+-            _("HTTP WARNING: %s - %.3f second response time %s|%s %s\n"),
++            _("%s - %.3f second response time %s|%s %s\n"),
+             status_line, elapsed_time, 
+             (display_html ? "</A>" : ""),
+             perfd_time (elapsed_time), perfd_size (pagesize));
+   if (check_critical_time == TRUE && elapsed_time > critical_time)
+-    die (STATE_CRITICAL, "%s", msg);
++    die (STATE_CRITICAL, "HTTP CRITICAL: %s", msg);
+   if (check_warning_time == TRUE && elapsed_time > warning_time)
+-    die (STATE_WARNING, "%s", msg);
++    die (STATE_WARNING, "HTTP WARNING: %s", msg);
+ 
+   /* Page and Header content checks go here */
+   /* these checks should be last */
diff --git a/web/attachments/254104-check_http.c-head-patch b/web/attachments/254104-check_http.c-head-patch
new file mode 100644
index 0000000..490a6a4
--- /dev/null
+++ b/web/attachments/254104-check_http.c-head-patch
@@ -0,0 +1,30 @@
+75d74
+< int use_head = FALSE;
+176,177c175
+<     INVERT_REGEX = CHAR_MAX + 1,
+<     USE_HEAD     = CHAR_MAX + 2
+---
+>     INVERT_REGEX = CHAR_MAX + 1
+208d205
+<     {"head", no_argument, NULL, USE_HEAD},
+376,378d372
+<     case USE_HEAD:
+<       use_head = 1;
+<       break;
+459,466d452
+<   if ( use_head == 1 ) {
+<     if ( strcmp(http_method, "POST") == 0 )
+<       usage4 (_("Using POST data and HEAD requests is not supported"));
+<     else 
+<       no_body = TRUE;
+<       http_method = strdup("HEAD");
+<   }
+< 
+1320,1322d1305
+<   printf (" %s\n", "--head");
+<   printf ("    %s\n", _("make a HEAD request instead of GET"));
+<   printf ("    %s\n", _("this implies -N\n"));
+1398c1381
+<   printf ("       [-k string] [-S] [-C <age>] [-T <content-type>] [--head]\n");
+---
+>   printf ("       [-k string] [-S] [-C <age>] [-T <content-type>]\n");
diff --git a/web/attachments/256811-check_disk.extra-debug.patch b/web/attachments/256811-check_disk.extra-debug.patch
new file mode 100644
index 0000000..c083be7
--- /dev/null
+++ b/web/attachments/256811-check_disk.extra-debug.patch
@@ -0,0 +1,15 @@
+Index: plugins/check_disk.c
+===================================================================
+--- plugins/check_disk.c        (revision 1828)
++++ plugins/check_disk.c        (working copy)
+@@ -311,6 +311,10 @@
+       available_to_root = fsp.fsu_bfree;
+       used = total - available_to_root;
+ 
++      if (verbose >= 3)
++        printf ("For %s, total=%llu, available=%llu, available_to_root=%llu, used=%llu, fsp.fsu_files=%llu, fsp.fsu_ffree=%llu\n",
++          me->me_mountdir, total, available, available_to_root, used, fsp.fsu_files, fsp.fsu_ffree);
++
+       dused_pct = calculate_percent( used, used + available ); /* used + available can never be > uintmax */
+      
+       dfree_pct = 100 - dused_pct;
diff --git a/web/attachments/257980-check_ram.patch b/web/attachments/257980-check_ram.patch
new file mode 100644
index 0000000..09e7a0a
--- /dev/null
+++ b/web/attachments/257980-check_ram.patch
@@ -0,0 +1,376 @@
+--- nagios-plugins-1.4.5.orig/configure.in

++++ nagios-plugins-1.4.5/configure.in

+@@ -1585,7 +1585,7 @@ fi

+ if test -n "$ac_cv_proc_meminfo"; then

+        AC_DEFINE(HAVE_PROC_MEMINFO,1,[Define if we have /proc/meminfo])

+        AC_DEFINE_UNQUOTED(PROC_MEMINFO,"$ac_cv_proc_meminfo",[path to /proc/meminfo if name changes])

+-       EXTRAS="$EXTRAS check_swap"

++       EXTRAS="$EXTRAS check_swap check_ram"

+ fi

+ 

+ AC_PATH_PROG(PATH_TO_DIG,dig)

+--- nagios-plugins-1.4.5.orig/plugins/Makefile.am

++++ nagios-plugins-1.4.5/plugins/Makefile.am

+@@ -23,7 +23,7 @@ check_tcp_programs = check_ftp check_ima

+        check_udp check_clamd @check_tcp_ssl@

+ 

+ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \

+-       check_swap check_fping check_ldap check_game check_dig \

++       check_swap check_fping check_ldap check_game check_dig check_ram \

+        check_nagios check_by_ssh check_dns check_nt check_ide_smart    \

+        check_procs check_mysql_query check_apt

+ 

+@@ -76,6 +76,7 @@ check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)

+ check_ping_LDADD = $(NETLIBS) popen.o

+ check_procs_LDADD = $(BASEOBJS) popen.o

+ check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)

++check_ram_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o

+ check_real_LDADD = $(NETLIBS)

+ check_snmp_LDADD = $(BASEOBJS) popen.o

+ check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) 

+@@ -115,6 +116,7 @@ check_pgsql_DEPENDENCIES = check_pgsql.c

+ 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_ram_DEPENDENCIES = check_ram.c $(BASEOBJS) popen.o $(DEPLIBS)

+ check_real_DEPENDENCIES = check_real.c $(NETOBJS) $(DEPLIBS)

+ check_snmp_DEPENDENCIES = check_snmp.c $(BASEOBJS) popen.o $(DEPLIBS)

+ check_smtp_DEPENDENCIES = check_smtp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)

+--- /dev/null

++++ nagios-plugins-1.4.5/plugins/check_ram.c

+@@ -0,0 +1,300 @@

++/******************************************************************************

++*

++* Nagios check_ram plugin

++*

++* License: GPL

++* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)

++* Copyright (c) 2000-2006 nagios-plugins team

++* Copyright (c) 2007 Christian Heim (christian.heim@uni-greifswald.de)

++*

++* Last Modified: $Date: $

++*

++* Description:

++*

++* This file contains the check_ram plugin

++*

++* License Information:

++*

++* 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 2 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, write to the Free Software

++* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

++*

++* $Id: check_ram.c $

++*

++*****************************************************************************/

++

++const char *progname = "check_ram";

++const char *revision = "$Revision: $";

++const char *copyright = "2000-2007";

++const char *email = "nagiosplug-devel@lists.sourceforge.net";

++

++#include "common.h"

++#include "popen.h"

++#include "utils.h"

++

++int check_ram (int usp, float free_ram_mb);

++int process_arguments (int argc, char **argv);

++int validate_arguments (void);

++void print_usage (void);

++void print_help (void);

++

++int warn_percent = 0;

++int crit_percent = 0;

++float warn_size_bytes = 0;

++float crit_size_bytes= 0;

++int verbose;

++

++int main (int argc, char **argv)

++{

++       int percent_used, percent;

++       float total_ram_mb = 0, used_ram_mb = 0, free_ram_mb = 0;

++       float dsktotal_mb = 0, dskused_mb = 0, dskfree_mb = 0, tmp_mb = 0;

++       int result = STATE_UNKNOWN;

++       char input_buffer[MAX_INPUT_BUFFER];

++#ifdef HAVE_PROC_MEMINFO

++       FILE *fp;

++#endif

++       char str[32];

++       char *status;

++

++       setlocale (LC_ALL, "");

++       bindtextdomain (PACKAGE, LOCALEDIR);

++       textdomain (PACKAGE);

++

++       status = strdup ("");

++

++       if (process_arguments (argc, argv) == ERROR)

++               usage4 (_("Could not parse arguments"));

++

++#ifdef HAVE_PROC_MEMINFO

++       if (verbose >= 3) {

++               printf("Reading PROC_MEMINFO at %s\n", PROC_MEMINFO);

++       }

++       fp = fopen (PROC_MEMINFO, "r");

++       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {

++               if (sscanf (input_buffer, "%*[M]%*[e]%*[m]%*[:] %f %f %f", &dsktotal_mb, &dskused_mb, &dskfree_mb) == 3) {

++                       dsktotal_mb = dsktotal_mb / 1048576;    /* Apply conversion */

++                       dskused_mb = dskused_mb / 1048576;

++                       dskfree_mb = dskfree_mb / 1048576;

++                       total_ram_mb += dsktotal_mb;

++                       used_ram_mb += dskused_mb;

++                       free_ram_mb += dskfree_mb;

++

++                       percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));

++                       result = max_state (result, check_ram (percent, dskfree_mb));

++

++                       if (verbose)

++                               asprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);

++               }

++               else if (sscanf (input_buffer, "%*[M]%*[e]%*[m]%[TotalFre]%*[:] %f %*[k]%*[B]", str, &tmp_mb)) {

++                       if (verbose >= 3) {

++                               printf("Got %s with %f\n", str, tmp_mb);

++                       }

++                       /* I think this part is always in Kb, so convert to mb */

++                       if (strcmp ("Total", str) == 0) {

++                               dsktotal_mb = tmp_mb / 1024;

++                       }

++                       else if (strcmp ("Free", str) == 0) {

++                               dskfree_mb = tmp_mb / 1024;

++                       }

++               }

++       }

++       fclose(fp);

++       dskused_mb = dsktotal_mb - dskfree_mb;

++       total_ram_mb = dsktotal_mb;

++       used_ram_mb = dskused_mb;

++       free_ram_mb = dskfree_mb;

++#endif /* HAVE_PROC_MEMINFO */

++

++       /* if total_ram_mb == 0, let's not divide by 0 */

++       if(total_ram_mb) {

++               percent_used = 100 * ((double) used_ram_mb) / ((double) total_ram_mb);

++       } else {

++               percent_used = 0;

++       }

++

++       result = max_state (result, check_ram (percent_used, free_ram_mb));

++       printf (_("RAM %s - %d%% free (%d MB out of %d MB) %s|"),

++                       state_text (result),

++                       (100 - percent_used), (int) free_ram_mb, (int) total_ram_mb, status);

++

++       puts (perfdata ("ram", (long) free_ram_mb, "MB",

++                       TRUE, (long) max (warn_size_bytes/(1024 * 1024), warn_percent/100.0*total_ram_mb),

++                       TRUE, (long) max (crit_size_bytes/(1024 * 1024), crit_percent/100.0*total_ram_mb),

++                       TRUE, 0,

++                       TRUE, (long) total_ram_mb));

++

++       return result;

++}

++

++int check_ram (int usp, float free_ram_mb)

++{

++       int result = STATE_UNKNOWN;

++       float free_ram = free_ram_mb * (1024 * 1024);           /* Convert back to bytes as warn and crit specified in bytes */

++       if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))

++               result = STATE_CRITICAL;

++       else if (crit_size_bytes > 0 && free_ram <= crit_size_bytes)

++               result = STATE_CRITICAL;

++       else if (usp >= 0 && warn_percent != 0 && usp >= (100.0 - warn_percent))

++               result = STATE_WARNING;

++       else if (warn_size_bytes > 0 && free_ram <= warn_size_bytes)

++               result = STATE_WARNING;

++       else if (usp >= 0.0)

++               result = STATE_OK;

++       return result;

++}

++

++/* process command-line arguments */

++int process_arguments (int argc, char **argv)

++{

++       int c = 0;  /* option character */

++

++       int option = 0;

++       static struct option longopts[] = {

++               {"warning", required_argument, 0, 'w'},

++               {"critical", required_argument, 0, 'c'},

++               {"verbose", no_argument, 0, 'v'},

++               {"version", no_argument, 0, 'V'},

++               {"help", no_argument, 0, 'h'},

++               {0, 0, 0, 0}

++       };

++

++       if (argc < 2)

++               return ERROR;

++

++       while (1) {

++               c = getopt_long (argc, argv, "+?Vvhc:w:", longopts, &option);

++

++               if (c == -1 || c == EOF)

++                       break;

++

++               switch (c) {

++               case 'w':                                                                       /* warning size threshold */

++                       if (is_intnonneg (optarg)) {

++                               warn_size_bytes = (float) atoi (optarg);

++                               break;

++                       }

++                       else if (strstr (optarg, ",") &&

++                                                        strstr (optarg, "%") &&

++                                                        sscanf (optarg, "%f,%d%%", &warn_size_bytes, &warn_percent) == 2) {

++                               warn_size_bytes = floorf(warn_size_bytes);

++                               break;

++                       }

++                       else if (strstr (optarg, "%") &&

++                                                        sscanf (optarg, "%d%%", &warn_percent) == 1) {

++                               break;

++                       }

++                       else {

++                               usage4 (_("Warning threshold must be integer or percentage!"));

++                       }

++               case 'c':                                                                       /* critical size threshold */

++                       if (is_intnonneg (optarg)) {

++                               crit_size_bytes = (float) atoi (optarg);

++                               break;

++                       }

++                       else if (strstr (optarg, ",") &&

++                                                        strstr (optarg, "%") &&

++                                                        sscanf (optarg, "%f,%d%%", &crit_size_bytes, &crit_percent) == 2) {

++                               crit_size_bytes = floorf(crit_size_bytes);

++                               break;

++                       }

++                       else if (strstr (optarg, "%") &&

++                                                        sscanf (optarg, "%d%%", &crit_percent) == 1) {

++                               break;

++                       }

++                       else {

++                               usage4 (_("Critical threshold must be integer or percentage!"));

++                       }

++               case 'v':                                                                       /* verbose */

++                       verbose++;

++                       break;

++               case 'V':                                                                       /* version */

++                       print_revision (progname, revision);

++                       exit (STATE_OK);

++               case 'h':                                                                       /* help */

++                       print_help ();

++                       exit (STATE_OK);

++               case '?':                                                                       /* error */

++                       usage2 (_("Unknown argument"), optarg);

++               }

++       }

++

++       c = optind;

++       if (c == argc)

++               return validate_arguments ();

++       if (warn_percent == 0 && is_intnonneg (argv[c]))

++               warn_percent = atoi (argv[c++]);

++

++       if (c == argc)

++               return validate_arguments ();

++       if (crit_percent == 0 && is_intnonneg (argv[c]))

++               crit_percent = atoi (argv[c++]);

++

++       if (c == argc)

++               return validate_arguments ();

++       if (warn_size_bytes == 0 && is_intnonneg (argv[c]))

++               warn_size_bytes = (float) atoi (argv[c++]);

++

++       if (c == argc)

++               return validate_arguments ();

++       if (crit_size_bytes == 0 && is_intnonneg (argv[c]))

++               crit_size_bytes = (float) atoi (argv[c++]);

++

++       return validate_arguments ();

++}

++

++int validate_arguments (void)

++{

++       if (warn_percent == 0 && crit_percent == 0 && warn_size_bytes == 0

++                       && crit_size_bytes == 0) {

++               return ERROR;

++       }

++       else if (warn_percent < crit_percent) {

++               usage4

++                       (_("Warning percentage should be more than critical percentage"));

++       }

++       else if (warn_size_bytes < crit_size_bytes) {

++               usage4

++                       (_("Warning free space should be more than critical free space"));

++       }

++       return OK;

++}

++

++void print_help (void)

++{

++       print_revision (progname, revision);

++       printf (_(COPYRIGHT), copyright, email);

++       printf ("%s\n", _("Check RAM on local machine."));

++       printf ("\n\n");

++       print_usage ();

++       printf (_(UT_HELP_VRSN));

++       printf (" %s\n", "-w, --warning=INTEGER");

++       printf ("    %s\n", _("Exit with WARNING status if less than INTEGER bytes of RAM are free"));

++       printf (" %s\n", "-w, --warning=PERCENT%%");

++       printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of RAM are free"));

++       printf (" %s\n", "-c, --critical=INTEGER");

++       printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of RAM are free"));

++       printf (" %s\n", "-c, --critical=PERCENT%%");

++       printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of RAM are free"));

++       printf (" %s\n", "-v, --verbose");

++       printf ("    %s\n", _("Verbose output. Up to 3 levels"));

++       printf ("\n");

++       printf (_(UT_SUPPORT));

++}

++

++void print_usage (void)

++{

++       printf (_("Usage:"));

++       printf ("%s [-v] -w <percent_free>%% -c <percent_free>%%\n",progname);

++       printf ("%s [-v] -w <bytes_free> -c <bytes_free>\n", progname);

++}

+--- /dev/null

++++ nagios-plugins-1.4.5/plugins/t/check_ram.t

+@@ -0,0 +1,32 @@

++#! /usr/bin/perl -w -I ..

++#

++# Ram Space Tests via check_ram

++#

++# $Id: check_raam.t $

++#

++

++use strict;

++use Test::More tests => 8;

++use NPTest;

++

++my $successOutput = '/^RAM OK - [0-9]+\% free \([0-9]+ MB out of [0-9]+ MB\)/';

++my $failureOutput = '/^RAM CRITICAL - [0-9]+\% free \([0-9]+ MB out of [0-9]+ MB\)/';

++my $warnOutput    = '/^RAM WARNING - [0-9]+\% free \([0-9]+ MB out of [0-9]+ MB\)/';

++

++my $result;

++

++$result = NPTest->testCmd( "./check_ram -w 1048576 -c 1048576" );              # 1 MB free

++cmp_ok( $result->return_code, "==", 0, "At least 1MB free" );

++like( $result->output, $successOutput, "Right output" );

++

++$result = NPTest->testCmd( "./check_ram -w 1% -c 1%" );                        # 1% free

++cmp_ok( $result->return_code, "==", 0, 'At least 1% free' );

++like( $result->output, $successOutput, "Right output" );

++

++$result = NPTest->testCmd( "./check_ram -w 100% -c 100%" );                    # 100% (always critical)

++cmp_ok( $result->return_code, "==", 2, 'Get critical because not 100% free' );

++like( $result->output, $failureOutput, "Right output" );

++

++$result = NPTest->testCmd( "./check_ram -w 100% -c 1%" );                      # 100% (always warn)

++cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' );

++like( $result->output, $warnOutput, "Right output" );

diff --git a/web/attachments/258626-check_mysql_query.c.diff b/web/attachments/258626-check_mysql_query.c.diff
new file mode 100644
index 0000000..c06efe0
--- /dev/null
+++ b/web/attachments/258626-check_mysql_query.c.diff
@@ -0,0 +1,92 @@
+--- check_mysql_query.c 2007-12-14 11:41:41.000000000 -0800
++++ check_mysql_query.c 2007-12-14 12:17:56.000000000 -0800
+@@ -59,6 +59,8 @@
+ void print_usage (void);
+ 
+ char *sql_query = NULL;
++unsigned int sql_column = 0;
++
+ int verbose = 0;
+ thresholds *my_thresholds = NULL;
+ 
+@@ -74,6 +76,7 @@
+        double value;
+        char *error = NULL;
+        int status;
++       unsigned int numcols;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -121,6 +124,12 @@
+                mysql_close(&mysql);
+                die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("No rows returned"));
+        }
++       
++       /* Check number of columns in result */
++       numcols = mysql_num_fields(res);
++       if(sql_column >= numcols) {
++               die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("Result has too few columns to satisfy --column")); 
++       }
+ 
+        /* fetch the first row */
+        if ( (row = mysql_fetch_row (res)) == NULL) {
+@@ -136,11 +145,11 @@
+        /* close the connection */
+        mysql_close (&mysql);
+ 
+-       if (! is_numeric(row[0])) {
++       if (! is_numeric(row[sql_column])) {
+                die (STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
+        }
+ 
+-       value = strtod(row[0], NULL);
++       value = strtod(row[sql_column], NULL);
+ 
+        if (verbose >= 3)
+                printf("mysql result: %f\n", value);
+@@ -182,6 +191,7 @@
+                {"query", required_argument, 0, 'q'},
+                {"warning", required_argument, 0, 'w'},
+                {"critical", required_argument, 0, 'c'},
++               {"column", required_argument, 0, 'C'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -189,7 +199,7 @@
+                return ERROR;
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:q:w:c:", longopts, &option);
++               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:q:w:c:C:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -233,6 +243,9 @@
+                case 'q':
+                        asprintf(&sql_query, "%s", optarg);
+                        break;
++               case 'C':                                                                       /* column */
++                       sql_column = atoi(optarg);
++                       break;
+                case 'w':
+                        warning = optarg;
+                        break;
+@@ -292,7 +305,9 @@
+ 
+        printf (_(UT_HELP_VRSN));
+        printf (" -q, --query=STRING\n");
+-       printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
++       printf ("    %s\n", _("SQL query to run. Only first column (unless -c says otherwise) in first row will be read"));
++       printf (" -C, --column=INTEGER\n");
++       printf ("    %s\n", _("Column number in result row to use for comparison (Default: 0)"));
+        printf (_(UT_WARN_CRIT_RANGE));
+        printf (_(UT_HOST_PORT), 'P', myport);
+        printf (" -d, --database=STRING\n");
+@@ -317,6 +332,6 @@
+ {
+   printf (_("Usage:"));
+        printf ("%s -q SQL_query [-w warn] [-c crit]\n",progname);
+-  printf ("[-d database] [-H host] [-P port] [-u user] [-p password]\n");
++  printf ("[ -C column ] [-d database] [-H host] [-P port] [-u user] [-p password]\n");
+ }
+ 
diff --git a/web/attachments/258859-check_dns.c.patch b/web/attachments/258859-check_dns.c.patch
new file mode 100644
index 0000000..256624f
--- /dev/null
+++ b/web/attachments/258859-check_dns.c.patch
@@ -0,0 +1,97 @@
+--- check_dns.c 2007-01-29 08:46:41.000000000 +1100
++++ check_dns-patched.c 2007-11-26 21:31:23.000000000 +1100
+@@ -62,6 +62,9 @@
+ int expect_authority = FALSE;
+ thresholds *time_thresholds = NULL;
+ 
++#define IPV4_SIZE 16*sizeof(char)

++int order_results = FALSE;

++

+ int
+ main (int argc, char **argv)
+ {
+@@ -178,6 +181,56 @@
+          _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
+          NSLOOKUP_COMMAND);
+ 
++  /* Order the results from DNS server */

++  if (order_results) {

++    int num_result = 1; /* No commas?  only one address */

++    int i = 0;

++    char *ipv4_sort = NULL;

++    char *pstrtmp;

++    char *pstrtok;

++

++    pstrtmp = strchr(address, ',');

++    while (pstrtmp) {

++      num_result++;

++      pstrtmp += sizeof(char);

++      pstrtmp = strchr(pstrtmp, ',');

++    }

++

++    if (num_result > 1) {

++      ipv4_sort = malloc(IPV4_SIZE*num_result);

++      if (NULL == ipv4_sort)

++      die (STATE_UNKNOWN,

++         _("DNS UNKNOWN - Failed allocating %d bytes for ordering results\n"),

++         IPV4_SIZE*num_result);

++

++      memset(ipv4_sort, 0, IPV4_SIZE*num_result);

++      pstrtmp = strdup(address);

++      pstrtok = strtok(pstrtmp, ",");

++      i = 0;

++      while (pstrtok) {

++        strncpy(ipv4_sort+(i*IPV4_SIZE), pstrtok, IPV4_SIZE);

++        pstrtok = strtok(NULL, ",");

++        i++;

++      }

++      free(pstrtmp);

++

++      qsort(ipv4_sort, num_result, IPV4_SIZE, strcmp);

++

++      pstrtmp = address;

++      for (i = 0; i < num_result; i++) {

++        strcpy(pstrtmp, ipv4_sort+(i*IPV4_SIZE));

++        pstrtmp += (strlen(pstrtmp));

++        if (i+1 < num_result) {

++          *pstrtmp = ',';

++          pstrtmp += sizeof(char);

++        }

++        *pstrtmp = '\0';

++      }

++

++      free(ipv4_sort);

++    }

++  }

++

+   /* compare to expected address */
+   if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
+     result = STATE_CRITICAL;
+@@ -316,7 +369,7 @@
+       strcpy (argv[c], "-t");
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "hVvAt:H:s:r:a:w:c:", long_opts, &opt_index);
++    c = getopt_long (argc, argv, "hVvAot:H:s:r:a:w:c:", long_opts, &opt_index);

+ 
+     if (c == -1 || c == EOF)
+       break;
+@@ -331,6 +384,9 @@
+     case 'v': /* version */
+       verbose = TRUE;
+       break;
++    case 'o':

++      order_results = TRUE;

++    break;

+     case 't': /* timeout period */
+       timeout_interval = atoi (optarg);
+       break;
+@@ -431,6 +487,8 @@
+   printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with ."));
+   printf (" -A, --expect-authority\n");
+   printf ("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
++  printf (" -o\n");

++  printf ("    %s\n", _("Order the results from DNS server. Useful for round-robind setups."));

+   printf (" -w, --warning=seconds\n");
+   printf ("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
+   printf (" -c, --critical=seconds\n");
diff --git a/web/attachments/259195-check_dhcp-roguedhcpservercheck.txt b/web/attachments/259195-check_dhcp-roguedhcpservercheck.txt
new file mode 100644
index 0000000..4489fec
--- /dev/null
+++ b/web/attachments/259195-check_dhcp-roguedhcpservercheck.txt
@@ -0,0 +1,123 @@
+--- check_dhcp.c.orig   2007-12-14 21:04:26.000000000 +0100
++++ check_dhcp.c        2007-12-15 16:04:12.000000000 +0100
+@@ -165,6 +165,7 @@
+        u_int32_t lease_time;            /* lease time in seconds */
+        u_int32_t renewal_time;          /* renewal time in seconds */
+        u_int32_t rebinding_time;        /* rebinding time in seconds */
++       u_int8_t desired;                /* is this offer desired (necessary in exclusive mode) */
+        struct dhcp_offer_struct *next;
+         }dhcp_offer;
+ 
+@@ -209,6 +210,7 @@
+ #define ETHERNET_HARDWARE_ADDRESS_LENGTH     6     /* length of Ethernet hardware addresses */
+ 
+ u_int8_t unicast = 0;        /* unicast mode: mimic a DHCP relay */
++u_int8_t exclusive = 0;        /* exclusive mode aka "rogue DHCP server detection" */
+ struct in_addr my_ip;        /* our address (required for relay) */
+ struct in_addr dhcp_ip;      /* server to query (if in unicast mode) */
+ unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH]="";
+@@ -919,6 +921,7 @@
+        new_offer->lease_time=dhcp_lease_time;
+        new_offer->renewal_time=dhcp_renewal_time;
+        new_offer->rebinding_time=dhcp_rebinding_time;
++       new_offer->desired=FALSE; /* exclusive mode: we'll check that in get_results */
+ 
+ 
+        if(verbose){
+@@ -964,7 +967,7 @@
+ 
+ /* gets state and plugin output to return */
+ int get_results(void){
+-       dhcp_offer *temp_offer;
++       dhcp_offer *temp_offer, *undesired_offer=NULL;
+        requested_server *temp_server;
+        int result;
+        u_int32_t max_lease_time=0;
+@@ -999,11 +1002,18 @@
+                                        if(temp_server->answered == FALSE){
+                                                requested_responses++;
+                                                temp_server->answered=TRUE;
++                                               temp_offer->desired=TRUE;
+                                                }
+                                        }
+                                }
+                        }
+ 
++               /* exclusive mode: check for undesired offers */
++               for(temp_offer=dhcp_offer_list;temp_offer!=NULL;temp_offer=temp_offer->next)
++                       if (temp_offer->desired == FALSE) {
++                               undesired_offer=temp_offer; /* Checks only for the first undesired offer */
++                               break; /* no further checks needed */
++                       }
+                }
+ 
+        /* else check and see if we got our requested address from any server */
+@@ -1030,6 +1040,9 @@
+                result=STATE_WARNING;
+        else if(request_specific_address==TRUE && received_requested_address==FALSE)
+                result=STATE_WARNING;
++       
++       if(exclusive && undesired_offer)
++                result=STATE_CRITICAL;
+ 
+        if(result==0)               /* garrett honeycutt 2005 */
+                printf("OK: ");
+@@ -1046,6 +1059,12 @@
+                return result;
+                }
+ 
++       if(exclusive && undesired_offer){
++                printf(_("Rogue DHCP Server detected! Server %s"),inet_ntoa(undesired_offer->server_address));
++                printf(_(" offered %s \n"),inet_ntoa(undesired_offer->offered_address));
++                return result;
++               }
++
+        printf(_("Received %d DHCPOFFER(s)"),valid_responses);
+ 
+        if(requested_servers>0)
+@@ -1100,6 +1119,7 @@
+                {"interface",      required_argument,0,'i'},
+                {"mac",            required_argument,0,'m'},
+                {"unicast",        no_argument,      0,'u'},
++               {"exclusive",      no_argument,      0,'x'},
+                {"verbose",        no_argument,      0,'v'},
+                {"version",        no_argument,      0,'V'},
+                {"help",           no_argument,      0,'h'},
+@@ -1107,7 +1127,7 @@
+        };
+ 
+        while(1){
+-               c=getopt_long(argc,argv,"+hVvt:s:r:t:i:m:u",long_options,&option_index);
++               c=getopt_long(argc,argv,"+hVvxt:s:r:t:i:m:u",long_options,&option_index);
+ 
+                i++;
+ 
+@@ -1170,6 +1190,10 @@
+                        unicast=1;
+                        break;
+ 
++                case 'x': /* exclusive testing aka "rogue DHCP server detection" */
++                        exclusive=1;
++                        break;
++               
+                case 'V': /* version */
+                        print_revision(progname,revision);
+                        exit(STATE_OK);
+@@ -1415,6 +1439,8 @@
+   printf ("    %s\n", _("MAC address to use in the DHCP request"));
+   printf (" %s\n", "-u, --unicast");
+   printf ("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
++  printf (" %s\n", "-x, --exclusive");
++  printf ("    %s\n", _("Only requested DHCP server may response (rogue DHCP server detection), requires -s"));
+ 
+        return;
+        }
+@@ -1424,7 +1450,7 @@
+ print_usage(void){
+        
+   printf (_("Usage:"));
+-  printf (" %s [-v] [-u] [-s serverip] [-r requestedip] [-t timeout]\n",progname);
++  printf (" %s [-v] [-u] [-x] [-s serverip] [-r requestedip] [-t timeout]\n",progname);
+   printf ("                  [-i interface] [-m mac]\n");
+   
+        return;
diff --git a/web/attachments/260740-check_ntp_time.mega_debug.patch b/web/attachments/260740-check_ntp_time.mega_debug.patch
new file mode 100644
index 0000000..b08b980
--- /dev/null
+++ b/web/attachments/260740-check_ntp_time.mega_debug.patch
@@ -0,0 +1,63 @@
+Index: plugins/check_ntp_time.c
+===================================================================
+--- plugins/check_ntp_time.c    (revision 1884)
++++ plugins/check_ntp_time.c    (working copy)
+@@ -249,8 +249,12 @@
+ int best_offset_server(const ntp_server_results *slist, int nservers){
+        int i=0, j=0, cserver=0, candidates[5], csize=0;
+ 
++       if (verbose>2)
++               printf("best_offset_server() line %d: nservers=%d\n", __LINE__, nservers);
+        /* for each server */
+        for(cserver=0; cserver<nservers; cserver++){
++               if (verbose>2)
++                       printf("best_offset_server() line %d: cserver=%d\n", __LINE__, cserver);
+                /* sort out servers with error flags */
+                if ( LI(slist[cserver].flags) != LI_NOWARNING ){
+                        if (verbose) printf("discarding peer id %d: flags=%d\n", cserver, LI(slist[cserver].flags));
+@@ -261,25 +265,37 @@
+                for(i=0; i<csize; i++){
+                        /* does it have an equal or better stratum? */
+                        if(slist[cserver].stratum <= slist[i].stratum){
++                               if (verbose>2)
++                                       printf("best_offset_server() line %d: slist[%d].stratum <= slist[%d].stratum\n", __LINE__, cserver, i);
+                                /* does it have an equal or better dispersion? */
+                                if(slist[cserver].rtdisp <= slist[i].rtdisp){
++                                       if (verbose>2)
++                                               printf("best_offset_server() line %d: slist[%d].rtdisp <= slist[%d].rtdisp\n", __LINE__, cserver, i);
+                                        /* does it have a better rtdelay? */
+                                        if(slist[cserver].rtdelay < slist[i].rtdelay){
++                                               if (verbose>2)
++                                                       printf("best_offset_server() line %d: slist[%d].rtdelay < slist[%d].rtdelay\n", __LINE__, cserver, i);
+                                                break;
+                                        }
+                                }
+                        }
++                       if (verbose>2)
++                                printf("best_offset_server() line %d: i=%d, csize=%d\n", __LINE__, i, csize);
+                }
+ 
+                /* if we haven't reached the current list's end, move everyone
+                 * over one to the right, and insert the new candidate */
+                if(i<csize){
+                        for(j=5; j>i; j--){
++                               if (verbose>2)
++                                       printf("best_offset_server() line %d: candidates[%d]=candidates[%d-1] (i=%d, csize=%d)\n", __LINE__, j, j, i, csize);
+                                candidates[j]=candidates[j-1];
+                        }
+                }
+                /* regardless, if they should be on the list... */
+                if(i<5) {
++                       if (verbose>2)
++                               printf("best_offset_server() line %d: candidates[%d]=%d (csize=%d)\n", __LINE__, i, cserver, csize);
+                        candidates[i]=cserver;
+                        if(csize<5) csize++;
+                /* otherwise discard the server */
+@@ -337,6 +353,7 @@
+        servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts);
+        if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array");
+        memset(servers, 0, sizeof(ntp_server_results)*num_hosts);
++       DBG(printf("Found %d peers to check\n", num_hosts));
+ 
+        /* setup each socket for writing, and the corresponding struct pollfd */
+        ai_tmp=ai;
diff --git a/web/attachments/260847-check_ntp_time.best_offset_server_fix.patch b/web/attachments/260847-check_ntp_time.best_offset_server_fix.patch
new file mode 100644
index 0000000..c542da0
--- /dev/null
+++ b/web/attachments/260847-check_ntp_time.best_offset_server_fix.patch
@@ -0,0 +1,21 @@
+Index: plugins/check_ntp_time.c
+===================================================================
+--- plugins/check_ntp_time.c    (revision 1885)
++++ plugins/check_ntp_time.c    (working copy)
+@@ -274,7 +274,7 @@
+                /* if we haven't reached the current list's end, move everyone
+                 * over one to the right, and insert the new candidate */
+                if(i<csize){
+-                       for(j=5; j>i; j--){
++                       for(j=4; j>i; j--){
+                                candidates[j]=candidates[j-1];
+                        }
+                }
+@@ -337,6 +337,7 @@
+        servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts);
+        if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array");
+        memset(servers, 0, sizeof(ntp_server_results)*num_hosts);
++       DBG(printf("Found %d peers to check\n", num_hosts));
+ 
+        /* setup each socket for writing, and the corresponding struct pollfd */
+        ai_tmp=ai;
diff --git a/web/attachments/260911-nagios-plugins-1.4.11-check_swap-hpux-floor-patch b/web/attachments/260911-nagios-plugins-1.4.11-check_swap-hpux-floor-patch
new file mode 100644
index 0000000..0ecd862
--- /dev/null
+++ b/web/attachments/260911-nagios-plugins-1.4.11-check_swap-hpux-floor-patch
@@ -0,0 +1,21 @@
+diff -Naur nagios-plugins-1.4.11/plugins/check_swap.c nagios-plugins-1.4.11-hpux-floor/plugins/check_swap.c
+--- nagios-plugins-1.4.11/plugins/check_swap.c  2007-12-10 08:52:00.000000000 +0100
++++ nagios-plugins-1.4.11-hpux-floor/plugins/check_swap.c       2008-01-05 17:11:46.696863797 +0100
+@@ -427,7 +427,7 @@
+                        else if (strstr (optarg, ",") &&
+                                                         strstr (optarg, "%") &&
+                                                         sscanf (optarg, "%f,%d%%", &warn_size_bytes, &warn_percent) == 2) {
+-                               warn_size_bytes = floorf(warn_size_bytes);
++                               warn_size_bytes = (float) floor(warn_size_bytes);
+                                break;
+                        }
+                        else if (strstr (optarg, "%") &&
+@@ -445,7 +445,7 @@
+                        else if (strstr (optarg, ",") &&
+                                                         strstr (optarg, "%") &&
+                                                         sscanf (optarg, "%f,%d%%", &crit_size_bytes, &crit_percent) == 2) {
+-                               crit_size_bytes = floorf(crit_size_bytes);
++                               crit_size_bytes = (float) floor(crit_size_bytes);
+                                break;
+                        }
+                        else if (strstr (optarg, "%") &&
diff --git a/web/attachments/261480-nagios-plugins-1.4.11-check_http-sizecheck.patch b/web/attachments/261480-nagios-plugins-1.4.11-check_http-sizecheck.patch
new file mode 100644
index 0000000..e6831d9
--- /dev/null
+++ b/web/attachments/261480-nagios-plugins-1.4.11-check_http-sizecheck.patch
@@ -0,0 +1,34 @@
+--- check_http.c        (revision 1904)
++++ check_http.c        (working copy)
+@@ -961,14 +961,7 @@
+   /* these checks should be last */
+ 
+   if (strlen (string_expect)) {
+-    if (strstr (page, string_expect)) {
+-      printf (_("HTTP OK %s - %.3f second response time %s|%s %s\n"),
+-              status_line, elapsed_time,
+-              (display_html ? "</A>" : ""),
+-              perfd_time (elapsed_time), perfd_size (pagesize));
+-      exit (STATE_OK);
+-    }
+-    else {
++    if (!strstr (page, string_expect)) {
+       printf (_("HTTP CRITICAL - string not found%s|%s %s\n"),
+               (display_html ? "</A>" : ""),
+               perfd_time (elapsed_time), perfd_size (pagesize));
+@@ -979,11 +972,10 @@
+   if (strlen (regexp)) {
+     errcode = regexec (&preg, page, REGS, pmatch, 0);
+     if ((errcode == 0 && invert_regex == 0) || (errcode == REG_NOMATCH && invert_regex == 1)) {
+-      printf (_("HTTP OK %s - %.3f second response time %s|%s %s\n"),
+-              status_line, elapsed_time,
+-              (display_html ? "</A>" : ""),
+-              perfd_time (elapsed_time), perfd_size (pagesize));
+-      exit (STATE_OK);
++      /*
++      Success, i.e. don't do anything here -- let the final success
++      handler take care of it.
++      */
+     }
+     else if ((errcode == REG_NOMATCH && invert_regex == 0) || (errcode == 0 && invert_regex == 1)) {
+       if (invert_regex == 0) 
diff --git a/web/attachments/26227-check_procs-pch.txt b/web/attachments/26227-check_procs-pch.txt
new file mode 100644
index 0000000..e3f8bd1
--- /dev/null
+++ b/web/attachments/26227-check_procs-pch.txt
@@ -0,0 +1,135 @@
+--- plugins/check_procs.c.orig  Tue Jun 11 09:08:00 2002

++++ plugins/check_procs.c       Tue Jun 11 13:47:52 2002

+@@ -68,6 +68,14 @@

+ char *format = NULL;

+ char tmp[MAX_INPUT_BUFFER];

+ 

++#ifdef HAVE_REGEX_H

++#include <regex.h>

++regex_t argsre, progre;

++int cflags = 0;

++char errbuf[MAX_INPUT_BUFFER];

++int excode;

++#endif

++

+ int

+ main (int argc, char **argv)

+ {

+@@ -91,6 +99,21 @@

+        if (process_arguments (argc, argv) == ERROR)

+                usage ("Unable to parse command line\n");

+ 

++#if HAVE_REGEX_H

++       if ((options & ARGS) && cflags) {

++               if ((excode = regcomp (&argsre, args, cflags)) != 0) {

++                       printf ("Could Not Compile Regular Expression\n");

++                       return STATE_UNKNOWN;

++               }

++       }

++       if ((options & PROG) && cflags) {

++               if ((excode = regcomp (&progre, prog, cflags)) != 0) {

++                       printf ("Could Not Compile Regular Expression\n");

++                       return STATE_UNKNOWN;

++               }

++       }

++#endif

++

+        /* run the command */

+        if (verbose)

+                printf ("%s\n", PS_COMMAND);

+@@ -121,10 +144,34 @@

+                        strip (procargs);

+                        if ((options & STAT) && (strstr (statopts, procstat)))

+                                resultsum |= STAT;

+-                       if ((options & ARGS) && (strstr (procargs, args) == procargs))

++                       if ((options & ARGS) && !cflags && (strstr (procargs, args) == procargs))

+                                resultsum |= ARGS;

+-                       if ((options & PROG) && (strcmp (prog, procprog) == 0))

++                       if ((options & PROG) && !cflags && (strcmp (prog, procprog) == 0))

+                                resultsum |= PROG;

++#if HAVE_REGEX_H

++                       if ((options & ARGS) && cflags) {

++                         excode = regexec (&argsre, procargs, (size_t) 0, NULL, 0);

++                         if (excode == 0) {

++                                       resultsum |= ARGS;

++                               }

++                               else if (excode != REG_NOMATCH) {

++                                       regerror (excode, &argsre, errbuf, MAX_INPUT_BUFFER);

++                                       printf ("Execute Error: %s\n", errbuf);

++                                       exit (STATE_CRITICAL);

++                               }

++                       }

++                       if ((options & PROG) && cflags) {

++                         excode = regexec (&progre, procprog, (size_t) 0, NULL, 0);

++                         if (excode == 0) {

++                                       resultsum |= PROG;

++                               }

++                               else if (excode != REG_NOMATCH) {

++                                       regerror (excode, &argsre, errbuf, MAX_INPUT_BUFFER);

++                                       printf ("Execute Error: %s\n", errbuf);

++                                       exit (STATE_CRITICAL);

++                               }

++                       }

++#endif

+                        if ((options & PPID) && (procppid == ppid))

+                                resultsum |= PPID;

+                        if ((options & USER) && (procuid == uid))

+@@ -263,6 +310,9 @@

+                {"help", no_argument, 0, 'h'},

+                {"version", no_argument, 0, 'V'},

+                {"verbose", no_argument, 0, 'v'},

++               {"regex", no_argument, 0, 'r'},

++               {"ereg", no_argument, 0, 'r'},

++               {"eregi", no_argument, 0, 'R'},

+                {0, 0, 0, 0}

+        };

+ #endif

+@@ -270,10 +320,10 @@

+        while (1) {

+ #ifdef HAVE_GETOPT_H

+                c =

+-                       getopt_long (argc, argv, "+Vvht:c:w:p:s:u:C:a:", long_options,

++                       getopt_long (argc, argv, "+VvhRrt:c:w:p:s:u:C:a:", long_options,

+                                                                         &option_index);

+ #else

+-               c = getopt (argc, argv, "+Vvht:c:w:p:s:u:C:a:");

++               c = getopt (argc, argv, "+VvhRrt:c:w:p:s:u:C:a:");

+ #endif

+ 

+                if (c == EOF)

+@@ -419,6 +469,22 @@

+                case 'v':                                                                       /* command */

+                        verbose = TRUE;

+                        break;

++               case 'R':                                                                       /* regex */

++#ifdef HAVE_REGEX_H

++                       cflags = REG_ICASE | REG_EXTENDED | REG_NOSUB | REG_NEWLINE;

++#else

++                       printf ("PROCS UNKNOWN: call for regex which was not a compiled option");

++                       exit (STATE_UNKNOWN);

++#endif

++                       break;

++               case 'r':                                                                       /* regex */

++#ifdef HAVE_REGEX_H

++                       cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;

++#else

++                       printf ("PROCS UNKNOWN: call for regex which was not a compiled option");

++                       exit (STATE_UNKNOWN);

++#endif

++                       break;

+                }

+        }

+        return i;

+@@ -492,7 +558,11 @@

+                 " -a, --argument-array=STRING\n"

+                 "    Only scan for ARGS that match up to the length of the given STRING\n"

+                 " -C, --command=COMMAND\n"

+-                "    Only scan for exact matches to the named COMMAND.\n\n"

++                "    Only scan for exact matches to the named COMMAND.\n"

++                " -r, --ereg\n"

++                "    Treat the -a or -C argument as an extended regular expression\n"

++                " -R, --eregi\n"

++                "    Treat the -a or -C argument as a case-insensitive extended regular expression\n\n"

+                 "RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n"

+                 "specified 'max:min', a warning status will be generated if the\n"

+ 

diff --git a/web/attachments/262608-check_oracle.sh-1.4.11.patch b/web/attachments/262608-check_oracle.sh-1.4.11.patch
new file mode 100644
index 0000000..720445c
--- /dev/null
+++ b/web/attachments/262608-check_oracle.sh-1.4.11.patch
@@ -0,0 +1,21 @@
+diff -u -r nagios-plugins-1.4.11\plugins-scripts\check_oracle.sh nagios-plugins-1.4.11-patch\plugins-scripts\check_oracle.sh

+--- nagios-plugins-1.4.11\plugins-scripts\check_oracle.sh       Sat Jul 07 13:40:30 2007

++++ nagios-plugins-1.4.11-patch\plugins-scripts\check_oracle.sh Thu Jan 17 13:47:50 2008

+@@ -247,13 +247,10 @@

+ set pagesize 0

+ set numf '9999999.99'

+ select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc

+-from (

+-select tablespace_name,sum(bytes)/1024/1024 total

+-from dba_data_files group by tablespace_name) A

+-LEFT OUTER JOIN

+-( select tablespace_name,sum(bytes)/1024/1024 free

+-from dba_free_space group by tablespace_name) B

+-ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';

++from

++  ( select tablespace_name,sum(bytes)/1024/1024 total from dba_data_files group by tablespace_name) A

++, ( select tablespace_name,sum(bytes)/1024/1024 free from dba_free_space group by tablespace_name)  B

++WHERE a.tablespace_name(+)=b.tablespace_name AND a.tablespace_name='${5}';

+ EOF`

+ 

+     if [ -n "`echo $result | grep ORA-`" ] ; then

diff --git a/web/attachments/26290-autoconf.dif b/web/attachments/26290-autoconf.dif
new file mode 100644
index 0000000..082234f
--- /dev/null
+++ b/web/attachments/26290-autoconf.dif
@@ -0,0 +1,11 @@
+--- configure.in
++++ configure.in        2002/07/01 13:58:19
+@@ -160,7 +160,7 @@
+ _SAVEDCPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-I/usr/include"
+ AC_ARG_WITH(mysqllibdir,--with-mysqllibdir=<dir> sets path to mysql libraries,[MYSQLLIBDIR=$withval])
+-if test -n "$MYSQLLIBS"; then
++if test -n "$MYSQLLIBDIR"; then
+   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz)
+ elif test -f /usr/lib/libmysqlclient.so; then
+   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
diff --git a/web/attachments/263186-check_linux_raid.pl.diff b/web/attachments/263186-check_linux_raid.pl.diff
new file mode 100644
index 0000000..0e7861c
--- /dev/null
+++ b/web/attachments/263186-check_linux_raid.pl.diff
@@ -0,0 +1,77 @@
+--- contrib/check_linux_raid.pl 2007-08-28 04:19:45.000000000 +0100
++++ contrib/check_linux_raid.pl.new     2008-01-21 17:28:18.000000000 +0000
+@@ -3,6 +3,7 @@
+ # Copyright (c) 2002 ISOMEDIA, Inc.
+ # originally written by Steve Milton
+ # later updates by sean finney <seanius@seanius.net>
++# bux fixing & usage message by Alain Williams <addw@phcomp.co.uk>
+ #
+ # 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
+@@ -26,6 +27,8 @@
+ use lib "/usr/local/nagios/libexec";
+ use utils qw(%ERRORS);
+ 
++my ($progname) = $0 =~ m|([^/]+)$|;
++
+ # die with an error if we're not on Linux
+ if ($^O ne 'linux') {
+     print "This plugin only applicable on Linux.\n";
+@@ -42,9 +45,22 @@
+        return "UNKNOWN";
+ }
+ 
++sub usage {
++       print "Inspect Linux software raid devices and return a status for nagios\n";
++       print "Usage:\n";
++       print "$progname [--help | -h] [md-device ...]\n";
++       print "A md-device might be: md0\n";
++       print "If md-device is not given, all mds will be inspected\n";
++       exit 0;
++}
++
+ my $nextdev;
+-if(defined $ARGV[0]) { $nextdev = shift; }
+-else { $nextdev = "md[0-9]"; }
++if(defined $ARGV[0]) {
++       $nextdev = shift;
++       usage() if($nextdev eq '--help' or $nextdev eq '-h');
++} else {
++       $nextdev = "md[0-9]+";  # All MD devices
++}
+ 
+ my $code = "UNKNOWN";
+ my $msg = "";
+@@ -53,6 +69,7 @@
+ my %finish;
+ my %active;
+ my %devices;
++my $debug;
+ 
+ while(defined $nextdev){
+        open (MDSTAT, "< /proc/mdstat") or die "Failed to open /proc/mdstat";
+@@ -60,14 +77,22 @@
+        while(<MDSTAT>) {
+                if (defined $device) {
+                        if (/(\[[_U]+\])/) {
++                               print "status='$1' device '$device'\n" if($debug);
+                                $status{$device} = $1;
+                        } elsif (/recovery = (.*?)\s/) {  
+                                $recovery{$device} = $1;
+                                ($finish{$device}) = /finish=(.*?min)/;
+-                       } elsif (/^\s*$/) {
++                       } elsif (/^\s*$/) {     # Start of another device - blank line. NB: may not be present
++                               print "undef '$device' _='$_'\n" if($debug);
+                                $device=undef;
++                       } elsif(/^md[0-9]+\s*:/) {      # Start of another device - another way
++                               print "undef '$device' _='$_'\n" if($debug);
++                               undef $device;
+                        }
+-               } elsif (/^($nextdev)\s*:/) {
++               }
++
++               # No current device and this line matches the device pattern ?
++               if ( ! defined($device) and /^($nextdev)\s*:/) {
+                        $device=$1;
+                        $devices{$device}=$device;
+                        if (/active/) {
diff --git a/web/attachments/263302-command.cfg.in-check_ldap.patch b/web/attachments/263302-command.cfg.in-check_ldap.patch
new file mode 100644
index 0000000..ada86c2
--- /dev/null
+++ b/web/attachments/263302-command.cfg.in-check_ldap.patch
@@ -0,0 +1,15 @@
+--- nagios-plugins-1.4.11/command.cfg.in.org    2004-12-02 05:48:37.000000000 +0100
++++ nagios-plugins-1.4.11/command.cfg.in        2008-01-22 16:17:07.000000000 +0100
+@@ -268,8 +268,11 @@
+ # Netware 5 number of current service procs
+ command[check_nwstat_csprocs]=@libexecdir@/check_nwstat -H $HOSTADDRESS$ -v CSPROCS -w $ARG1$ -c $ARG2$
+ 
++# Check LDAP and LDAP over SSL
++command[check_ldap]=@libexecdir@/check_ldap -H $HOSTADDRESS$ -b "dc=Some,dc=Company,dc=com"
++command[check_ldaps]=@libexecdir@/check_ldaps -H $HOSTADDRESS$ -b "dc=Some,dc=Company,dc=com"
++
+ 
+ # Still have to write sample entries for the following:
+ #
+-# check_ldap
+ # check_overcr
diff --git a/web/attachments/263441-check_mailq-add-sudo.patch b/web/attachments/263441-check_mailq-add-sudo.patch
new file mode 100644
index 0000000..dff08c3
--- /dev/null
+++ b/web/attachments/263441-check_mailq-add-sudo.patch
@@ -0,0 +1,57 @@
+diff -Naur /home/qqnagio/software/nagios/nagios-plugins-1.4.11/plugins-scripts/check_mailq.pl /home/qqnagio/software/nagios/nagios-plugins-1.4.11.sudomailq/plugins-scripts/check_mailq.pl
+--- /home/qqnagio/software/nagios/nagios-plugins-1.4.11/plugins-scripts/check_mailq.pl  2006-07-05 15:45:57.000000000 +0200
++++ /home/qqnagio/software/nagios/nagios-plugins-1.4.11.sudomailq/plugins-scripts/check_mailq.pl        2008-01-23 14:52:01.556368612 +0100
+@@ -62,12 +62,29 @@
+ };
+ alarm($opt_t);
+ 
++# if there is an entry in the sudoers file which allows the caller of this
++# plugin to execute the $utils::PATH_TO_MAILQ command with superuser privileges
++# then prepend $utils::PATH_TO_MAILQ with "sudo "
++
++sub sudoize {
++       my $ppath_to_mailq = shift;
++       if (grep(/$$ppath_to_mailq/,
++           map { s/^\s+//g; s/\s+$//g; $_; }
++           map { split /, / }
++           map { s/^.*?://g; $_; }
++           do { local (@ARGV) = "/usr/bin/sudo -l |"; <> })) {
++               $$ppath_to_mailq = "/usr/bin/sudo ".$$ppath_to_mailq;
++       }
++}
++
++
+ # switch based on MTA
+ 
+ if ($mailq eq "sendmail") {
+ 
+        ## open mailq 
+        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++               sudoize(\$utils::PATH_TO_MAILQ);
+                if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+                        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+                        exit $ERRORS{'UNKNOWN'};
+@@ -297,6 +314,7 @@
+ 
+      ## open mailq
+         if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++               sudoize(\$utils::PATH_TO_MAILQ);
+                 if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+                         print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+                         exit $ERRORS{'UNKNOWN'};
+@@ -379,6 +397,7 @@
+ 
+        # open qmail-qstat 
+        if ( defined $utils::PATH_TO_QMAIL_QSTAT && -x $utils::PATH_TO_QMAIL_QSTAT ) {
++               sudoize(\$utils::PATH_TO_MAILQ);
+                if (! open (MAILQ, "$utils::PATH_TO_QMAIL_QSTAT | " ) ) {
+                        print "ERROR: could not open $utils::PATH_TO_QMAIL_QSTAT \n";
+                        exit $ERRORS{'UNKNOWN'};
+@@ -461,6 +480,7 @@
+ elsif ( $mailq eq "exim" ) {
+        ## open mailq 
+        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++               sudoize(\$utils::PATH_TO_MAILQ);
+                if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+                        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+                        exit $ERRORS{'UNKNOWN'};
diff --git a/web/attachments/263604-50_misc_typos.dpatch b/web/attachments/263604-50_misc_typos.dpatch
new file mode 100644
index 0000000..2f49980
--- /dev/null
+++ b/web/attachments/263604-50_misc_typos.dpatch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378823768" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378823768" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378823768" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378823768" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378823768');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1878971&group_id=29880&atid=397597&file_id=263604"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/263605-28_check_pgsql_include_for_8.3.dpatch b/web/attachments/263605-28_check_pgsql_include_for_8.3.dpatch
new file mode 100644
index 0000000..88fd591
--- /dev/null
+++ b/web/attachments/263605-28_check_pgsql_include_for_8.3.dpatch
@@ -0,0 +1,16 @@
+## 28_check_pgsql_include_for_8.3.dpatch by Jan Wagner <waja@cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: include pg_config_manual.h since NAMEDATALEN definition moved there with psql 8.3 
+
+diff -Nur nagios-plugins-1.4.11.orig/plugins/check_pgsql.c nagios-plugins-1.4.11/plugins/check_pgsql.c
+--- nagios-plugins-1.4.11.orig/plugins/check_pgsql.c    2007-01-28 22:46:41.000000000 +0100
++++ nagios-plugins-1.4.11/plugins/check_pgsql.c 2008-01-24 15:54:56.533368467 +0100
+@@ -43,6 +43,7 @@
+ #include "utils.h"
+ 
+ #include "netutils.h"
++#include "pg_config_manual.h"
+ #include <libpq-fe.h>
+ 
+ #define DEFAULT_DB "template1"
diff --git a/web/attachments/26370-check_http_strace.txt b/web/attachments/26370-check_http_strace.txt
new file mode 100644
index 0000000..0b8197b
--- /dev/null
+++ b/web/attachments/26370-check_http_strace.txt
@@ -0,0 +1,20 @@
+connect(3, {sin_family=AF_INET, sin_port=htons(80), sin_addr=inet_addr("216.239.

+39.100")}}, 16) = 0

+send(3, "GET / HTTP/1.0\r\n", 16, 0)    = 16

+send(3, "Host: www.google.com\r\n", 22, 0) = 22

+send(3, "User-Agent: check_http/1.1.1.1 ("..., 62, 0) = 62

+send(3, "\r\n\r\n", 4, 0)               = 4

+recv(3, "HTTP/1.0 200 OK\r\nContent-Length:"..., 1023, 0) = 381

+recv(3, "<html><head><META HTTP-EQUIV=\"co"..., 1023, 0) = 1023

+brk(0x8051000)                          = 0x8051000

+recv(3, "color=#3366cc align=center width"..., 1023, 0) = 80

+recv(3, "b></font></td><td width=15>&nbsp"..., 1023, 0) = 1023

+recv(3, "<td valign=top nowrap><font size"..., 1023, 0) = 455

+recv(3, "ont size=-1><br><font color=red>"..., 1023, 0) = 579

+brk(0x8053000)                          = 0x8053000

+recv(3, 0x804e100, 1023, 0)             = ? ERESTARTSYS (To be restarted)

+--- SIGALRM (Alarm clock) ---

+fstat64(1, {st_mode=S_IFCHR|0620, st_rdev=makedev(136, 1), ...}) = 0

+old_mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0

+x40014000

+write(1, "Socket timeout after 10 seconds\n", 32) = 32
\ No newline at end of file
diff --git a/web/attachments/263786-30_fix_check_ntp_options.dpatch b/web/attachments/263786-30_fix_check_ntp_options.dpatch
new file mode 100644
index 0000000..2a1c2d6
--- /dev/null
+++ b/web/attachments/263786-30_fix_check_ntp_options.dpatch
@@ -0,0 +1,27 @@
+## 30_fix_check_ntp_options.dpatch by Jan Wagner <waja@cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix options for check_ntp_time and check_ntp_peer
+
+--- nagios-plugins-1.4.11/plugins/check_ntp_time.c.orig 2008-01-26 00:03:57.486086968 +0100
++++ nagios-plugins-1.4.11/plugins/check_ntp_time.c      2008-01-26 00:04:26.652580066 +0100
+@@ -631,7 +631,6 @@
+ print_usage(void)
+ {
+        printf (_("Usage:"));
+-       printf(" %s -H <host> [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
+-       printf("       [-j <warn>] [-k <crit>] [-v verbose]\n");
++       printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
+ }
+ 
+--- nagios-plugins-1.4.11/plugins/check_ntp_peer.c.orig 2008-01-26 00:08:50.393996604 +0100
++++ nagios-plugins-1.4.11/plugins/check_ntp_peer.c      2008-01-26 00:09:36.762190836 +0100
+@@ -642,7 +642,7 @@
+        printf ("    %s\n", _("Offset to result in critical status (seconds)"));
+        printf (" %s\n", "-W, --warning=THRESHOLD");
+        printf ("    %s\n", _("Warning threshold for stratum"));
+-       printf (" %s\n", "-W, --critical=THRESHOLD");
++       printf (" %s\n", "-C, --critical=THRESHOLD");
+        printf ("    %s\n", _("Critical threshold for stratum"));
+        printf (" %s\n", "-j, --warning=THRESHOLD");
+        printf ("    %s\n", _("Warning threshold for jitter"));
diff --git a/web/attachments/264034-nagios-plugins_bind.patch b/web/attachments/264034-nagios-plugins_bind.patch
new file mode 100644
index 0000000..208ae96
--- /dev/null
+++ b/web/attachments/264034-nagios-plugins_bind.patch
@@ -0,0 +1,137 @@
+diff -ur nagiosplug-trunk/plugins/check_http.c nagiosplug/plugins/check_http.c
+--- nagiosplug-trunk/plugins/check_http.c       2008-01-28 16:20:49.000000000 +0100
++++ nagiosplug/plugins/check_http.c     2008-01-28 17:03:51.000000000 +0100
+@@ -97,6 +97,7 @@
+ char server_port_text[6] = "";
+ char server_type[6] = "http";
+ char *server_address;
++char *client_address = NULL;
+ char *host_name;
+ char *server_url;
+ char *user_agent;
+@@ -188,6 +189,7 @@
+     {"ssl", no_argument, 0, 'S'},
+     {"post", required_argument, 0, 'P'},
+     {"IP-address", required_argument, 0, 'I'},
++    {"bind-address", required_argument, 0, 'B'},
+     {"url", required_argument, 0, 'u'},
+     {"port", required_argument, 0, 'p'},
+     {"authorization", required_argument, 0, 'a'},
+@@ -228,7 +230,7 @@
+   }
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
++    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:B:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -328,6 +330,9 @@
+     case 'I': /* Server IP-address */
+       server_address = strdup (optarg);
+       break;
++    case 'B': /* Bind address */
++      client_address = strdup (optarg);
++      break;
+     case 'u': /* URL path */
+       server_url = strdup (optarg);
+       server_url_length = strlen (server_url);
+@@ -732,7 +737,7 @@
+   int result = STATE_UNKNOWN;
+ 
+   /* try to connect to the host at the given port number */
+-  if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
++  if (my_tcp_bind_connect (server_address, server_port, &sd, client_address) != STATE_OK)
+     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+ #ifdef HAVE_SSL
+   if (use_ssl == TRUE) {
+@@ -1241,6 +1246,9 @@
+   printf ("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
+   printf (" %s\n", "-I, --IP-address=ADDRESS");
+   printf ("    %s\n", _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
++  printf (" %s\n", "-B, --bind-address=ADDRESS");
++  printf ("    %s\n", _("IP address or name on the local machine to be used as the source address"));
++  printf ("    %s\n", _("of the connection."));
+   printf (" %s\n", "-p, --port=INTEGER");
+   printf (" %s", _("Port number (default: "));
+   printf ("%d)\n", HTTP_PORT);
+diff -ur nagiosplug-trunk/plugins/netutils.c nagiosplug/plugins/netutils.c
+--- nagiosplug-trunk/plugins/netutils.c 2008-01-28 16:20:49.000000000 +0100
++++ nagiosplug/plugins/netutils.c       2008-01-28 17:33:48.000000000 +0100
+@@ -163,12 +163,14 @@
+ 
+ /* opens a tcp or udp connection to a remote host or local socket */
+ int
+-np_net_connect (const char *host_name, int port, int *sd, int proto)
++np_net_connect (const char *host_name, int port, int *sd, int proto, ...)
+ {
++       va_list ap;
+        struct addrinfo hints;
+-       struct addrinfo *r, *res;
++       struct addrinfo *r, *res, *rb;
+        struct sockaddr_un su;
+        char port_str[6], host[MAX_HOST_ADDRESS_LENGTH];
++       char *bindaddress;
+        size_t len;
+        int socktype, result;
+ 
+@@ -200,6 +202,28 @@
+                }
+ 
+                r = res;
++
++               va_start(ap, proto);
++               bindaddress = va_arg(ap, char *);
++               va_end(ap);
++               if (bindaddress) {
++                       memset (&hints, 0, sizeof (hints));
++                       hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
++                       hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */
++                       hints.ai_flags = AI_PASSIVE;    /* For wildcard IP address */
++                       hints.ai_protocol = 0;          /* Any protocol */
++                       hints.ai_canonname = NULL;
++                       hints.ai_addr = NULL;
++                       hints.ai_next = NULL;
++                       
++                       result = getaddrinfo (bindaddress, NULL, &hints, &res);
++                       if (result != 0) {
++                               printf ("%s\n", gai_strerror (result));
++                               return STATE_UNKNOWN;
++                       }
++                       rb = res;
++               }
++
+                while (r) {
+                        /* attempt to create a socket */
+                        *sd = socket (r->ai_family, socktype, r->ai_protocol);
+@@ -210,6 +234,15 @@
+                                return STATE_UNKNOWN;
+                        }
+ 
++                       /* attempt to bind to source IP */
++                       if (bindaddress) {
++                               result = bind(*sd, rb->ai_addr, rb->ai_addrlen);
++                               if (result != 0) {
++                                       printf ("%s\n", _("Unable to bind to source address"));
++                                       return STATE_UNKNOWN;
++                               }
++                       }
++
+                        /* attempt to open a connection */
+                        result = connect (*sd, r->ai_addr, r->ai_addrlen);
+ 
+diff -ur nagiosplug-trunk/plugins/netutils.h nagiosplug/plugins/netutils.h
+--- nagiosplug-trunk/plugins/netutils.h 2008-01-28 16:20:49.000000000 +0100
++++ nagiosplug/plugins/netutils.h       2008-01-28 17:27:30.000000000 +0100
+@@ -64,7 +64,10 @@
+ /* my_connect and wrapper macros */
+ #define my_tcp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_TCP)
+ #define my_udp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_UDP)
+-int np_net_connect(const char *address, int port, int *sd, int proto);
++#define my_tcp_bind_connect(addr, port, s, bind_addr) np_net_connect(addr, port, s, IPPROTO_TCP, bind_addr)
++#define my_ucp_bind_connect(addr, port, s, bind_addr) np_net_connect(addr, port, s, IPPROTO_TCP, bind_addr)
++
++int np_net_connect(const char *address, int port, int *sd, int proto, ...);
+ 
+ /* send_request and wrapper macros */
+ #define send_tcp_request(s, sbuf, rbuf, rsize) \
diff --git a/web/attachments/264171-check_http-HostHeader.patch b/web/attachments/264171-check_http-HostHeader.patch
new file mode 100644
index 0000000..556e57a
--- /dev/null
+++ b/web/attachments/264171-check_http-HostHeader.patch
@@ -0,0 +1,11 @@
+--- check_http.c.orig   2008-01-29 10:58:01.000000000 -0500
++++ check_http.c        2008-01-29 11:01:47.000000000 -0500
+@@ -753,7 +787,7 @@
+ 
+   /* optionally send the host header info */
+   if (host_name)
+-    asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
++    asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port);
+ 
+   /* optionally send any other header tag */
+   if (http_opt_headers_count) {
diff --git a/web/attachments/264173-check_http-PostFromFile.patch b/web/attachments/264173-check_http-PostFromFile.patch
new file mode 100644
index 0000000..2fe2102
--- /dev/null
+++ b/web/attachments/264173-check_http-PostFromFile.patch
@@ -0,0 +1,98 @@
+--- check_http.c.orig   2008-01-29 10:58:01.000000000 -0500
++++ check_http.c        2008-01-29 11:01:47.000000000 -0500
+@@ -122,6 +122,7 @@
+ int max_depth = 15;
+ char *http_method;
+ char *http_post_data;
++char *http_post_datafile;
+ char *http_content_type;
+ char buffer[MAX_INPUT_BUFFER];
+ 
+@@ -175,6 +176,9 @@
+ {
+   int c = 1;
+   char *p;
++  FILE *fp;
++  char input_buffer[MAX_INPUT_BUFFER];
++  int first;
+ 
+   enum {
+     INVERT_REGEX = CHAR_MAX + 1
+@@ -187,6 +191,7 @@
+     {"nohtml", no_argument, 0, 'n'},
+     {"ssl", no_argument, 0, 'S'},
+     {"post", required_argument, 0, 'P'},
++    {"postfile", required_argument, 0, 'F'},
+     {"IP-address", required_argument, 0, 'I'},
+     {"url", required_argument, 0, 'u'},
+     {"port", required_argument, 0, 'p'},
+@@ -228,7 +233,7 @@
+   }
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
++    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:F:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -349,6 +354,11 @@
+       http_method = strdup("POST");
+       http_post_data = strdup (optarg);
+       break;
++    case 'F': /* HTTP POST data from file in URL encoded format */
++      if (http_method || http_post_datafile) break;
++      http_method = strdup("POST");
++      http_post_datafile = strdup (optarg);
++      break;
+     case 's': /* string or substring */
+       strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
+       string_expect[MAX_INPUT_BUFFER - 1] = 0;
+@@ -439,6 +449,30 @@
+   }
+ 
+   c = optind;
++  
++  /* If user asked to read POST data from file, check for file existence then read content */
++  
++  if (http_post_datafile != NULL) {
++    fp = fopen(http_post_datafile,"r");
++    if (fp == NULL)
++      usage4 (_("Unable to open POST data file\n"));
++    
++    first=1;
++    while (fgets(input_buffer,MAX_INPUT_BUFFER,fp)) {
++      input_buffer[strlen(input_buffer)-1] = '\0';    /* strip newline */
++      if (first == 1) {
++        first=0;
++       asprintf (&http_post_data, "%s\r\n", input_buffer);
++      } else {
++        asprintf (&http_post_data, "%s%s\r\n", http_post_data, input_buffer);
++      }
++    }
++    
++    fclose(fp);
++  }
++  
++  /* End of POST data file addition */
++    
+ 
+   if (server_address == NULL && c < argc)
+     server_address = strdup (argv[c++]);
+@@ -1265,6 +1299,8 @@
+   printf ("    %s\n", _("URL to GET or POST (default: /)"));
+   printf (" %s\n", "-P, --post=STRING");
+   printf ("    %s\n", _("URL encoded http POST data"));
++  printf (" %s\n", "-F, --postfile=PATH");
++  printf ("    %s\n", _("file with URL-encoded http POST data"));
+   printf (" %s\n", "-N, --no-body");
+   printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));
+   printf ("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
+@@ -1341,7 +1377,7 @@
+   printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
+   printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n");
+   printf ("       [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n");
+-  printf ("       [-s string] [-l] [-r <regex> | -R <case-insensitive regex>] [-P string]\n");
++  printf ("       [-s string] [-l] [-r <regex> | -R <case-insensitive regex>] [-P string | -F file]\n");
+   printf ("       [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>] [-A string]\n");
+   printf ("       [-k string] [-S] [-C <age>] [-T <content-type>]\n");
+ }
diff --git a/web/attachments/265188-31_check_disk_local_option.dpatch b/web/attachments/265188-31_check_disk_local_option.dpatch
new file mode 100644
index 0000000..08bbabc
--- /dev/null
+++ b/web/attachments/265188-31_check_disk_local_option.dpatch
@@ -0,0 +1,17 @@
+## 31_check_disk_local_option.dpatch by Jan Wagner <waja@cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix local option for check_disk
+
+diff -Nur nagios-plugins-1.4.11/plugins/check_disk.c.orig nagios-plugins-1.4.11/plugins/check_disk.c
+--- nagios-plugins-1.4.11/plugins/check_disk.c.orig     2007-12-08 17:34:05.000000000 +0100
++++ nagios-plugins-1.4.11/plugins/check_disk.c  2008-02-05 22:13:43.397159697 +0100
+@@ -475,7 +475,7 @@
+     {"iwarning", required_argument, 0, 'W'},
+     /* Dang, -C is taken. We might want to reshuffle this. */
+     {"icritical", required_argument, 0, 'K'},
+-    {"local", required_argument, 0, 'l'},
++    {"local", no_argument, 0, 'l'},
+     {"stat-remote-fs", required_argument, 0, 'L'},
+     {"kilobytes", required_argument, 0, 'k'},
+     {"megabytes", required_argument, 0, 'm'},
diff --git a/web/attachments/265606-nagios-plugins-1.4.11-check_dig_fix-1.patch b/web/attachments/265606-nagios-plugins-1.4.11-check_dig_fix-1.patch
new file mode 100644
index 0000000..d1a3516
--- /dev/null
+++ b/web/attachments/265606-nagios-plugins-1.4.11-check_dig_fix-1.patch
@@ -0,0 +1,48 @@
+Date:           07 Feburary 2008
+Author:         Jethro Carr <jethro.carr@jethrocarr.com> working for Prophecy Networks NZ.
+Details:        Fixed check_dig plugin to make the dig command in the backend run for the specified time period.
+
+--- nagios-plugins-1.4.1/plugins/check_dig.c    2005-01-27 10:21:01.000000000 +1300
+--- nagios-plugins-1.4.11.orig/plugins/check_dig.c      2007-01-29 10:46:41.000000000 +1300
++++ nagios-plugins-1.4.11/plugins/check_dig.c   2008-02-07 10:59:46.000000000 +1300
+@@ -54,6 +54,8 @@
+ 
+ #define UNDEFINED 0
+ #define DEFAULT_PORT 53
++#define DEFAULT_TRIES 3
++#define DEFAULT_TIMEOUT 10
+ 
+ char *query_address = NULL;
+ char *record_type = "A";
+@@ -61,6 +63,7 @@
+ char *dns_server = NULL;
+ int verbose = FALSE;
+ int server_port = DEFAULT_PORT;
++int number_tries = DEFAULT_TRIES;
+ double warning_interval = UNDEFINED;
+ double critical_interval = UNDEFINED;
+ struct timeval tv;
+@@ -76,6 +79,7 @@
+   long microsec;
+   double elapsed_time;
+   int result = STATE_UNKNOWN;
++  timeout_interval = DEFAULT_TIMEOUT;
+ 
+   setlocale (LC_ALL, "");
+   bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -88,9 +92,13 @@
+   if (process_arguments (argc, argv) == ERROR)
+     usage_va(_("Could not parse arguments"));
+ 
++  /* dig applies the timeout to each try, so we need to work around this */
++  int timeout_interval_dig = ceil((double) timeout_interval / (double) number_tries);
++
+   /* get the command to run */
+-  asprintf (&command_line, "%s @%s -p %d %s -t %s",
+-            PATH_TO_DIG, dns_server, server_port, query_address, record_type);
++  asprintf (&command_line, "%s @%s -p %d %s -t %s +tries=%d +time=%d",
++            PATH_TO_DIG, dns_server, server_port, query_address, record_type, number_tries, timeout_interval_dig);
++
+ 
+   alarm (timeout_interval);
+   gettimeofday (&tv, NULL);
diff --git a/web/attachments/265656-nagios-plugins-1.4.11.patch b/web/attachments/265656-nagios-plugins-1.4.11.patch
new file mode 100644
index 0000000..e61c513
--- /dev/null
+++ b/web/attachments/265656-nagios-plugins-1.4.11.patch
@@ -0,0 +1,12 @@
+diff -ru ../../../src/nagios-plugins-1.4.11/plugins-root/check_dhcp.c ./plugins-root/check_dhcp.c
+--- ../../../src/nagios-plugins-1.4.11/plugins-root/check_dhcp.c        2007-10-25 15:43:04.000000000 -0500
++++ ./plugins-root/check_dhcp.c 2008-02-09 13:04:02.803830506 -0600
+@@ -82,7 +82,7 @@
+ #include <sys/sysctl.h>
+ #include <net/if_dl.h>
+ 
+-#elif defined(__sun__) || defined(__solaris__) || defined(__hpux__)
++#elif defined(__sun) ||  defined(__sun__) || defined(__solaris__) || defined(__hpux__)
+ 
+ #define INSAP 22 
+ #define OUTSAP 24 
diff --git a/web/attachments/265873-child_test.strace b/web/attachments/265873-child_test.strace
new file mode 100644
index 0000000..d3c2834
--- /dev/null
+++ b/web/attachments/265873-child_test.strace
@@ -0,0 +1,64 @@
+execve("./child_test", ["./child_test"], [/* 23 vars */]) = 0
+uname({sys="Linux", node="esvnagios.esv.chipkarte.at", ...}) = 0
+brk(0)                                  = 0x8163000
+access("/etc/ld.so.preload", R_OK)      = 0
+open("/etc/ld.so.preload", O_RDONLY)    = 3
+fstat64(3, {st_mode=S_IFREG|0444, st_size=17, ...}) = 0
+old_mmap(NULL, 17, PROT_READ|PROT_WRITE, MAP_PRIVATE, 3, 0) = 0xb7fe7000
+close(3)                                = 0
+open("/lib/libcwait.so", O_RDONLY)      = 3
+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0@\4\0\000"..., 512) = 512
+fstat64(3, {st_mode=S_IFREG|0755, st_size=2784, ...}) = 0
+old_mmap(NULL, 5764, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x815000
+old_mmap(0x816000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0) = 0x816000
+close(3)                                = 0
+munmap(0xb7fe7000, 17)                  = 0
+open("/etc/ld.so.cache", O_RDONLY)      = 3
+fstat64(3, {st_mode=S_IFREG|0644, st_size=76531, ...}) = 0
+old_mmap(NULL, 76531, PROT_READ, MAP_PRIVATE, 3, 0) = 0xb7fd5000
+close(3)                                = 0
+open("/usr/lib/libstdc++.so.6", O_RDONLY) = 3
+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\260\265"..., 512) = 512
+fstat64(3, {st_mode=S_IFREG|0755, st_size=796392, ...}) = 0
+old_mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7fd4000
+old_mmap(NULL, 818420, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x6ae000
+old_mmap(0x76c000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0xbe000) = 0x76c000
+old_mmap(0x771000, 19700, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x771000
+close(3)                                = 0
+open("/lib/tls/libm.so.6", O_RDONLY)    = 3
+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\0003\0"..., 512) = 512
+fstat64(3, {st_mode=S_IFREG|0755, st_size=176195, ...}) = 0
+old_mmap(NULL, 139424, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xcd6000
+old_mmap(0xcf7000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x20000) = 0xcf7000
+close(3)                                = 0
+open("/lib/libgcc_s.so.1", O_RDONLY)    = 3
+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\f\25\0"..., 512) = 512
+fstat64(3, {st_mode=S_IFREG|0755, st_size=29700, ...}) = 0
+old_mmap(NULL, 32512, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x605000
+old_mmap(0x60c000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x6000) = 0x60c000
+close(3)                                = 0
+open("/lib/tls/libc.so.6", O_RDONLY)    = 3
+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\20O\1\000"..., 512) = 512
+fstat64(3, {st_mode=S_IFREG|0755, st_size=1451450, ...}) = 0
+old_mmap(NULL, 1219772, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x34e000
+old_mmap(0x472000, 16384, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x124000) = 0x472000
+old_mmap(0x476000, 7356, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x476000
+close(3)                                = 0
+old_mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7fd3000
+mprotect(0x472000, 4096, PROT_READ)     = 0
+mprotect(0x33d000, 4096, PROT_READ)     = 0
+set_thread_area({entry_number:-1 -> 6, base_addr:0xb7fd38e0, limit:1048575, seg_32bit:1, contents:0, read_exec_only:0, limit_in_pages:1, seg_not_present:0, useable:1}) = 0
+munmap(0xb7fd5000, 76531)               = 0
+rt_sigaction(SIGCHLD, {0x80487c6, [CHLD], SA_RESTORER|SA_RESTART, 0x3758e8}, {SIG_DFL}, 8) = 0
+pipe([3, 4])                            = 0
+clone(child_stack=0, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0xb7fd3928) = 7085
+close(0)                                = 0
+dup(3)                                  = 0
+close(4)                                = 0
+fstat64(0, {st_mode=S_IFIFO|0600, st_size=0, ...}) = 0
+mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb7fe7000
+read(0, ";; connection timed out; no serv"..., 4096) = 54
+wait4(-1, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 7085
+--- SIGCHLD (Child exited) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+exit_group(0)                           = ?
diff --git a/web/attachments/266199-check_ping-ignore-duplicates.patch b/web/attachments/266199-check_ping-ignore-duplicates.patch
new file mode 100644
index 0000000..01cf036
--- /dev/null
+++ b/web/attachments/266199-check_ping-ignore-duplicates.patch
@@ -0,0 +1,111 @@
+Index: Projects/Nagiosplug/trunk/plugins/check_ping.c
+===================================================================
+--- Projects/Nagiosplug/trunk/plugins/check_ping.c      (revision 1932)
++++ Projects/Nagiosplug/trunk/plugins/check_ping.c      (working copy)
+@@ -67,6 +67,7 @@
+ int max_addr = 1;
+ int max_packets = -1;
+ int verbose = 0;
++int warn_on_duplicate = 1;
+ 
+ float rta = UNKNOWN_TRIP_TIME;
+ int pl = UNKNOWN_PACKET_LOSS;
+@@ -192,6 +193,7 @@
+                {"link", no_argument, 0, 'L'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
++               {"ignore-duplicates", no_argument, 0, "d"},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -206,7 +208,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "VvhnL46t:c:d:w:H:p:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -275,6 +277,9 @@
+                case 'w':
+                        get_threshold (optarg, &wrta, &wpl);
+                        break;
++               case 'd':
++                       warn_on_duplicate = 0;
++                       break;
+                }
+        }
+ 
+@@ -527,12 +532,14 @@
+                die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr);
+ 
+        if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
+-               if (warn_text == NULL)
+-                       warn_text = strdup (_(WARN_DUPLICATES));
+-               else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
+-                        asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
+-                       die (STATE_UNKNOWN, _("Unable to realloc warn_text"));
+-               return (STATE_WARNING);
++               if (warn_on_duplicate) {
++                       if (warn_text == NULL)
++                               warn_text = strdup (_(WARN_DUPLICATES));
++                       else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
++                                asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
++                               die (STATE_UNKNOWN, _("Unable to realloc warn_text"));
++                       return (STATE_WARNING);
++               }
+        }
+ 
+        return (STATE_OK);
+@@ -559,31 +566,33 @@
+        printf (_(UT_IPv46));
+ 
+        printf (" %s\n", "-H, --hostname=HOST");
+-  printf ("    %s\n", _("host to ping"));
+-  printf (" %s\n", "-w, --warning=THRESHOLD");
+-  printf ("    %s\n", _("warning threshold pair"));
+-  printf (" %s\n", "-c, --critical=THRESHOLD");
+-  printf ("    %s\n", _("critical threshold pair"));
+-  printf (" %s\n", "-p, --packets=INTEGER");
+-  printf ("    %s ", _("number of ICMP ECHO packets to send"));
+-  printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
+-  printf (" %s\n", "-L, --link");
+-  printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
++       printf ("    %s\n", _("host to ping"));
++       printf (" %s\n", "-w, --warning=THRESHOLD");
++       printf ("    %s\n", _("warning threshold pair"));
++       printf (" %s\n", "-c, --critical=THRESHOLD");
++       printf ("    %s\n", _("critical threshold pair"));
++       printf (" %s\n", "-p, --packets=INTEGER");
++       printf ("    %s ", _("number of ICMP ECHO packets to send"));
++       printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
++       printf (" %s\n", "-L, --link");
++       printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
++       printf (" %s\n", "-d, --ignore-duplicates");
++       printf ("    %s\n", _("don't warn on duplicate responses"));
+ 
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ 
+        printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
+-  printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));
+-  printf ("%s\n", _("percentage of packet loss to trigger an alarm state."));
++       printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));
++       printf ("%s\n", _("percentage of packet loss to trigger an alarm state."));
+ 
+-  printf ("\n\n");
++       printf ("\n\n");
+ 
+        printf ("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss"));
+-  printf ("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output"));
+-  printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
+-  printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
++       printf ("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output"));
++       printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
++       printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
+ 
+-  printf ("\n\n");
++       printf ("\n\n");
+ 
+        printf (_(UT_SUPPORT));
+ }
diff --git a/web/attachments/266362-check_ssh-clean-shutdown.patch b/web/attachments/266362-check_ssh-clean-shutdown.patch
new file mode 100644
index 0000000..c035101
--- /dev/null
+++ b/web/attachments/266362-check_ssh-clean-shutdown.patch
@@ -0,0 +1,12 @@
+*** check_ssh.c 2008-02-14 12:19:32.000000000 -0800
+--- check_cch.c 2007-11-09 05:08:43.000000000 -0800
+***************
+*** 260,266 ****
+                printf
+                        (_("SSH OK - %s (protocol %s)\n"),
+                         ssh_server, ssh_proto);
+-               shutdown(sd, SHUT_RDWR);
+                close(sd);
+                exit (STATE_OK);
+        }
+--- 260,265 ----
diff --git a/web/attachments/266460-check_http.head.patch b/web/attachments/266460-check_http.head.patch
new file mode 100644
index 0000000..0b6539c
--- /dev/null
+++ b/web/attachments/266460-check_http.head.patch
@@ -0,0 +1,30 @@
+95a96
+> int use_head = FALSE;
+179c208,209
+<     INVERT_REGEX = CHAR_MAX + 1
+---
+>     INVERT_REGEX = CHAR_MAX + 1,
+>     USE_HEAD = CHAR_MAX + 2
+209a240
+>     {"head", no_argument, 0, USE_HEAD},
+341a373,375
+>     case USE_HEAD:
+>       use_head = 1;
+>       break;
+455a490,497
+>   
+>   if (use_head == 1 ) 
+>      if ( strcmp(http_method, "POST") == 0) {
+>           usage4 (_("Using POST data and HEAD requests is not supported"));
+>      } else {
+>       no_body = TRUE;
+>       http_method = strdup("HEAD");
+>      }
+1292a1335,1337
+>   printf (" %s\n", "--head");
+>   printf ("    %s\n", _("make a HEAD request instead of GET"));
+>   printf ("    %s\n", _("this implies -N\n"));
+1341c1386
+<   printf ("       [-k string] [-S] [-C <age>] [-T <content-type>]\n");
+---
+>   printf ("       [-k string] [-S] [-C <age>] [-T <content-type>] [--head]\n");
diff --git a/web/attachments/266466-check_http.extented_status_codes.patch b/web/attachments/266466-check_http.extented_status_codes.patch
new file mode 100644
index 0000000..47ff717
--- /dev/null
+++ b/web/attachments/266466-check_http.extented_status_codes.patch
@@ -0,0 +1,46 @@
+169c170,198
+< 
+---
+>  
+> /* checks if status code statcode is in server reply reply */
+>  int
+>  check_statuscode (char * reply, char * statcode)
+>   {
+>         int status = 0;
+>         char scode[4] = "201";
+>         int ipos = 0;
+>         char *kpos = strchr(statcode, ',');
+>  
+>         while (kpos)
+>         {
+>                 memcpy(scode, &statcode[ipos], 3);
+>                 ipos += 4;
+>                 kpos = strchr(&statcode[ipos], ',');
+>  
+>                 if (strstr(reply, scode))
+>                 {
+>                         status = 1;
+>                 }
+>         }
+>  
+>         memcpy(scode, &statcode[ipos], 3);
+>         if (strstr(reply, scode))
+>         {
+>                 status = 1;
+>         }
+>         return status;
+> }
+871c913
+<   if (!strstr (status_line, server_expect)) {
+---
+>   if (!check_statuscode(status_line, server_expect)) {
+874c916
+<                 _("Invalid HTTP response received from host\n"));
+---
+>                 _("Invalid HTTP response received from host \"%s\"\n"), status_line);
+877,878c919,920
+<                 _("Invalid HTTP response received from host on port %d\n"),
+<                 server_port);
+---
+>                 _("Invalid HTTP response received from host on port %d \"%s\"\n"),
+>                 server_port, status_line);
diff --git a/web/attachments/26654-snmpv3.dif b/web/attachments/26654-snmpv3.dif
new file mode 100644
index 0000000..d4d9ecb
--- /dev/null
+++ b/web/attachments/26654-snmpv3.dif
@@ -0,0 +1,167 @@
+--- plugins/check_snmp.c.orig   Thu Feb 28 07:42:59 2002
++++ plugins/check_snmp.c        Tue Jul  9 11:48:10 2002
+@@ -97,6 +97,12 @@
+ char oid[MAX_INPUT_BUFFER] = "";
+ char *label = NULL;
+ char *units = NULL;
++char *secname = NULL;
++char *seclevel = NULL;
++char *authproto = NULL;
++char *authpasswd = NULL;
++char *privpasswd = NULL;
++int  proto = 1;
+ char string_value[MAX_INPUT_BUFFER] = "";
+ char **labels = NULL;
+ char **unitv = NULL;
+@@ -143,10 +149,35 @@
+                usage ("Incorrect arguments supplied\n");
+ 
+        /* create the command line to execute */
+-       command_line = ssprintf
++       if (proto == 3) {
++           if ( strcmp(seclevel, "noAuthNoPriv") == 0 ) {
++               command_line = ssprintf
++                             (command_line,
++                              "%s -m ALL -v 3 -l noAuthNoPriv  %s %s",
++                               PATH_TO_SNMPGET, server_address, oid);
++           }
++           if ( strcmp(seclevel, "authNoPriv") == 0 ) {
++               command_line = ssprintf
++                             (command_line,
++                              "%s -m ALL -v 3 -l authNoPriv -a %s -u %s -A %s %s %s",
++                              PATH_TO_SNMPGET, authproto, secname, authpasswd, 
++                              server_address, oid);
++           }
++           if ( strcmp(seclevel, "authPriv") == 0 ) {
++               command_line = ssprintf
++                             (command_line,
++                              "%s -m ALL -v 3 -l authPriv -a %s -u %s -A %s -X %s %s %s",
++                              PATH_TO_SNMPGET, authproto, secname, authpasswd, 
++                              privpasswd, server_address, oid);
++           }
++       } else {
++           command_line = ssprintf
+                (command_line,
+                 "%s -m ALL -v 1 %s %s %s",
+                 PATH_TO_SNMPGET, server_address, community, oid);
++       }
++
++       
+ 
+        /* run the command */
+        child_process = spopen (command_line);
+@@ -285,7 +316,7 @@
+        if (found == 0)
+                terminate
+                        (STATE_UNKNOWN,
+-                        "%s problem - No data recieved from host\nCMD: %s\n",
++                        "%s problem - No data received from host\nCMD: %s\n",
+                         label, command_line);
+ 
+        /* WARNING if output found on stderr */
+@@ -348,6 +379,13 @@
+        if (units == NULL)
+                units = strscpy (NULL, "");
+ 
++       if (seclevel == NULL || ( strcmp(seclevel, "authNoPriv") && 
++                                 strcmp(seclevel, "authPriv") ) ) 
++               seclevel = strscpy (NULL, "noAuthNoPriv");
++
++       if (authproto == NULL)
++               authproto = strscpy (NULL, "MD5");
++       
+        return c;
+ }
+ 
+@@ -378,6 +416,12 @@
+                {"eregi", required_argument, 0, 'R'},
+                {"label", required_argument, 0, 'l'},
+                {"units", required_argument, 0, 'u'},
++               {"protocol", required_argument,0, 'p'},
++               {"seclevel", required_argument,0, 'L'},
++               {"authproto", required_argument,0, 'a'},
++               {"authpasswd",  required_argument,0, 'A'},
++               {"privpasswd", required_argument,0, 'X'},
++               {"secname", required_argument, 0, 'U'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -385,10 +429,10 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:",
++                       getopt_long (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:p:L:a:A:X:U:",
+                                                                         long_options, &option_index);
+ #else
+-               c = getopt (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:");
++               c = getopt (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:p:L:a:A:X:U:");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -409,6 +453,12 @@
+                case 'r':
+                case 'l':
+                case 'u':
++               case 'p':
++               case 'L':
++               case 'a':
++               case 'A':
++               case 'X':
++               case 'U':
+                        i++;
+                }
+ 
+@@ -568,6 +618,24 @@
+                                        unitv[nunits - 1] = ptr;
+                        }
+                        break;
++               case 'p':
++                       proto = atoi(optarg);
++                       break;
++               case 'L':
++                       seclevel = strscpy (seclevel, optarg);
++                       break;
++               case 'a':
++                       authproto = strscpy (authproto, optarg);
++                       break;  
++               case 'A':
++                       authpasswd = strscpy (authpasswd, optarg);
++                       break;
++               case 'X':
++                       privpasswd = strscpy (privpasswd, optarg);
++                       break;
++               case 'U':
++                       secname = strscpy (secname, optarg);
++                       break;
+                }
+        }
+        return i;
+@@ -580,6 +648,8 @@
+                ("Usage: check_snmp -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n"
+                 "                  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n"
+                 "                  [-l label] [-u units] [-d delimiter] [-D output-delimiter]\n"
++                "                  [-p protocol] [-L seclevel] [-a authproto] [-A authpasswd]\n"
++                "                  [-X privpasswd] [-U secname]\n"
+                 "       check_snmp --help\n" "       check_snmp --version\n");
+ }
+ 
+@@ -597,6 +667,18 @@
+                 "    Print version information\n"
+                 " -H, --hostname=HOST\n"
+                 "    Name or IP address of the device you wish to query\n"
++                " -p, --protocol=[1|3]\n"
++                "    SNMP protocol version\n"
++                " -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n"
++                "    SNMPv3 securityLevel\n"
++                " -U, --secname=USERNAME\n"
++                "    SNMPv3 username\n"
++                " -a, --authproto=[MD5|SHA]\n"
++                "    SNMPv3 authproto\n"
++                " -A, --authpasswd=PASSWORD\n"
++                "    SNMPv3 authentication password\n"
++                " -X, --privpasswd=PASSWORD\n"
++                "    SNMPv3 crypt password (DES)\n"
+                 " -o, --oid=OID(s)\n"
+                 "    Object identifier(s) whose value you wish to query\n"
+                 " -w, --warning=INTEGER_RANGE(s)\n"
diff --git a/web/attachments/266554-ping-sscanf.diff b/web/attachments/266554-ping-sscanf.diff
new file mode 100644
index 0000000..dd16d4b
--- /dev/null
+++ b/web/attachments/266554-ping-sscanf.diff
@@ -0,0 +1,57 @@
+--- plugins/check_ping.c~
++++ plugins/check_ping.c
+@@ -424,6 +424,7 @@
+ {
+        char buf[MAX_INPUT_BUFFER];
+        int result = STATE_UNKNOWN;
++       int match;
+ 
+        if ((child_process = spopen (cmd)) == NULL)
+                die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+@@ -440,28 +441,29 @@
+                result = max_state (result, error_scan (buf, addr));
+ 
+                /* get the percent loss statistics */
+-               if(sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss",&pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss", &pl) == 1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss", &pl) == 1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss",&pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time",&pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time", &pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time", &pl)==1 ||
+-                        sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss", &pl) == 1 ||
+-                        sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss", &pl) == 1
++               match = 0;
++               if((sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
++                        (sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match)
+                         )
+                        continue;
+ 
+                /* get the round trip average */
+                else
+-                       if(sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f",&rta)==1 ||
+-                                sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f",&rta)==1 ||
+-                                sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms",&rta)==1)
++                       if((sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
++                                (sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n",&rta,&match) && match))
+                        continue;
+        }
+ 
diff --git a/web/attachments/267584-nagios-plugins-1.4.8-checksshproto.patch b/web/attachments/267584-nagios-plugins-1.4.8-checksshproto.patch
new file mode 100644
index 0000000..6ae62c5
--- /dev/null
+++ b/web/attachments/267584-nagios-plugins-1.4.8-checksshproto.patch
@@ -0,0 +1,88 @@
+--- nagios-plugins-1.4.8/plugins/check_ssh.c.orig       2008-01-07 16:18:34.000000000 -0800
++++ nagios-plugins-1.4.8/plugins/check_ssh.c    2008-02-22 10:23:37.000000000 -0800
+@@ -54,6 +54,7 @@
+ int port = -1;
+ char *server_name = NULL;
+ char *remote_version = NULL;
++char *remote_protocol = NULL;
+ int verbose = FALSE;
+ 
+ int process_arguments (int, char **);
+@@ -61,7 +62,7 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-int ssh_connect (char *haddr, int hport, char *remote_version);
++int ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol);
+ 
+ 
+ 
+@@ -83,7 +84,7 @@
+        alarm (socket_timeout);
+ 
+        /* ssh_connect exits if error is found */
+-       result = ssh_connect (server_name, port, remote_version);
++       result = ssh_connect (server_name, port, remote_version, remote_protocol);
+ 
+        alarm (0);
+ 
+@@ -110,6 +111,7 @@
+                {"timeout", required_argument, 0, 't'},
+                {"verbose", no_argument, 0, 'v'},
+                {"remote-version", required_argument, 0, 'r'},
++               {"remote-protcol", required_argument, 0, 'P'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -121,7 +123,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+Vhv46t:r:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "+Vhv46t:r:H:p:P:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -157,6 +159,9 @@
+                case 'r':                                                                       /* remote version */
+                        remote_version = optarg;
+                        break;
++               case 'P':                                                                       /* remote version */
++                       remote_protocol = optarg;
++                       break;
+                case 'H':                                                                       /* host */
+                        if (is_host (optarg) == FALSE)
+                                usage2 (_("Invalid hostname/address"), optarg);
+@@ -211,7 +216,7 @@
+ 
+ 
+ int
+-ssh_connect (char *haddr, int hport, char *remote_version)
++ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol)
+ {
+        int sd;
+        int result;
+@@ -254,6 +259,13 @@
+                                 ssh_server, ssh_proto, remote_version);
+                        exit (STATE_WARNING);
+                }
++
++               if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
++                       printf
++                               (_("SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n"),
++                                ssh_server, ssh_proto, remote_protocol);
++                       exit (STATE_WARNING);
++               }
+                
+                printf
+                        (_("SSH OK - %s (protocol %s)\n"),
+@@ -293,6 +305,9 @@
+        printf (" %s\n", "-r, --remote-version=STRING");
+   printf ("    %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
+        
++       printf (" %s\n", "-P, --remote-protocol=STRING");
++  printf ("    %s\n", _("Warn if protocol doesn't match expected protocol version (ex: 2.0)"));
++       
+        printf (_(UT_VERBOSE));
+ 
+        printf (_(UT_SUPPORT));
diff --git a/web/attachments/267864-patch.check_mysql.c b/web/attachments/267864-patch.check_mysql.c
new file mode 100644
index 0000000..59ef214
--- /dev/null
+++ b/web/attachments/267864-patch.check_mysql.c
@@ -0,0 +1,29 @@
+54a55
+> char *defaults_file = NULL;
+89a91,94
+>     if (defaults_file != NULL) {
+>         mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,defaults_file);
+>     }
+> 
+249a255
+>               {"defaults-file", required_argument, 0, 'f'},
+263c269
+<               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:c:w:", longopts, &option);
+---
+>               c = getopt_long (argc, argv, "hvVSP:p:u:d:f:H:c:w:", longopts, &option);
+288a295,297
+>               case 'f':
+>                       defaults_file = optarg;
+>                       break;
+332a342,343
+>               else if (defaults_file == NULL)
+>                       defaults_file = argv[c++];
+355a367
+> 
+387a400,401
+>   printf (" %s\n", "-f, --defaults-file=FILE");
+>   printf ("    %s\n", _("Read mysql options from FILE"));
+405c419
+<   printf ("%s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",progname);
+---
+>   printf ("%s [-d database] [-H host] [-P port] [-u user] [-p password] [-f defaultsfile] [-S]\n",progname);
diff --git a/web/attachments/268243-patch.check_ping.c b/web/attachments/268243-patch.check_ping.c
new file mode 100644
index 0000000..a9dff19
--- /dev/null
+++ b/web/attachments/268243-patch.check_ping.c
@@ -0,0 +1,35 @@
+88a89,90
+>       char *perf;
+>       char *perf1;
+161,162c163,171
+<                       printf (_("PING %s - %sPacket loss = %d%%"), state_text (this_result), warn_text,
+<                                                       pl);
+---
+>               {
+>                       asprintf(&perf, "%s", perfdata("packet_loss", pl, "%",
+>                       TRUE, wpl,
+>                       TRUE, cpl,
+>                       TRUE, 0,
+>                       FALSE, 0));
+>                       printf (_("PING %s - %sPacket loss = %d%% |%s\n"), state_text (this_result), warn_text,
+>                                                       pl, perf);
+>               }
+164,165c173,186
+<                       printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"),
+<                                                       state_text (this_result), warn_text, pl, rta);
+---
+>               {
+>                       asprintf(&perf, "%s", perfdata("packet_loss", pl, "%",
+>                         TRUE, wpl,
+>                         TRUE, cpl,
+>                         TRUE, 0,
+>                         FALSE, 0));
+>                       asprintf(&perf1, "%s", perfdata("RTA", rta, "ms",
+>                       TRUE, wrta,
+>                       TRUE, crta,
+>                       TRUE, 0,
+>                       FALSE, 0));
+>                       printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms | %s %s\n"),
+>                                                       state_text (this_result), warn_text, pl, rta, perf1, perf);
+>               }
+
diff --git a/web/attachments/268504-patch.diff b/web/attachments/268504-patch.diff
new file mode 100644
index 0000000..83cc70a
--- /dev/null
+++ b/web/attachments/268504-patch.diff
@@ -0,0 +1,28 @@
+555c555

+<               asprintf (&send_buffer,"NRMH:Server_Health_Status\r\n");

+---

+>               asprintf (&send_buffer,"NRMH\r\n");

+563c563

+<                       result=STATE_CRITICAL;

+---

+>                       result=STATE_OK;

+566c566,567

+<               else if (nrm_health_status==1) {

+---

+>               else {

+>                       if (nrm_health_status==1) {

+569,571c570,571

+<               }

+<               else    {

+<                       result=STATE_OK;

+---

+>                       }

+> 

+573c573

+<               }

+---

+>               }

+1679c1679

+<   printf (" %s\n", _("  TCB, LRUS and LRUM.\n"));

+---

+>   printf (" %S\n", _("  TCB, LRUS and LRUM.\n"));

diff --git a/web/attachments/268575-patch.check_mysql.c b/web/attachments/268575-patch.check_mysql.c
new file mode 100644
index 0000000..cbcc110
--- /dev/null
+++ b/web/attachments/268575-patch.check_mysql.c
@@ -0,0 +1,289 @@
+68,87d67
+< int strIndexOf(char *string1, char *string2);
+< char *strSubstring(char *string1, char *string2, int StartingPos, int EndPos);
+< char *GetThreadsPerfdata(char *stringtoparse);
+< char *GetQuestionsPerfdata(char *stringtoparse);
+< char *GetSQPerfdata(char *stringtoparse);
+< char *GetOpensPerfdata(char *stringtoparse);
+< char *GetFTPerfdata(char *stringtoparse);
+< char *GetOTPerfdata(char *stringtoparse);
+< char *GetQPSAPerfdata(char *stringtoparse);
+< 
+< struct mysql_statistics
+< {
+<       char *ThreadsPerfdata;
+<       char *QuestionsPerfdata;
+<       char *SQPerfdata;
+<       char *OpensPerfdata;
+<       char *FTPerfdata;
+<       char *OTPerfdata;
+<       char *QPSAPerfdata;
+< };
+102,105d81
+< 
+<       /* variables needed to parse */
+<       char *StringToParse;
+<       struct mysql_statistics Stats;
+138,154d113
+<       /* parse the server stats */
+<       strcpy(StringToParse, result);
+< 
+<       Stats.ThreadsPerfdata = GetThreadsPerfdata(StringToParse);
+<       strcpy(StringToParse, result);
+<       Stats.QuestionsPerfdata = GetQuestionsPerfdata(StringToParse);
+<       strcpy(StringToParse, result);
+<       Stats.SQPerfdata = GetSQPerfdata(StringToParse);
+<       strcpy(StringToParse, result);
+<       Stats.OpensPerfdata = GetOpensPerfdata(StringToParse);
+<       strcpy(StringToParse, result);
+<       Stats.FTPerfdata = GetFTPerfdata(StringToParse);
+<       strcpy(StringToParse, result);
+<       Stats.OTPerfdata = GetOTPerfdata(StringToParse);
+<       strcpy(StringToParse, result);
+<       Stats.QPSAPerfdata = GetQPSAPerfdata(StringToParse);
+< 
+270c229
+<               printf ("%s %s | %s %s %s %s %s %s %s\n", result, slaveresult, Stats.ThreadsPerfdata, Stats.SQPerfdata, Stats.OpensPerfdata, Stats.FTPerfdata, Stats.OTPerfdata, Stats.QPSAPerfdata);
+---
+>               printf ("%s %s\n", result, slaveresult);
+272c231
+<               printf ("%s | %s %s %s %s %s %s %s\n", result, Stats.ThreadsPerfdata, Stats.QuestionsPerfdata, Stats.SQPerfdata, Stats.OpensPerfdata, Stats.FTPerfdata, Stats.OTPerfdata, Stats.QPSAPerfdata);
+---
+>               printf ("%s\n", result);
+278,512d236
+< char
+< *GetQPSAPerfdata(char *stringtoparse)
+< {
+<         int Start = 0;
+<         int End = 0;
+<         char *qpsa;
+<         char *output;
+<         Start = strIndexOf("Queries per second avg\0", stringtoparse);
+<       End = strlen(stringtoparse);
+< 
+<         qpsa = strSubstring(qpsa, stringtoparse, Start, End);
+<         qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
+<         qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
+<       qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
+<       qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
+<       printf("%s", qpsa);
+<         asprintf(&output, "%s", fperfdata("queries_per_second_avg", atof(qpsa), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+< 
+<         return output;
+< }
+< 
+< char
+< *GetOTPerfdata(char *stringtoparse)
+< {
+<         int Start = 0;
+<         int End = 0;
+<         char *ot;
+<         char *output;
+<         Start = strIndexOf("Open tables\0", stringtoparse);
+<         End = strIndexOf("Queries per second avg\0", stringtoparse);
+< 
+<         ot = strSubstring(ot, stringtoparse, Start, End - 2);
+<         ot = strSubstring(ot, ot, strIndexOf(" \0", ot) + 1, strlen(ot));
+<       ot = strSubstring(ot, ot, strIndexOf(" \0", ot) + 1, strlen(ot));
+<         asprintf(&output, "%s", perfdata("open_tables", atoi(ot), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+< 
+<         return output;
+< }
+< 
+< char
+< *GetFTPerfdata(char *stringtoparse)
+< {
+<       int Start = 0;
+<         int End = 0;
+<         char *ft;
+<         char *output;
+<         Start = strIndexOf("Flush tables\0", stringtoparse);
+<         End = strIndexOf("Open tables\0", stringtoparse);
+< 
+<         ft = strSubstring(ft, stringtoparse, Start, End - 2);
+<         ft = strSubstring(ft, ft, strIndexOf(" \0", ft) + 1, strlen(ft));
+<       ft = strSubstring(ft, ft, strIndexOf(" \0", ft) + 1, strlen(ft));
+<         asprintf(&output, "%s", perfdata("flush_tables", atoi(ft), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+< 
+<         return output;
+< }
+< 
+< char
+< *GetOpensPerfdata(char *stringtoparse)
+< {
+<         int Start = 0;
+<         int End = 0;
+<         char *opens;
+<         char *output;
+<         Start = strIndexOf("Opens\0", stringtoparse);
+<         End = strIndexOf("Flush tables\0", stringtoparse);
+< 
+<         opens = strSubstring(opens, stringtoparse, Start, End - 2);
+<         opens = strSubstring(opens, opens, strIndexOf(" \0", opens) + 1, strlen(opens));
+<         asprintf(&output, "%s", perfdata("opens", atoi(opens), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+< 
+<         return output;
+< }
+< 
+< char
+< *GetSQPerfdata(char *stringtoparse)
+< {
+<         int Start = 0;
+<         int End = 0;
+<         char *slowqueries;
+<         char *output;
+<         Start = strIndexOf("Slow queries\0", stringtoparse);
+<         End = strIndexOf("Opens\0", stringtoparse);
+< 
+<         slowqueries = strSubstring(slowqueries, stringtoparse, Start, End - 2);
+<         slowqueries = strSubstring(slowqueries, slowqueries, strIndexOf(" \0", slowqueries) + 1, strlen(slowqueries));
+<       slowqueries = strSubstring(slowqueries, slowqueries, strIndexOf(" \0", slowqueries) + 1, strlen(slowqueries));
+<         asprintf(&output, "%s", perfdata("slow_queries", atoi(slowqueries), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+< 
+<         return output;
+< }
+< 
+< char
+< *GetQuestionsPerfdata(char *stringtoparse)
+< {
+<       int Start = 0;
+<         int End = 0;
+<         char *questions;
+<         char *output;
+<         Start = strIndexOf("Questions\0", stringtoparse);
+<         End = strIndexOf("Slow queries\0", stringtoparse);
+< 
+<         questions = strSubstring(questions, stringtoparse, Start, End - 2);
+<         questions = strSubstring(questions, questions, strIndexOf(" \0", questions) + 1, strlen(questions));
+<         asprintf(&output, "%s", perfdata("questions", atoi(questions), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+< 
+<         return output;
+< }
+< 
+< char
+< *GetThreadsPerfdata(char *stringtoparse)
+< {
+<       int Start = 0;
+<       int End = 0;
+<       char *threads;
+<       char *output;
+< 
+<       Start = strIndexOf("Threads\0", stringtoparse);
+<         End = strIndexOf("Questions\0", stringtoparse);
+< 
+<         threads = strSubstring(threads, stringtoparse, Start, End - 2);
+<         threads = strSubstring(threads, threads, strIndexOf(" \0", threads) + 1, strlen(threads));
+<         asprintf(&output, "%s", perfdata("threads", atoi(threads), "",
+<         FALSE, 0,
+<         FALSE, 0,
+<         TRUE, 0,
+<         FALSE, 0));
+<         
+<       return output;
+< }
+< 
+< /* takes the substring from string1 between startingpos and the startingpos plus the length,
+< all is returned */
+< char
+< *strSubstring(char *string1, char *string2, int StartingPos, int EndPos)
+< {
+<       /* current position in string2 */
+<         int CurPos = 0;
+<       /* current position in string1 */
+<       int String1Pos = 0;
+<       char *NULLChar = "\0";
+< 
+<       for (CurPos = StartingPos; CurPos < EndPos; CurPos++)
+<       {
+<               string1[String1Pos] = string2[CurPos];
+<               String1Pos++;
+<       }
+< 
+<       string1[String1Pos] = *NULLChar;
+< 
+<       return string1;
+< }
+< 
+< /* gets the starting position of string1 in string2,
+< if string1 is not contained in string2 then the function returns -1 */
+< int
+< strIndexOf (char *string1, char *string2)
+< {
+<       /* current position in string2 */
+<       int CurPos = 0;
+<       /* the amount of matches found after the startingposition was found */
+<       int CharsFound = 0;
+<       /* the starting position of string1 in string2 */
+<       int StartingPos = -1;
+<       /* length of string1 */
+<       int Length1 = strlen(string1);
+<       /* Length of string2 */
+<       int Length2 = strlen(string2);
+<       /* the maximum length of the search */
+<       int MaxLength = 0;
+< 
+<       /* check if string2 is longer the string1, if not tell the program that something went wrong */
+<       if (Length2 < Length1)
+<       {
+<               return -2;
+<       }
+< 
+<       /* calculate the max length of the search */
+<       MaxLength = Length2;
+< 
+<       for (CurPos = 0; CurPos != MaxLength; CurPos++)
+<       {
+<               if (CharsFound == Length1)
+<               {
+<                       return StartingPos;
+<               }
+< 
+<               if (StartingPos == -1)
+<               {
+<                       if (string2[CurPos] == string1[CharsFound])
+<                       {
+<                               StartingPos = CurPos;
+<                               CharsFound++;
+<                       }
+<               }
+<               else
+<               {
+<                       if (string2[CurPos] == string1[CharsFound])
+<                       {
+<                               CharsFound++;
+<                       }
+<                       else
+<                       {
+<                               CharsFound = 0;
+<                                 StartingPos = -1;
+<                       }
+<               }
+<       }
+< 
+<       return -1;
+< }
+
diff --git a/web/attachments/268583-check_apache.pl.diff b/web/attachments/268583-check_apache.pl.diff
new file mode 100644
index 0000000..f90513b
--- /dev/null
+++ b/web/attachments/268583-check_apache.pl.diff
@@ -0,0 +1,10 @@
+156,157c156,157
+<         if (/^BusyServers:\s+([0-9.]+)\s+/) { $busy = $1; next; }
+<         if (/^IdleServers:\s+([0-9.]+)\s+/) { $idle = $1; next; }
+---
+>         if (/^BusyWorkers:\s+([0-9.]+)\s+/) { $busy = $1; next; }
+>         if (/^IdleWorkers:\s+([0-9.]+)\s+/) { $idle = $1; next; }
+219c219
+<      if($average>0) {
+---
+>      if($average>=0) {
diff --git a/web/attachments/268643-check_apt.c.patch b/web/attachments/268643-check_apt.c.patch
new file mode 100644
index 0000000..e5893dc
--- /dev/null
+++ b/web/attachments/268643-check_apt.c.patch
@@ -0,0 +1,27 @@
+--- plugins/check_apt.c 2008-02-29 13:00:36.000000000 -0800
++++ plugins/check_apt.new.c     2008-02-29 13:00:07.000000000 -0800
+@@ -57,7 +57,7 @@
+ # define PATH_TO_APTGET "/usr/bin/apt-get"
+ #endif /* PATH_TO_APTGET */
+ /* 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 **);
+@@ -354,13 +354,13 @@
+        if(expr==NULL){
+                re=malloc(sizeof(char)*(strlen("^Inst () ")+strlen(next)+1));
+                if(!re) die(STATE_UNKNOWN, "malloc failed!\n");
+-               sprintf(re, "^Inst (%s) ", next);
++               sprintf(re, "^Inst (%s)", next);
+        } else {
+                /* resize it, adding an extra char for the new '|' separator */
+                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)-2), "|%s)", next);
+        }
+ 
+        return re;      
diff --git a/web/attachments/26866-check_disk.noerr-exclude.patch b/web/attachments/26866-check_disk.noerr-exclude.patch
new file mode 100644
index 0000000..4f12559
--- /dev/null
+++ b/web/attachments/26866-check_disk.noerr-exclude.patch
@@ -0,0 +1,130 @@
+10c10
+<  * $Id: check_disk.c,v 1.3 2002/06/19 03:09:10 sghosh Exp $
+---
+>  * $Id: check_disk.c,v 1.2 2002/06/06 04:15:49 sghosh Exp $
+53d52
+< char *exclude_device = NULL;
+56d54
+< int display_errors_only = FALSE;
+67d64
+<       int temp_result = STATE_UNKNOWN;
+105,156c102,106
+<                       /* cannot use max now that STATE_UNKNOWN is greater than STATE_CRITICAL
+<                       result = max (result, check_disk (usp, free_disk)); */
+<                       temp_result = check_disk (usp, free_disk) ;
+< 
+<                       if (exclude_device && !strcmp(exclude_device,file_system)) {
+<                               if (verbose)
+<                                       printf ("ignoring %s.", file_system);
+<                               temp_result = STATE_OK;
+<                       }       
+< 
+<                       if ( temp_result == STATE_CRITICAL ) {
+<                               result = STATE_CRITICAL;
+<                       }
+<                       else if (temp_result == STATE_WARNING) {
+<                               if ( !( result == STATE_CRITICAL) ) {
+<                                       result = STATE_WARNING;
+<                               }
+<                       }
+<                       else if (temp_result == STATE_OK) {
+<                               if ( ! ( result == STATE_CRITICAL || result == STATE_WARNING) ){
+<                               result = STATE_OK;
+<                               }
+<                       }
+<                       else if (temp_result == STATE_UNKNOWN) {
+<                               if ( ! ( result == STATE_CRITICAL || result == STATE_WARNING || result == STATE_OK) ){
+<                                       result = STATE_UNKNOWN;
+<                               }
+<                       }
+<                       else {
+<                               /* don't have a match with the return value from check_disk() */
+<                               result = STATE_UNKNOWN;
+<                       }
+< 
+<                       
+<       if (display_errors_only) {
+<         if (temp_result != STATE_OK) {
+<           len = 
+<                                               snprintf (outbuf, MAX_INPUT_BUFFER - 1,
+<                    " [%d kB (%d%%) free on %s]", free_disk, 100 - usp,
+<                           display_mntp ? mntp : file_system);
+<         }
+<                               else {
+<                                       len = 0;
+<                               }
+<       }
+<       else {
+<         len =
+<           snprintf (outbuf, MAX_INPUT_BUFFER - 1,
+<                     " [%d kB (%d%%) free on %s]", free_disk, 100 - usp,
+<                     display_mntp ? mntp : file_system);
+<       }
+< 
+---
+>                       result = max (result, check_disk (usp, free_disk));
+>                       len =
+>                               snprintf (outbuf, MAX_INPUT_BUFFER - 1,
+>                                                                       " [%d kB (%d%%) free on %s]", free_disk, 100 - usp,
+>                                                                       display_mntp ? mntp : file_system);
+161,162c111,112
+<                               printf ("Unable to read output:\n%s\n%s\n", command_line, input_buffer);
+<                               return result;
+---
+>                       printf ("Unable to read output:\n%s\n%s\n", command_line, input_buffer);
+>                       return result;
+168,171c118
+<               /*result = max (result, STATE_WARNING); */
+<               if( !( result == STATE_CRITICAL) ) {
+<                       result = STATE_WARNING;
+<               }
+---
+>               result = max (result, STATE_WARNING);
+178,181c125,126
+<               /*result = max (result, STATE_WARNING); */
+<               if( !( result == STATE_CRITICAL) ) {
+<                       result = STATE_WARNING;
+<               }
+---
+>               result = max (result, STATE_WARNING);
+> 
+241d185
+<               {"exclude_device", required_argument, 0, 'x'},
+246d189
+<               {"errors-only", no_argument, 0, 'e'},
+254c197
+<                       getopt_long (argc, argv, "+?Vehvt:c:w:p:x:m", long_options, &option_index);
+---
+>                       getopt_long (argc, argv, "+?Vhvt:c:w:p:m", long_options, &option_index);
+256c199
+<               c = getopt (argc, argv, "+?Vehvt:c:w:p:x:m");
+---
+>               c = getopt (argc, argv, "+?Vhvt:c:w:p:m");
+269d211
+<               case 'x':
+317,319d258
+<               case 'x':                                                                       /* exclude path or partition */
+<                       exclude_device = optarg;
+<                       break;
+326,328d264
+<               case 'e': /* only display paths with error conditions */
+<                       display_errors_only = TRUE;
+<                       break;
+330c266
+<                       print_revision (my_basename (argv[0]), "$Revision: 1.3 $");
+---
+>                       print_revision (my_basename (argv[0]), "$Revision: 1.2 $");
+390c326
+<       print_revision (PROGNAME, "$Revision: 1.3 $");
+---
+>       print_revision (PROGNAME, "$Revision: 1.2 $");
+409,410d344
+<                " -x, --exclude_device=PATH\n"
+<                "    Ignore device (only works if -p unspecified)\n"
+413,414d346
+<                " -e, --errors-only\n"
+<                "    Display only devices/mountpoints with errors\n"
+427c359
+<               ("Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e] [--verbose]\n"
+---
+>               ("Usage: %s -w limit -c limit [-p path] [-t timeout] [-m] [--verbose]\n"
diff --git a/web/attachments/271136-check_dig-help-info-fix.diff b/web/attachments/271136-check_dig-help-info-fix.diff
new file mode 100644
index 0000000..b646d76
--- /dev/null
+++ b/web/attachments/271136-check_dig-help-info-fix.diff
@@ -0,0 +1,11 @@
+--- nagios-plugins-trunk-200803200100/plugins/check_dig.c.orig  2008-03-20 07:34:20.000000000 +0200
++++ nagios-plugins-trunk-200803200100/plugins/check_dig.c       2008-03-20 07:35:23.000000000 +0200
+@@ -319,7 +319,7 @@
+ 
+   printf (_(UT_HOST_PORT), 'p', myport);
+ 
+-  printf (" %s\n","-l, --lookup=STRING");
++  printf (" %s\n","-l, --query_address=STRING");
+   printf ("    %s\n",_("machine name to lookup"));
+   printf (" %s\n","-T, --record_type=STRING");
+   printf ("    %s\n",_("record type to lookup (default: A)"));
diff --git a/web/attachments/272335-patch-plugins__check_procs.c b/web/attachments/272335-patch-plugins__check_procs.c
new file mode 100644
index 0000000..1d187ca
--- /dev/null
+++ b/web/attachments/272335-patch-plugins__check_procs.c
@@ -0,0 +1,13 @@
+--- plugins/check_procs.c.orig  2007-07-15 11:21:51.000000000 -0400
++++ plugins/check_procs.c       2008-03-28 21:56:51.000000000 -0400
+@@ -208,6 +208,10 @@
+                        /* Ignore self */
+                        if (mypid == procpid) continue;
+ 
++                       if (metric == METRIC_CPU)
++                          if (procppid == 0 && procpid != 1)
++                             continue;
++
+                        if ((options & STAT) && (strstr (statopts, procstat)))
+                                resultsum |= STAT;
+                        if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL))
diff --git a/web/attachments/27256-cpu_mem.tgz b/web/attachments/27256-cpu_mem.tgz
new file mode 100644
index 0000000..2fc1856
--- /dev/null
+++ b/web/attachments/27256-cpu_mem.tgz
diff --git a/web/attachments/273929-nagiosplug-sni-trunk.patch b/web/attachments/273929-nagiosplug-sni-trunk.patch
new file mode 100644
index 0000000..c6d2c3e
--- /dev/null
+++ b/web/attachments/273929-nagiosplug-sni-trunk.patch
@@ -0,0 +1,85 @@
+Index: plugins/netutils.h
+===================================================================
+--- plugins/netutils.h  (revision 1977)
++++ plugins/netutils.h  (working copy)
+@@ -99,6 +99,7 @@
+ int np_net_ssl_write(const void *buf, int num);
+ int np_net_ssl_read(void *buf, int num);
+ int np_net_ssl_check_cert(int days_till_exp);
++void np_net_ssl_set_host_name(const char *buf);
+ #endif /* HAVE_SSL */
+ 
+ #endif /* _NETUTILS_H_ */
+Index: plugins/sslutils.c
+===================================================================
+--- plugins/sslutils.c  (revision 1977)
++++ plugins/sslutils.c  (working copy)
+@@ -37,6 +37,7 @@
+ static SSL_CTX *c=NULL;
+ static SSL *s=NULL;
+ static int initialized=0;
++const char *host_name=NULL;
+ 
+ int np_net_ssl_init (int sd){
+                if (!initialized) {
+@@ -51,6 +52,10 @@
+                                return STATE_CRITICAL;
+                }
+                if ((s = SSL_new (c)) != NULL){
++#ifdef SSL_set_tlsext_host_name
++                               if (host_name != NULL)
++                                       SSL_set_tlsext_host_name(s, host_name);
++#endif
+                                SSL_set_fd (s, sd);
+                                if (SSL_connect(s) == 1){
+                                                return OK;
+@@ -68,6 +73,9 @@
+ 
+ void np_net_ssl_cleanup (){
+                if(s){
++#ifdef SSL_set_tlsext_host_name
++                               SSL_set_tlsext_host_name(s, NULL);
++#endif
+                                SSL_shutdown (s);
+                                SSL_free (s);
+                                if(c) {
+@@ -93,7 +101,7 @@
+        int offset;
+        struct tm stamp;
+        int days_left;
+-       char timestamp[17] = "";
++       char timestamp[21] = "";
+ 
+        certificate=SSL_get_peer_certificate(s);
+        if(! certificate){
+@@ -138,16 +146,17 @@
+        stamp.tm_sec = 0;
+        stamp.tm_isdst = -1;
+ 
+-       days_left = (mktime (&stamp) - time (NULL)) / 86400;
++       float time_left = difftime(timegm(&stamp), time(NULL));
++       days_left = time_left / 86400;
+        snprintf
+-               (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
++               (timestamp, 21, "%02d/%02d/%04d %02d:%02d %s",
+                 stamp.tm_mon + 1,
+-                stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
++                stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min, stamp.tm_zone);
+ 
+        if (days_left > 0 && days_left <= days_till_exp) {
+                printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
+                return STATE_WARNING;
+-       } else if (days_left < 0) {
++       } else if (time_left < 0) {
+                printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
+                return STATE_CRITICAL;
+        } else if (days_left == 0) {
+@@ -164,4 +173,8 @@
+ #  endif /* USE_OPENSSL */
+ }
+ 
++void np_net_ssl_set_host_name (const char *buf){
++       host_name = buf;
++}
++
+ #endif /* HAVE_SSL */
diff --git a/web/attachments/27403-cpu_mem-0.4.tgz b/web/attachments/27403-cpu_mem-0.4.tgz
new file mode 100644
index 0000000..aff9e05
--- /dev/null
+++ b/web/attachments/27403-cpu_mem-0.4.tgz
diff --git a/web/attachments/274034-check_tcp-openfire-jabber.patch b/web/attachments/274034-check_tcp-openfire-jabber.patch
new file mode 100644
index 0000000..87f8098
--- /dev/null
+++ b/web/attachments/274034-check_tcp-openfire-jabber.patch
@@ -0,0 +1,19 @@
+--- check_tcp.c.orig    2008-04-10 13:02:42.000000000 -0400
++++ check_tcp.c 2008-04-10 13:14:50.000000000 -0400
+@@ -167,9 +167,14 @@
+        }
+        else if (!strncmp(SERVICE, "JABBER", 6)) {
+                SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
+-               EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'";
++               server_expect_count = 3;
++               server_expect = malloc(sizeof(char *) * server_expect_count);
++               server_expect[0] = "<?xml version='1.0' encoding='UTF-8'?><stream:stream";
++               server_expect[1] = "xmlns=\"jabber:client\"";
++               server_expect[2] = "xmlns:stream=\"http://etherx.jabber.org/streams\"";
+                QUIT = "</stream:stream>\n";
+-               flags |= FLAG_HIDE_OUTPUT;
++               flags |= (FLAG_MATCH_ALL | FLAG_HIDE_OUTPUT);
++               flags &= ~FLAG_EXACT_MATCH;
+                PORT = 5222;
+        }
+        else if (!strncmp (SERVICE, "NNTPS", 5)) {
diff --git a/web/attachments/27405-cpu0.3_mem0.5.tgz b/web/attachments/27405-cpu0.3_mem0.5.tgz
new file mode 100644
index 0000000..345745e
--- /dev/null
+++ b/web/attachments/27405-cpu0.3_mem0.5.tgz
diff --git a/web/attachments/27407-nagios-plugins-check_smtp.patch b/web/attachments/27407-nagios-plugins-check_smtp.patch
new file mode 100644
index 0000000..be08038
--- /dev/null
+++ b/web/attachments/27407-nagios-plugins-check_smtp.patch
@@ -0,0 +1,52 @@
+--- nagios-plugins/plugins/check_smtp.c Thu Jun 13 13:49:38 2002
++++ nagios-plugins.patched/plugins/check_smtp.c Fri Jul 19 14:03:19 2002
+@@ -50,8 +50,13 @@
+  */
+ #define SMTP_DUMMYCMD  "MAIL\r\n"
+ #define SMTP_USE_DUMMYCMD 1
++#define SMTP_USE_HELOCMD 1
+ #define SMTP_QUIT      "QUIT\r\n"
+ 
++#ifdef SMTP_USE_HELOCMD
++#undef SMTP_USE_DUMMYCMD
++#endif /* SMTP_USE_HELOCMD */
++
+ int process_arguments (int, char **);
+ int call_getopt (int, char **);
+ int validate_arguments (void);
+@@ -74,6 +79,10 @@
+        int sd;
+        int result;
+        char buffer[MAX_INPUT_BUFFER] = "";
++#ifdef SMTP_USE_HELOCMD
++       char helocmd[255] = "HELO ";
++       char myhostname[248];
++#endif /* SMTP_USE_HELOCMD */
+ 
+        if (process_arguments (argc, argv) != OK)
+                usage ("Invalid command arguments supplied\n");
+@@ -137,13 +146,22 @@
+                        }
+                }
+ 
+-               /* close the connection */
++#ifdef SMTP_USE_HELOCMD
++               gethostname(myhostname, sizeof(myhostname));
++               strcat(helocmd,myhostname);
++               strcat(helocmd,"\r\n");
++               send(sd,helocmd,strlen(helocmd),0);
++               /* allow for response to helo command to reach us */
++               recv(sd,buffer,MAX_INPUT_BUFFER-1,0);
++#endif /* SMTP_USE_HELOCMD */
++
+ #ifdef SMTP_USE_DUMMYCMD
+                send(sd,SMTP_DUMMYCMD,strlen(SMTP_DUMMYCMD),0);
+                /* allow for response to DUMMYCMD to reach us */
+                recv(sd,buffer,MAX_INPUT_BUFFER-1,0);
+ #endif /* SMTP_USE_DUMMYCMD */
+ 
++               /* close the connection */
+                send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+                close (sd);
+        }
+
diff --git a/web/attachments/274975-check_oracle.patch b/web/attachments/274975-check_oracle.patch
new file mode 100644
index 0000000..98eeced
--- /dev/null
+++ b/web/attachments/274975-check_oracle.patch
@@ -0,0 +1,24 @@
+--- plugins-scripts/check_oracle.sh.old 2008-04-17 15:59:40.807652000 -0400
++++ plugins-scripts/check_oracle.sh     2008-04-17 16:15:15.641727000 -0400
+@@ -37,7 +37,7 @@
+   echo "--db SID"
+   echo "   Check local database (search /bin/ps for PMON process) and check"
+   echo "   filesystem for sgadefORACLE_SID.dbf"
+-  echo "--login SID"
++  echo "--login SID|<IP or hostname> SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+   echo "--cache"
+   echo "   Check local database for library and buffer cache hit ratios"
+@@ -176,7 +176,11 @@
+     fi
+     ;;
+ --login)
+-    loginchk=`sqlplus dummy/user@$2 < /dev/null`
++    if [ -n "$3" ]; then
++           loginchk=`sqlplus dummy/user@$2/$3 < /dev/null`
++    else
++            loginchk=`sqlplus dummy/user@$2 < /dev/null`
++    fi
+     loginchk2=` echo  $loginchk | grep -c ORA-01017`
+     if [ ${loginchk2} -eq 1 ] ; then 
+        echo "OK - dummy login connected"
diff --git a/web/attachments/27581-z b/web/attachments/27581-z
new file mode 100644
index 0000000..fb3e37c
--- /dev/null
+++ b/web/attachments/27581-z
@@ -0,0 +1,26 @@
+--- check_snmp.c.cln    Tue Jul 23 09:42:21 2002
++++ check_snmp.c        Tue Jul 23 09:42:50 2002
+@@ -145,8 +145,8 @@
+        /* create the command line to execute */
+        command_line = ssprintf
+                (command_line,
+-                "%s -m ALL -v 1 %s %s %s",
+-                PATH_TO_SNMPGET, server_address, community, oid);
++                "%s -m ALL -v 1 -c %s %s %s",
++                PATH_TO_SNMPGET, community, server_address, oid);
+ 
+        /* run the command */
+        child_process = spopen (command_line);
+--- check_hpjd.c.cln    Tue Jul 23 09:45:16 2002
++++ check_hpjd.c        Tue Jul 23 09:46:00 2002
+@@ -135,8 +135,8 @@
+                 HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
+ 
+        /* get the command to run */
+-       sprintf (command_line, "%s -m : -v 1 %s %s %s", PATH_TO_SNMPGET, address,
+-                                        community, query_string);
++       sprintf (command_line, "%s -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET,
++                                        community, address, query_string);
+ 
+        /* run the command */
+        child_process = spopen (command_line);
diff --git a/web/attachments/27710-snmptest.sh b/web/attachments/27710-snmptest.sh
new file mode 100644
index 0000000..71dc310
--- /dev/null
+++ b/web/attachments/27710-snmptest.sh
diff --git a/web/attachments/279258-check_radius.c.diff b/web/attachments/279258-check_radius.c.diff
new file mode 100644
index 0000000..051dc4d
--- /dev/null
+++ b/web/attachments/279258-check_radius.c.diff
@@ -0,0 +1,94 @@
+--- check_radius.c.orig 2008-05-28 00:31:54.000000000 +0200
++++ check_radius.c      2008-05-28 00:29:27.000000000 +0200
+@@ -53,6 +53,7 @@
+ char *username = NULL;
+ char *password = NULL;
+ char *nasid = NULL;
++char *nasipaddress = NULL;
+ char *expect = NULL;
+ char *config_file = NULL;
+ unsigned short port = PW_AUTH_UDP_PORT;
+@@ -149,19 +150,26 @@
+ 
+        if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+                                rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
+-                               rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
+-                               (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
++                               rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)
++                            ))
+                die (STATE_UNKNOWN, _("Out of Memory?"));
+ 
+-       /* 
+-        * Fill in NAS-IP-Address 
+-        */
+-
+-       if ((client_id = rc_own_ipaddress ()) == 0)
+-               return (ERROR_RC);
+-
+-       if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
+-                       NULL) return (ERROR_RC);
++       if (nasid != NULL) {
++               if (!(rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))
++                        die (STATE_UNKNOWN, _("Invalid NAS-Identifier"));
++        }
++
++       if (nasipaddress != NULL) {
++               if (rc_good_ipaddr (nasipaddress))
++                        die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
++               if ((client_id = rc_get_ipaddr(nasipaddress)) == 0)
++                        die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
++       } else {
++               if ((client_id = rc_own_ipaddress ()) == 0)
++                        die (STATE_UNKNOWN, _("Can't find local IP for NAS-IP-Address"));
++        }
++        if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL)
++                die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
+ 
+        rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+                     retries);
+@@ -199,6 +207,7 @@
+                {"username", required_argument, 0, 'u'},
+                {"password", required_argument, 0, 'p'},
+                {"nas-id", required_argument, 0, 'n'},
++               {"nas-ip-address", required_argument, 0, 'N'},
+                {"filename", required_argument, 0, 'F'},
+                {"expect", required_argument, 0, 'e'},
+                {"retries", required_argument, 0, 'r'},
+@@ -234,7 +243,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts,
++               c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts,
+                                                                         &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+@@ -273,6 +282,9 @@
+                case 'n':                                                                       /* nas id */
+                        nasid = optarg;
+                        break;
++               case 'N':                                                                       /* nas ip address */
++                       nasipaddress = optarg;
++                       break;
+                case 'F':                                                                       /* configuration file */
+                        config_file = optarg;
+                        break;
+@@ -325,6 +337,8 @@
+   printf ("    %s\n", _("Password for autentication (SECURITY RISK)"));
+   printf (" %s\n", "-n, --nas-id=STRING");
+   printf ("    %s\n", _("NAS identifier"));
++  printf (" %s\n", "-N, --nas-ip-address=STRING");
++  printf ("    %s\n", _("NAS IP Address"));
+   printf (" %s\n", "-F, --filename=STRING");
+   printf ("    %s\n", _("Configuration file"));
+   printf (" %s\n", "-e, --expect=STRING");
+@@ -354,6 +368,7 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-       printf ("%s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\
+-                  [-t timeout] [-r retries] [-e expect]\n", progname);
++       printf ("%s -H host -F config_file -u username -p password\n\
++                  [-P port] [-t timeout] [-r retries] [-e expect]\n\
++                  [-n nas-id] [-N nas-ip-addr]\n", progname);
+ }
diff --git a/web/attachments/279991-50_misc_typos.dpatch b/web/attachments/279991-50_misc_typos.dpatch
new file mode 100644
index 0000000..a40d67b
--- /dev/null
+++ b/web/attachments/279991-50_misc_typos.dpatch
@@ -0,0 +1,322 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_misc_typos.dpatch by  <andy@andrewprice.me.uk> modified for 1.4.10 by 
+## Jan Wagner <waja@cyconet.org>
+##
+## DP: This patch fixes various typos and grammatical errors in plugins/*.c.
+## DP: It is based on Malcolm Parsons' patch posted at https://launchpad.net/bugs/64595
+
+@DPATCH@
+diff -urNad nagios-plugins-1.4.12~/plugins/check_dns.c nagios-plugins-1.4.12/plugins/check_dns.c
+--- nagios-plugins-1.4.12~/plugins/check_dns.c  2008-05-13 11:14:45.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_dns.c   2008-06-03 11:08:17.000000000 +0200
+@@ -255,7 +255,7 @@
+     printf (_("DNS CRITICAL - %s\n"),
+             !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+   else
+-    printf (_("DNS UNKNOW - %s\n"),
++    printf (_("DNS UNKNOWN - %s\n"),
+             !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+ 
+   return result;
+diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c
+--- nagios-plugins-1.4.12~/plugins/check_http.c 2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_http.c  2008-06-03 11:08:17.000000000 +0200
+@@ -1054,7 +1054,7 @@
+ 
+   url = malloc (strcspn (pos, "\r\n"));
+   if (url == NULL)
+-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n"));
++    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+ 
+   while (pos) {
+     sscanf (pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i);
+@@ -1085,7 +1085,7 @@
+ 
+     url = realloc (url, strcspn (pos, "\r\n") + 1);
+     if (url == NULL)
+-      die (STATE_UNKNOWN, _("HTTP UNKNOWN - could not allocate url\n"));
++      die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+ 
+     /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+     if (sscanf (pos, HD1, type, addr, &i, url) == 4)
+@@ -1253,7 +1253,7 @@
+   printf ("   %s\n", _("Connect via SSL. Port defaults to 443"));
+   printf (" %s\n", "-C, --certificate=INTEGER");
+   printf ("   %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
+-  printf ("   %s\n", _("(when this option is used the url is not checked.)\n"));
++  printf ("   %s\n", _("(when this option is used the URL is not checked.)\n"));
+ #endif
+ 
+   printf (" %s\n", "-e, --expect=STRING");
+diff -urNad nagios-plugins-1.4.12~/plugins/check_ldap.c nagios-plugins-1.4.12/plugins/check_ldap.c
+--- nagios-plugins-1.4.12~/plugins/check_ldap.c 2008-06-03 11:08:16.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_ldap.c  2008-06-03 11:08:17.000000000 +0200
+@@ -196,7 +196,7 @@
+                        LDAP_SUCCESS) {
+                if (verbose)
+                        ldap_perror(ld, "ldap_bind");
+-               printf (_("Could not bind to the ldap-server\n"));
++               printf (_("Could not bind to the LDAP server\n"));
+                return STATE_CRITICAL;
+        }
+ 
+diff -urNad nagios-plugins-1.4.12~/plugins/check_mysql.c nagios-plugins-1.4.12/plugins/check_mysql.c
+--- nagios-plugins-1.4.12~/plugins/check_mysql.c        2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_mysql.c 2008-06-03 11:08:17.000000000 +0200
+@@ -381,7 +381,7 @@
+ 
+        printf (_(COPYRIGHT), copyright, email);
+ 
+-       printf ("%s\n", _("This program tests connections to a mysql server"));
++       printf ("%s\n", _("This program tests connections to a MySQL server"));
+ 
+   printf ("\n\n");
+ 
+diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c nagios-plugins-1.4.12/plugins/check_procs.c
+--- nagios-plugins-1.4.12~/plugins/check_procs.c        2008-06-03 11:08:16.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_procs.c 2008-06-03 11:14:09.000000000 +0200
+@@ -730,7 +730,7 @@
+   printf ("  %s\n", _("PROCS   - number of processes (default)"));
+   printf ("  %s\n", _("VSZ     - virtual memory size"));
+   printf ("  %s\n", _("RSS     - resident set memory size"));
+-  printf ("  %s\n", _("CPU     - percentage cpu"));
++  printf ("  %s\n", _("CPU     - percentage CPU"));
+ /* only linux etime is support currently */
+ #if defined( __linux__ )
+        printf ("  %s\n", _("ELAPSED - time elapsed in seconds"));
+@@ -749,11 +749,11 @@
+   printf (" %s\n", "-p, --ppid=PPID");
+   printf ("   %s\n", _("Only scan for children of the parent process ID indicated."));
+   printf (" %s\n", "-z, --vsz=VSZ");
+-  printf ("   %s\n", _("Only scan for processes with vsz higher than indicated."));
++  printf ("   %s\n", _("Only scan for processes with VSZ higher than indicated."));
+   printf (" %s\n", "-r, --rss=RSS");
+-  printf ("   %s\n", _("Only scan for processes with rss higher than indicated."));
++  printf ("   %s\n", _("Only scan for processes with RSS higher than indicated."));
+        printf (" %s\n", "-P, --pcpu=PCPU");
+-  printf ("   %s\n", _("Only scan for processes with pcpu higher than indicated."));
++  printf ("   %s\n", _("Only scan for processes with PCPU higher than indicated."));
+   printf (" %s\n", "-u, --user=USER");
+   printf ("   %s\n", _("Only scan for processes with user name or ID indicated."));
+   printf (" %s\n", "-a, --argument-array=STRING");
+@@ -789,9 +789,9 @@
+   printf ("  %s\n", _("Warning alert if > 10 processes with command arguments containing"));
+   printf ("  %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
+   printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
+-  printf ("  %s\n\n", _("Alert if vsz of any processes over 50K or 100K"));
++  printf ("  %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
+   printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
+-  printf ("  %s\n", _("Alert if cpu of any processes over 10%% or 20%%"));
++  printf ("  %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
+ 
+        printf (_(UT_SUPPORT));
+ }
+diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c.rej nagios-plugins-1.4.12/plugins/check_procs.c.rej
+--- nagios-plugins-1.4.12~/plugins/check_procs.c.rej    1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-1.4.12/plugins/check_procs.c.rej     2008-06-03 11:08:17.000000000 +0200
+@@ -0,0 +1,21 @@
++***************
++*** 781,789 ****
++    printf ("  %s\n", _("Warning alert if > 10 processes with command arguments containing"));
++    printf ("  %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
++    printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
++-   printf ("  %s\n\n", _("Alert if vsz of any processes over 50K or 100K"));
++    printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
++-   printf ("  %s\n\n", _("Alert if cpu of any processes over 10%% or 20%%"));
++  
++       printf (_(UT_SUPPORT));
++  }
++--- 781,789 ----
++    printf ("  %s\n", _("Warning alert if > 10 processes with command arguments containing"));
++    printf ("  %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
++    printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
+++   printf ("  %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
++    printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
+++   printf ("  %s\n\n", _("Alert if CPU of any processes over 10%% or 20%%"));
++  
++       printf (_(UT_SUPPORT));
++  }
+diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/plugins/check_radius.c
+--- nagios-plugins-1.4.12~/plugins/check_radius.c       2008-06-03 11:08:16.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_radius.c        2008-06-03 11:16:39.000000000 +0200
+@@ -325,7 +325,7 @@
+        printf ("Copyright (c) 1999 Robert August Vincent II\n");
+        printf (COPYRIGHT, copyright, email);
+ 
+-       printf("%s\n", _("Tests to see if a radius server is accepting connections."));
++       printf("%s\n", _("Tests to see if a RADIUS server is accepting connections."));
+ 
+   printf ("\n\n");
+ 
+@@ -352,7 +352,7 @@
+        printf (_(UT_TIMEOUT), timeout_interval);
+ 
+   printf ("\n");
+-  printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections."));
++  printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
+   printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
+   printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
+   printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
+diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c.rej nagios-plugins-1.4.12/plugins/check_radius.c.rej
+--- nagios-plugins-1.4.12~/plugins/check_radius.c.rej   1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-1.4.12/plugins/check_radius.c.rej    2008-06-03 11:08:17.000000000 +0200
+@@ -0,0 +1,35 @@
++***************
++*** 350,365 ****
++  
++       printf (_(UT_TIMEOUT), timeout_interval);
++  
++-      printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections."));
++    printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
++    printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
++    printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
++       printf ("%s\n", _("The password option presents a substantial security issue because the"));
++    printf ("%s\n", _("password can be determined by careful watching of the command line in"));
++    printf ("%s\n", _("a process listing.  This risk is exacerbated because nagios will"));
++-   printf ("%s\n", _("run the plugin at regular prdictable intervals.  Please be sure that"));
++    printf ("%s\n", _("the password used does not allow access to sensitive system resources,"));
++-   printf ("%s\n", _("otherwise compormise could occur."));
++  
++       printf (_(UT_SUPPORT));
++  }
++--- 350,365 ----
++  
++       printf (_(UT_TIMEOUT), timeout_interval);
++  
+++      printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
++    printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
++    printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
++    printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
++       printf ("%s\n", _("The password option presents a substantial security issue because the"));
++    printf ("%s\n", _("password can be determined by careful watching of the command line in"));
++    printf ("%s\n", _("a process listing.  This risk is exacerbated because nagios will"));
+++   printf ("%s\n", _("run the plugin at regular predictable intervals.  Please be sure that"));
++    printf ("%s\n", _("the password used does not allow access to sensitive system resources,"));
+++   printf ("%s\n", _("otherwise compromise could occur."));
++  
++       printf (_(UT_SUPPORT));
++  }
+diff -urNad nagios-plugins-1.4.12~/plugins/check_snmp.c nagios-plugins-1.4.12/plugins/check_snmp.c
+--- nagios-plugins-1.4.12~/plugins/check_snmp.c 2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_snmp.c  2008-06-03 11:08:17.000000000 +0200
+@@ -928,7 +928,7 @@
+ 
+        printf (COPYRIGHT, copyright, email);
+ 
+-       printf ("%s\n", _("Check status of remote machines and obtain sustem information via SNMP"));
++       printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
+ 
+   printf ("\n\n");
+ 
+@@ -964,8 +964,8 @@
+        printf (" %s\n", "-o, --oid=OID(s)");
+   printf ("    %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
+   printf (" %s\n", "-m, --miblist=STRING");
+-  printf ("    %s\n", _("List of MIBS to be loaded (default = none if using numeric oids or 'ALL'"));
+-  printf ("    %s\n", _("for symbolic oids.)"));
++  printf ("    %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
++  printf ("    %s\n", _("for symbolic OIDs.)"));
+   printf (" %s\n", "-d, --delimiter=STRING");
+   printf (_("    Delimiter to use when parsing returned data. Default is \"%s\""), DEFAULT_DELIMITER);
+   printf ("    %s\n", _("Any data on the right hand side of the delimiter is considered"));
+diff -urNad nagios-plugins-1.4.12~/plugins/check_tcp.c nagios-plugins-1.4.12/plugins/check_tcp.c
+--- nagios-plugins-1.4.12~/plugins/check_tcp.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_tcp.c   2008-06-03 11:08:17.000000000 +0200
+@@ -623,7 +623,7 @@
+   printf (" %s\n", "-q, --quit=STRING");
+   printf ("    %s\n", _("String to send server to initiate a clean close of the connection"));
+   printf (" %s\n", "-r, --refuse=ok|warn|crit");
+-  printf ("    %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
++  printf ("    %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
+   printf (" %s\n", "-M, --mismatch=ok|warn|crit");
+   printf ("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
+   printf (" %s\n", "-j, --jail");
+diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c
+--- nagios-plugins-1.4.12~/plugins/check_ups.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_ups.c   2008-06-03 11:19:51.000000000 +0200
+@@ -417,7 +417,7 @@
+        len = strlen(ptr);
+        if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
+        if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
+-               printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);
++               printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name);
+                return ERROR;
+        }
+ 
+@@ -584,7 +584,7 @@
+ validate_arguments (void)
+ {
+        if (! ups_name) {
+-               printf ("%s\n", _("Error : no ups indicated"));
++               printf ("%s\n", _("Error : no UPS indicated"));
+                return ERROR;
+        }
+        return OK;
+@@ -635,7 +635,7 @@
+        printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
+   printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
+   printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
+-  printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL"));
++  printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL"));
+   printf ("%s\n", _("state."));
+ 
+   printf ("\n");
+@@ -645,7 +645,7 @@
+   printf (" %s\n", _("of that variable.  If the remote host has multiple UPS that are being monitored"));
+   printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check."));
+   printf ("\n");
+-  printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's"));
++  printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's"));
+   printf (" %s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the"));
+   printf (" %s\n", _("package installed on your system, you can download it from"));
+   printf (" %s\n", _("http://www.networkupstools.org"));
+diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c.rej nagios-plugins-1.4.12/plugins/check_ups.c.rej
+--- nagios-plugins-1.4.12~/plugins/check_ups.c.rej      1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-1.4.12/plugins/check_ups.c.rej       2008-06-03 11:08:17.000000000 +0200
+@@ -0,0 +1,34 @@
++***************
++*** 636,642 ****
++       printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
++    printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
++    printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
++-   printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL"));
++    printf ("%s\n\n", _("state."));
++  
++       printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,"));
++--- 636,642 ----
++       printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
++    printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
++    printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
+++   printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL"));
++    printf ("%s\n\n", _("state."));
++  
++       printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,"));
++***************
++*** 644,650 ****
++    printf ("%s\n", _("that variable.  If the remote host has multiple UPS that are being monitored you"));
++    printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check."));
++  
++-      printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's"));
++    printf ("%s\n", _("Smart UPS Tools be installed on the remote host.  If you do not have the"));
++    printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org"));
++  
++--- 644,650 ----
++    printf ("%s\n", _("that variable.  If the remote host has multiple UPS that are being monitored you"));
++    printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check."));
++  
+++      printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's"));
++    printf ("%s\n", _("Smart UPS Tools be installed on the remote host.  If you do not have the"));
++    printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org"));
++  
+diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl
+--- nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl       2006-07-05 15:45:57.000000000 +0200
++++ nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl        2008-06-03 11:08:17.000000000 +0200
+@@ -588,7 +588,7 @@
+        print "   Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n";
+        print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
+        print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
+-       print "-c (--critical)  = Min. number of messages in queu to generate critical alert ( w < c )\n";
++       print "-c (--critical)  = Min. number of messages in queue to generate critical alert ( w < c )\n";
+        print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
+        print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+        print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
diff --git a/web/attachments/280102-config.log.gz b/web/attachments/280102-config.log.gz
new file mode 100644
index 0000000..4682716
--- /dev/null
+++ b/web/attachments/280102-config.log.gz
diff --git a/web/attachments/280264-check_ups.diff b/web/attachments/280264-check_ups.diff
new file mode 100644
index 0000000..595353e
--- /dev/null
+++ b/web/attachments/280264-check_ups.diff
@@ -0,0 +1,30 @@
+=== plugins/check_ups.c

+==================================================================

+--- plugins/check_ups.c (revision 2)

++++ plugins/check_ups.c (revision 4)

+@@ -393,13 +393,13 @@

+        /*  char command[MAX_INPUT_BUFFER]; */

+        char temp_buffer[MAX_INPUT_BUFFER];

+        char send_buffer[MAX_INPUT_BUFFER];

+-       char *ptr;

++       char *ptr, *end = NULL;

+        int len;

+ 

+        *buf=0;

+        

+        /* create the command string to send to the UPS daemon */

+-       sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname);

++       sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname);

+ 

+        /* send the command to the daemon and get a response back */

+        if (process_tcp_request

+@@ -433,6 +433,9 @@

+        }

+ 

+        ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6;

++       end = strchr(ptr, '\n');

++       if (end)

++               *end = 0;

+        len = strlen(ptr);

+        if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') {

+                printf ("%s\n", _("Error: unable to parse variable"));

diff --git a/web/attachments/280286-fix_emb_check_disk_smb.diff b/web/attachments/280286-fix_emb_check_disk_smb.diff
new file mode 100644
index 0000000..4079be3
--- /dev/null
+++ b/web/attachments/280286-fix_emb_check_disk_smb.diff
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824428" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824428" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824428" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824428" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824428');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1985338&group_id=29880&atid=397597&file_id=280286"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/280402-33_fix_emb_check_disk_smb.dpatch b/web/attachments/280402-33_fix_emb_check_disk_smb.dpatch
new file mode 100644
index 0000000..2713e64
--- /dev/null
+++ b/web/attachments/280402-33_fix_emb_check_disk_smb.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 32_check_ldap_pointer.dpatch by Jan Wagner <waja@cyconet.org>
+## patch provided by Stephane Chazelas <stephane@artesyncp.com>
+##
+## DP: fix processing vi embedded perl interpreter
+
+@DPATCH@
+diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl
+--- nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl    2008-06-06 11:57:33.000000000 +0200
++++ nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl     2008-06-06 11:58:03.000000000 +0200
+@@ -65,27 +65,27 @@
+ 
+ # Options checking
+ 
+-($opt_H) || ($opt_H = shift) || usage("Host name not specified\n");
++($opt_H) || ($opt_H = shift @ARGV) || usage("Host name not specified\n");
+ my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
+ ($host) || usage("Invalid host: $opt_H\n");
+ 
+-($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n");
++($opt_s) || ($opt_s = shift @ARGV) || usage("Share volume not specified\n");
+ my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/);
+ ($share) || usage("Invalid share: $opt_s\n");
+ 
+-($opt_u) || ($opt_u = shift) || ($opt_u = "guest");
++($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest");
+ my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/);
+ ($user) || usage("Invalid user: $opt_u\n");
+ 
+-($opt_p) || ($opt_p = shift) || ($opt_p = "");
++($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = "");
+ my $pass = $1 if ($opt_p =~ /(.*)/);
+ $pass = "-N" if ($opt_p eq "");
+ 
+-($opt_w) || ($opt_w = shift) || ($opt_w = 85);
++($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 85);
+ my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
+ ($warn) || usage("Invalid warning threshold: $opt_w\n");
+ 
+-($opt_c) || ($opt_c = shift) || ($opt_c = 95);
++($opt_c) || ($opt_c = shift @ARGV) || ($opt_c = 95);
+ my $crit = $1 if ($opt_c =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
+ ($crit) || usage("Invalid critical threshold: $opt_c\n");
+ 
diff --git a/web/attachments/280406-34_fix_smbclient_check_disk_smb.dpatch b/web/attachments/280406-34_fix_smbclient_check_disk_smb.dpatch
new file mode 100644
index 0000000..a6867a1
--- /dev/null
+++ b/web/attachments/280406-34_fix_smbclient_check_disk_smb.dpatch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-2 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824398" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824398" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824398" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824398" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824398');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=1986260&group_id=29880&atid=397597&file_id=280406"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/280540-check_radius.c.diff b/web/attachments/280540-check_radius.c.diff
new file mode 100644
index 0000000..94052ab
--- /dev/null
+++ b/web/attachments/280540-check_radius.c.diff
@@ -0,0 +1,95 @@
+--- nagios-plugins-1.4.12.orig/plugins/check_radius.c   2008-06-06 13:54:31.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_radius.c        2008-06-06 14:08:00.000000000 +0200
+@@ -73,6 +73,7 @@
+ char *username = NULL;
+ char *password = NULL;
+ char *nasid = NULL;
++char *nasipaddress = NULL;
+ char *expect = NULL;
+ char *config_file = NULL;
+ unsigned short port = PW_AUTH_UDP_PORT;
+@@ -173,19 +174,26 @@
+        memset (&data, 0, sizeof(data));
+        if (!(my_rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+                                my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
+-                               my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
+-                               (nasid==NULL || my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
++                               my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)
++                               ))
+                die (STATE_UNKNOWN, _("Out of Memory?"));
+ 
+-       /* 
+-        * Fill in NAS-IP-Address 
+-        */
+-
+-       if ((client_id = my_rc_own_ipaddress ()) == 0)
+-               return (ERROR_RC);
++       if (nasid != NULL) {
++               if (!(my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))
++                       die (STATE_UNKNOWN, _("Invalid NAS-Identifier"));
++       }
+ 
+-       if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
+-                       NULL) return (ERROR_RC);
++       if (nasipaddress != NULL) {
++               if (rc_good_ipaddr (nasipaddress))
++                       die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
++               if ((client_id = rc_get_ipaddr(nasipaddress)) == 0)
++                       die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
++       } else {
++               if ((client_id = my_rc_own_ipaddress ()) == 0)
++                       die (STATE_UNKNOWN, _("Can't find local IP for NAS-IP-Address"));
++       }
++       if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL)
++               die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
+ 
+        my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+                     retries);
+@@ -223,6 +231,7 @@
+                {"username", required_argument, 0, 'u'},
+                {"password", required_argument, 0, 'p'},
+                {"nas-id", required_argument, 0, 'n'},
++               {"nas-ip-address", required_argument, 0, 'N'},
+                {"filename", required_argument, 0, 'F'},
+                {"expect", required_argument, 0, 'e'},
+                {"retries", required_argument, 0, 'r'},
+@@ -234,7 +243,7 @@
+        };
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts,
++               c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts,
+                                                                         &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+@@ -279,6 +288,9 @@
+                case 'n':                                                                       /* nas id */
+                        nasid = optarg;
+                        break;
++               case 'N':                                                                       /* nas ip address */
++                       nasipaddress = optarg;
++                       break;
+                case 'F':                                                                       /* configuration file */
+                        config_file = optarg;
+                        break;
+@@ -342,6 +354,8 @@
+   printf ("    %s\n", _("Password for autentication (SECURITY RISK)"));
+   printf (" %s\n", "-n, --nas-id=STRING");
+   printf ("    %s\n", _("NAS identifier"));
++  printf (" %s\n", "-N, --nas-ip-address=STRING");
++  printf ("    %s\n", _("NAS IP Address"));
+   printf (" %s\n", "-F, --filename=STRING");
+   printf ("    %s\n", _("Configuration file"));
+   printf (" %s\n", "-e, --expect=STRING");
+@@ -377,8 +391,9 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-       printf ("%s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\
+-                  [-t timeout] [-r retries] [-e expect]\n", progname);
++       printf ("%s -H host -F config_file -u username -p password\n\
++                       [-P port] [-t timeout] [-r retries] [-e expect]\n\
++                       [-n nas-id] [-N nas-ip-addr]\n", progname);
+ }
+ 
+ 
diff --git a/web/attachments/281050-check_ping_countermeasures.patch b/web/attachments/281050-check_ping_countermeasures.patch
new file mode 100644
index 0000000..ce62a42
--- /dev/null
+++ b/web/attachments/281050-check_ping_countermeasures.patch
@@ -0,0 +1,15 @@
+--- nagios-plugins-1.4.6-modified/plugins/check_ping.c  2008-06-11 10:08:35.000000000 -0400
++++ nagios-plugins-1.4.6/plugins/check_ping.c   2008-06-11 10:07:08.000000000 -0400
+@@ -470,11 +470,7 @@ run_ping (const char *cmd, const char *a
+        /* check stderr, setting at least WARNING if there is output here */
+        /* Add warning into warn_text */
+        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               if (
+-                       ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
+-                       && ! strstr(buf,"Warning: time of day goes back")
+-
+-               ) {
++               if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {
+                        if (verbose >= 3) {
+                                printf("Got stderr: %s", buf);
+                        }
diff --git a/web/attachments/281911-check_http.c.diff b/web/attachments/281911-check_http.c.diff
new file mode 100644
index 0000000..a29dd37
--- /dev/null
+++ b/web/attachments/281911-check_http.c.diff
@@ -0,0 +1,18 @@
+--- check_http.c~       2008-06-19 11:42:25.000000000 +0200
++++ check_http.c        2008-06-19 11:42:25.000000000 +0200
+@@ -912,11 +912,12 @@
+   if (!strstr (status_line, server_expect)) {
+     if (server_port == HTTP_PORT)
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host\n"));
++                _("Invalid HTTP response received from host: %s\n"),
++                status_line);
+     else
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host on port %d\n"),
+-                server_port);
++                _("Invalid HTTP response received from host on port %d: %s\n"),
++                server_port, status_line);
+     die (STATE_CRITICAL, "%s", msg);
+   }
+ 
diff --git a/web/attachments/282489-check_icmp.c b/web/attachments/282489-check_icmp.c
new file mode 100644
index 0000000..2c8f121
--- /dev/null
+++ b/web/attachments/282489-check_icmp.c
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-7 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378823484" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378823484" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378823484" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378823484" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378823484');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2001832&group_id=29880&atid=397599&file_id=282489"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/282511-check_icmp.c b/web/attachments/282511-check_icmp.c
new file mode 100644
index 0000000..fc59f2a
--- /dev/null
+++ b/web/attachments/282511-check_icmp.c
@@ -0,0 +1,1301 @@
+ /******************************************************************************
+*
+* Nagios check_icmp plugin
+*
+* License: GPL
+* Copyright (c) 2005-2007 nagios-plugins team
+*
+* Original Author : Andreas Ericsson <ae@op5.se>
+*                       
+*       set TOS-bist (-T): Georg von Zengen <gvz@ciphron.de>            
+*
+* Last Modified: $Date: 2008-06-24 17:06:35 +0000 (Tue, 24 JUN 2008) $
+*
+* Description:
+*
+* This file contains the check_icmp plugin
+*
+*  Relevant RFC's: 792 (ICMP), 791 (IP)
+*
+*  This program was modeled somewhat after the check_icmp program,
+*  which was in turn a hack of fping (www.fping.org) but has been
+*  completely rewritten since to generate higher precision rta values,
+*  and support several different modes as well as setting ttl to control.
+*  redundant routes. The only remainders of fping is currently a few
+*  function names.
+*
+* License Information:
+*
+* 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 2 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, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+* $Id: check_icmp.c 1861 2007-12-11 05:57:35Z dermoth $
+* 
+*****************************************************************************/
+
+/* progname may change */
+/* char *progname = "check_icmp"; */
+char *progname;
+const char *revision = "$Revision: 1861 $";
+const char *copyright = "2005-2007";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+/** nagios plugins basic includes */
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <stddef.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#include <arpa/inet.h>
+#include <signal.h>
+
+
+/** sometimes undefined system macros (quite a few, actually) **/
+#ifndef MAXTTL
+# define MAXTTL 255
+#endif
+#ifndef INADDR_NONE
+# define INADDR_NONE 0xffffffU
+#endif
+
+#ifndef SOL_IP
+#define SOL_IP 0
+#endif
+
+/* we bundle these in one #ifndef, since they're all from BSD
+ * Put individual #ifndef's around those that bother you */
+#ifndef ICMP_UNREACH_NET_UNKNOWN
+# define ICMP_UNREACH_NET_UNKNOWN 6
+# define ICMP_UNREACH_HOST_UNKNOWN 7
+# define ICMP_UNREACH_ISOLATED 8
+# define ICMP_UNREACH_NET_PROHIB 9
+# define ICMP_UNREACH_HOST_PROHIB 10
+# define ICMP_UNREACH_TOSNET 11
+# define ICMP_UNREACH_TOSHOST 12
+#endif
+/* tru64 has the ones above, but not these */
+#ifndef ICMP_UNREACH_FILTER_PROHIB
+# define ICMP_UNREACH_FILTER_PROHIB 13
+# define ICMP_UNREACH_HOST_PRECEDENCE 14
+# define ICMP_UNREACH_PRECEDENCE_CUTOFF 15
+#endif
+
+
+typedef unsigned short range_t;  /* type for get_range() -- unimplemented */
+
+typedef struct rta_host {
+        unsigned short id;           /* id in **table, and icmp pkts */
+        char *name;                  /* arg used for adding this host */
+        char *msg;                   /* icmp error message, if any */
+        struct sockaddr_in saddr_in; /* the address of this host */
+        struct in_addr error_addr;   /* stores address of error replies */
+        unsigned long long time_waited; /* total time waited, in usecs */
+        unsigned int icmp_sent, icmp_recv, icmp_lost; /* counters */
+        unsigned char icmp_type, icmp_code; /* type and code from errors */
+        unsigned short flags;        /* control/status flags */
+        double rta;                  /* measured RTA */
+        unsigned char pl;            /* measured packet loss */
+        struct rta_host *next;       /* linked list */
+} rta_host;
+
+#define FLAG_LOST_CAUSE 0x01  /* decidedly dead target. */
+
+/* threshold structure. all values are maximum allowed, exclusive */
+typedef struct threshold {
+        unsigned char pl;    /* max allowed packet loss in percent */
+        unsigned int rta;  /* roundtrip time average, microseconds */
+} threshold;
+
+/* the data structure */
+typedef struct icmp_ping_data {
+        struct timeval stime;   /* timestamp (saved in protocol struct as well) */
+        unsigned short ping_id;
+} icmp_ping_data;
+
+/* the different modes of this program are as follows:
+ * MODE_RTA: send all packets no matter what (mimic check_icmp and check_ping)
+ * MODE_HOSTCHECK: Return immediately upon any sign of life
+ *                 In addition, sends packets to ALL addresses assigned
+ *                 to this host (as returned by gethostbyname() or
+ *                 gethostbyaddr() and expects one host only to be checked at
+ *                 a time.  Therefore, any packet response what so ever will
+ *                 count as a sign of life, even when received outside
+ *                 crit.rta limit. Do not misspell any additional IP's.
+ * MODE_ALL:  Requires packets from ALL requested IP to return OK (default).
+ * MODE_ICMP: implement something similar to check_icmp (MODE_RTA without
+ *            tcp and udp args does this)
+ */
+#define MODE_RTA 0
+#define MODE_HOSTCHECK 1
+#define MODE_ALL 2
+#define MODE_ICMP 3
+
+/* the different ping types we can do
+ * TODO: investigate ARP ping as well */
+#define HAVE_ICMP 1
+#define HAVE_UDP 2
+#define HAVE_TCP 4
+#define HAVE_ARP 8
+
+#define MIN_PING_DATA_SIZE sizeof(struct icmp_ping_data)
+#define MAX_IP_PKT_SIZE 65536   /* (theoretical) max IP packet size */
+#define IP_HDR_SIZE 20
+#define MAX_PING_DATA (MAX_IP_PKT_SIZE - IP_HDR_SIZE - ICMP_MINLEN)
+#define DEFAULT_PING_DATA_SIZE (MIN_PING_DATA_SIZE + 44)
+
+/* various target states */
+#define TSTATE_INACTIVE 0x01    /* don't ping this host anymore */
+#define TSTATE_WAITING 0x02             /* unanswered packets on the wire */
+#define TSTATE_ALIVE 0x04       /* target is alive (has answered something) */
+#define TSTATE_UNREACH 0x08
+
+/** prototypes **/
+void print_help (void);
+void print_usage (void);
+static u_int get_timevar(const char *);
+static u_int get_timevaldiff(struct timeval *, struct timeval *);
+static int wait_for_reply(int, u_int);
+static int recvfrom_wto(int, char *, unsigned int, struct sockaddr *, u_int *);
+static int send_icmp_ping(int, struct rta_host *);
+static int get_threshold(char *str, threshold *th);
+static void run_checks(void);
+static int add_target(char *);
+static int add_target_ip(char *, struct in_addr *);
+static int handle_random_icmp(struct icmp *, struct sockaddr_in *);
+static unsigned short icmp_checksum(unsigned short *, int);
+static void finish(int);
+static void crash(const char *, ...);
+
+/** external **/
+extern int optind, opterr, optopt;
+extern char *optarg;
+extern char **environ;
+
+/** global variables **/
+static struct rta_host **table, *cursor, *list;
+static threshold crit = {80, 500000}, warn = {40, 200000};
+static int mode, protocols, sockets, debug = 0, timeout = 10;
+static unsigned short icmp_pkt_size, icmp_data_size = DEFAULT_PING_DATA_SIZE;
+static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0;
+#define icmp_pkts_en_route (icmp_sent - (icmp_recv + icmp_lost))
+static unsigned short targets_down = 0, targets = 0, packets = 0;
+#define targets_alive (targets - targets_down)
+static unsigned int retry_interval, pkt_interval, target_interval;
+static int icmp_sock, tcp_sock, udp_sock, status = STATE_OK;
+static pid_t pid;
+static struct timezone tz;
+static struct timeval prog_start;
+static unsigned long long max_completion_time = 0;
+static unsigned char ttl = 0;   /* outgoing ttl */
+static unsigned int warn_down = 1, crit_down = 1; /* host down threshold values */
+static int min_hosts_alive = -1;
+float pkt_backoff_factor = 1.5;
+float target_backoff_factor = 1.5;
+int tos=0;
+/** code start **/
+static void
+crash(const char *fmt, ...)
+{
+        va_list ap;
+
+        printf("%s: ", progname);
+
+        va_start(ap, fmt);
+        vprintf(fmt, ap);
+        va_end(ap);
+
+        if(errno) printf(": %s", strerror(errno));
+        puts("");
+
+        exit(3);
+}
+
+
+static char *
+get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code)
+{
+        char *msg = "unreachable";
+
+        if(debug > 1) printf("get_icmp_error_msg(%u, %u)\n", icmp_type, icmp_code);
+        switch(icmp_type) {
+        case ICMP_UNREACH:
+                switch(icmp_code) {
+                case ICMP_UNREACH_NET: msg = "Net unreachable"; break;
+                case ICMP_UNREACH_HOST: msg = "Host unreachable"; break;
+                case ICMP_UNREACH_PROTOCOL: msg = "Protocol unreachable (firewall?)"; break;
+                case ICMP_UNREACH_PORT: msg = "Port unreachable (firewall?)"; break;
+                case ICMP_UNREACH_NEEDFRAG: msg = "Fragmentation needed"; break;
+                case ICMP_UNREACH_SRCFAIL: msg = "Source route failed"; break;
+                case ICMP_UNREACH_ISOLATED: msg = "Source host isolated"; break;
+                case ICMP_UNREACH_NET_UNKNOWN: msg = "Unknown network"; break;
+                case ICMP_UNREACH_HOST_UNKNOWN: msg = "Unknown host"; break;
+                case ICMP_UNREACH_NET_PROHIB: msg = "Network denied (firewall?)"; break;
+                case ICMP_UNREACH_HOST_PROHIB: msg = "Host denied (firewall?)"; break;
+                case ICMP_UNREACH_TOSNET: msg = "Bad TOS for network (firewall?)"; break;
+                case ICMP_UNREACH_TOSHOST: msg = "Bad TOS for host (firewall?)"; break;
+                case ICMP_UNREACH_FILTER_PROHIB: msg = "Prohibited by filter (firewall)"; break;
+                case ICMP_UNREACH_HOST_PRECEDENCE: msg = "Host precedence violation"; break;
+                case ICMP_UNREACH_PRECEDENCE_CUTOFF: msg = "Precedence cutoff"; break;
+                default: msg = "Invalid code"; break;
+                }
+                break;
+
+        case ICMP_TIMXCEED:
+                /* really 'out of reach', or non-existant host behind a router serving
+                 * two different subnets */
+                switch(icmp_code) {
+                case ICMP_TIMXCEED_INTRANS: msg = "Time to live exceeded in transit"; break;
+                case ICMP_TIMXCEED_REASS: msg = "Fragment reassembly time exceeded"; break;
+                default: msg = "Invalid code"; break;
+                }
+                break;
+
+        case ICMP_SOURCEQUENCH: msg = "Transmitting too fast"; break;
+        case ICMP_REDIRECT: msg = "Redirect (change route)"; break;
+        case ICMP_PARAMPROB: msg = "Bad IP header (required option absent)"; break;
+
+                /* the following aren't error messages, so ignore */
+        case ICMP_TSTAMP:
+        case ICMP_TSTAMPREPLY:
+        case ICMP_IREQ:
+        case ICMP_IREQREPLY:
+        case ICMP_MASKREQ:
+        case ICMP_MASKREPLY:
+        default: msg = ""; break;
+        }
+
+        return msg;
+}
+
+static int
+handle_random_icmp(struct icmp *p, struct sockaddr_in *addr)
+{
+        struct icmp sent_icmp;
+        struct rta_host *host = NULL;
+        unsigned char *ptr;
+
+        if(p->icmp_type == ICMP_ECHO && p->icmp_id == pid) {
+                /* echo request from us to us (pinging localhost) */
+                return 0;
+        }
+
+        ptr = (unsigned char *)p;
+        if(debug) printf("handle_random_icmp(%p, %p)\n", (void *)p, (void *)addr);
+
+        /* only handle a few types, since others can't possibly be replies to
+         * us in a sane network (if it is anyway, it will be counted as lost
+         * at summary time, but not as quickly as a proper response */
+        /* TIMXCEED can be an unreach from a router with multiple IP's which
+         * serves two different subnets on the same interface and a dead host
+         * on one net is pinged from the other. The router will respond to
+         * itself and thus set TTL=0 so as to not loop forever.  Even when
+         * TIMXCEED actually sends a proper icmp response we will have passed
+         * too many hops to have a hope of reaching it later, in which case it
+         * indicates overconfidence in the network, poor routing or both. */
+        if(p->icmp_type != ICMP_UNREACH && p->icmp_type != ICMP_TIMXCEED &&
+           p->icmp_type != ICMP_SOURCEQUENCH && p->icmp_type != ICMP_PARAMPROB)
+        {
+                return 0;
+        }
+
+        /* might be for us. At least it holds the original package (according
+         * to RFC 792). If it isn't, just ignore it */
+        memcpy(&sent_icmp, ptr + 28, sizeof(sent_icmp));
+        if(sent_icmp.icmp_type != ICMP_ECHO || sent_icmp.icmp_id != pid ||
+           sent_icmp.icmp_seq >= targets)
+        {
+                if(debug) printf("Packet is no response to a packet we sent\n");
+                return 0;
+        }
+
+        /* it is indeed a response for us */
+        host = table[sent_icmp.icmp_seq];
+        if(debug) {
+                printf("Received \"%s\" from %s for ICMP ECHO sent to %s.\n",
+                           get_icmp_error_msg(p->icmp_type, p->icmp_code),
+                           inet_ntoa(addr->sin_addr), host->name);
+        }
+
+        icmp_lost++;
+        host->icmp_lost++;
+        /* don't spend time on lost hosts any more */
+        if(host->flags & FLAG_LOST_CAUSE) return 0;
+
+        /* source quench means we're sending too fast, so increase the
+         * interval and mark this packet lost */
+        if(p->icmp_type == ICMP_SOURCEQUENCH) {
+                pkt_interval *= pkt_backoff_factor;
+                target_interval *= target_backoff_factor;
+        }
+        else {
+                targets_down++;
+                host->flags |= FLAG_LOST_CAUSE;
+        }
+        host->icmp_type = p->icmp_type;
+        host->icmp_code = p->icmp_code;
+        host->error_addr.s_addr = addr->sin_addr.s_addr;
+
+        return 0;
+}
+
+int
+main(int argc, char **argv)
+{
+        int i;
+        char *ptr;
+        long int arg;
+        int icmp_sockerrno, udp_sockerrno, tcp_sockerrno;
+        int result;
+        struct rta_host *host;
+
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+        
+        /* print a helpful error message if geteuid != 0 */
+        np_warn_if_not_root();
+
+        /* we only need to be setsuid when we get the sockets, so do
+         * that before pointer magic (esp. on network data) */
+        icmp_sockerrno = udp_sockerrno = tcp_sockerrno = sockets = 0;
+
+        if((icmp_sock = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP)) != -1)
+                sockets |= HAVE_ICMP;
+        else icmp_sockerrno = errno;
+
+        /* if((udp_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) != -1) */
+        /*      sockets |= HAVE_UDP; */
+        /* else udp_sockerrno = errno; */
+
+        /* if((tcp_sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) != -1) */
+        /*      sockets |= HAVE_TCP; */
+        /* else tcp_sockerrno = errno; */
+
+        /* now drop privileges (no effect if not setsuid or geteuid() == 0) */
+        setuid(getuid());
+
+        /* POSIXLY_CORRECT might break things, so unset it (the portable way) */
+        environ = NULL;
+
+        /* use the pid to mark packets as ours */
+        /* Some systems have 32-bit pid_t so mask off only 16 bits */
+        pid = getpid() & 0xffff;
+        /* printf("pid = %u\n", pid); */
+
+        /* get calling name the old-fashioned way for portability instead
+         * of relying on the glibc-ism __progname */
+        ptr = strrchr(argv[0], '/');
+        if(ptr) progname = &ptr[1];
+        else progname = argv[0];
+
+        /* now set defaults. Use progname to set them initially (allows for
+         * superfast check_host program when target host is up */
+        cursor = list = NULL;
+        table = NULL;
+
+        mode = MODE_RTA;
+        crit.rta = 500000;
+        crit.pl = 80;
+        warn.rta = 200000;
+        warn.pl = 40;
+        protocols = HAVE_ICMP | HAVE_UDP | HAVE_TCP;
+        pkt_interval = 80000;  /* 80 msec packet interval by default */
+        packets = 5;
+
+        if(!strcmp(progname, "check_icmp") || !strcmp(progname, "check_ping")) {
+                mode = MODE_ICMP;
+                protocols = HAVE_ICMP;
+        }
+        else if(!strcmp(progname, "check_host")) {
+                mode = MODE_HOSTCHECK;
+                pkt_interval = 1000000;
+                packets = 5;
+                crit.rta = warn.rta = 1000000;
+                crit.pl = warn.pl = 100;
+        }
+        else if(!strcmp(progname, "check_rta_multi")) {
+                mode = MODE_ALL;
+                target_interval = 0;
+                pkt_interval = 50000;
+                packets = 5;
+        }
+
+        /* parse the arguments */
+        for(i = 1; i < argc; i++) {
+                while((arg = getopt(argc, argv, "vhVw:c:n:p:t:H:i:b:I:l:m:T:")) != EOF) {
+                        switch(arg) {
+                        case 'T':
+                                //tos = strtoul(optarg, NULL, 0);
+                                sscanf(optarg,"%x",&tos);
+                                if (tos > 0xff){
+                                        crash("value of -T must not be greater than 0xFF\n");
+                                }
+                                if(tos < 0){
+                                        crash("value of -T must be greater than 0x00\n");
+                                }
+                                //tos = xtoi(tos, NULL, 0);
+                        //      printf("\n%d\n",tos);
+                                break;
+                        case 'v':
+                                debug++;
+                                break;
+                        case 'b':
+                                /* silently ignored for now */
+                                break;
+                        case 'i':
+                                pkt_interval = get_timevar(optarg);
+                                break;
+                        case 'I':
+                                target_interval = get_timevar(optarg);
+                                break;
+                        case 'w':
+                                get_threshold(optarg, &warn);
+                                break;
+                        case 'c':
+                                get_threshold(optarg, &crit);
+                                break;
+                        case 'n':
+                        case 'p':
+                                packets = strtoul(optarg, NULL, 0);
+                                break;
+                        case 't':
+                                timeout = strtoul(optarg, NULL, 0);
+                                if(!timeout) timeout = 10;
+                                break;
+                        case 'H':
+                                add_target(optarg);
+                                break;
+                        case 'l':
+                                ttl = (unsigned char)strtoul(optarg, NULL, 0);
+                                break;
+                        case 'm':
+                                min_hosts_alive = (int)strtoul(optarg, NULL, 0);
+                                break;
+                        case 'd': /* implement later, for cluster checks */
+                                warn_down = (unsigned char)strtoul(optarg, &ptr, 0);
+                                if(ptr) {
+                                        crit_down = (unsigned char)strtoul(ptr + 1, NULL, 0);
+                                }
+                                break;
+      case 'V':                 /* version */
+        /*print_revision (progname, revision);*/ /* FIXME: Why? */
+        exit (STATE_OK);
+      case 'h':                 /* help */
+        print_help ();
+        exit (STATE_OK);
+                        }
+                }
+        }
+
+        argv = &argv[optind];
+        while(*argv) {
+                add_target(*argv);
+                argv++;
+        }
+        if(!targets) {
+                errno = 0;
+                crash("No hosts to check");
+                exit(3);
+        }
+
+        if(!sockets) {
+                if(icmp_sock == -1) {
+                        errno = icmp_sockerrno;
+                        crash("Failed to obtain ICMP socket");
+                        return -1;
+                }
+                /* if(udp_sock == -1) { */
+                /*      errno = icmp_sockerrno; */
+                /*      crash("Failed to obtain UDP socket"); */
+                /*      return -1; */
+                /* } */
+                /* if(tcp_sock == -1) { */
+                /*      errno = icmp_sockerrno; */
+                /*      crash("Failed to obtain TCP socker"); */
+                /*      return -1; */
+                /* } */
+        }
+        if(!ttl) ttl = 64;
+
+        if(icmp_sock) {
+                result = setsockopt(icmp_sock, SOL_IP, IP_TTL, &ttl, sizeof(ttl));
+                if(debug) {
+                        if(result == -1) printf("setsockopt failed\n");
+                        else printf("ttl set to %u\n", ttl);
+                }
+        }
+        if(tos > 0) {
+                result = setsockopt(icmp_sock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos));
+        }
+        /* stupid users should be able to give whatever thresholds they want
+         * (nothing will break if they do), but some anal plugin maintainer
+         * will probably add some printf() thing here later, so it might be
+         * best to at least show them where to do it. ;) */
+        if(warn.pl > crit.pl) warn.pl = crit.pl;
+        if(warn.rta > crit.rta) warn.rta = crit.rta;
+        if(warn_down > crit_down) crit_down = warn_down;
+
+        signal(SIGINT, finish);
+        signal(SIGHUP, finish);
+        signal(SIGTERM, finish);
+        signal(SIGALRM, finish);
+        if(debug) printf("Setting alarm timeout to %u seconds\n", timeout);
+        alarm(timeout);
+
+        /* make sure we don't wait any longer than necessary */
+        gettimeofday(&prog_start, &tz);
+        max_completion_time =
+                ((targets * packets * pkt_interval) + (targets * target_interval)) +
+                (targets * packets * crit.rta) + crit.rta;
+
+        if(debug) {
+                printf("packets: %u, targets: %u\n"
+                           "target_interval: %0.3f, pkt_interval %0.3f\n"
+                           "crit.rta: %0.3f\n"
+                           "max_completion_time: %0.3f\n",
+                           packets, targets,
+                           (float)target_interval / 1000, (float)pkt_interval / 1000,
+                           (float)crit.rta / 1000,
+                           (float)max_completion_time / 1000);
+        }
+
+        if(debug) {
+                if(max_completion_time > (u_int)timeout * 1000000) {
+                        printf("max_completion_time: %llu  timeout: %u\n",
+                                   max_completion_time, timeout);
+                        printf("Timout must be at lest %llu\n",
+                                   max_completion_time / 1000000 + 1);
+                }
+        }
+
+        icmp_pkt_size = icmp_data_size + ICMP_MINLEN;
+        if(debug > 2) printf("icmp_pkt_size = %u\n", icmp_pkt_size);
+        if(icmp_pkt_size < sizeof(struct icmp) + sizeof(struct icmp_ping_data)) {
+                icmp_pkt_size = sizeof(struct icmp) + sizeof(struct icmp_ping_data);
+        }
+        if(debug > 2) printf("icmp_pkt_size = %u\n", icmp_pkt_size);
+
+        if(debug) {
+                printf("crit = {%u, %u%%}, warn = {%u, %u%%}\n",
+                           crit.rta, crit.pl, warn.rta, warn.pl);
+                printf("pkt_interval: %u  target_interval: %u  retry_interval: %u\n",
+                           pkt_interval, target_interval, retry_interval);
+                printf("icmp_pkt_size: %u  timeout: %u\n",
+                           icmp_pkt_size, timeout);
+        }
+
+        if(packets > 20) {
+                errno = 0;
+                crash("packets is > 20 (%d)", packets);
+        }
+
+        if(min_hosts_alive < -1) {
+                errno = 0;
+                crash("minimum alive hosts is negative (%i)", min_hosts_alive);
+        }
+
+        host = list;
+        table = malloc(sizeof(struct rta_host **) * (argc - 1));
+        i = 0;
+        while(host) {
+                host->id = i;
+                table[i] = host;
+                host = host->next;
+                i++;
+        }
+
+        run_checks();
+
+        errno = 0;
+        finish(0);
+
+        return(0);
+}
+
+static void
+run_checks()
+{
+        u_int i, t, result;
+        u_int final_wait, time_passed;
+
+        /* this loop might actually violate the pkt_interval or target_interval
+         * settings, but only if there aren't any packets on the wire which
+         * indicates that the target can handle an increased packet rate */
+        for(i = 0; i < packets; i++) {
+                for(t = 0; t < targets; t++) {
+                        /* don't send useless packets */
+                        if(!targets_alive) finish(0);
+                        if(table[t]->flags & FLAG_LOST_CAUSE) {
+                                if(debug) printf("%s is a lost cause. not sending any more\n",
+                                                                 table[t]->name);
+                                continue;
+                        }
+                        
+                        /* we're still in the game, so send next packet */
+                        (void)send_icmp_ping(icmp_sock, table[t]);
+                        result = wait_for_reply(icmp_sock, target_interval);
+                }
+                result = wait_for_reply(icmp_sock, pkt_interval * targets);
+        }
+
+        if(icmp_pkts_en_route && targets_alive) {
+                time_passed = get_timevaldiff(NULL, NULL);
+                final_wait = max_completion_time - time_passed;
+
+                if(debug) {
+                        printf("time_passed: %u  final_wait: %u  max_completion_time: %llu\n",
+                                   time_passed, final_wait, max_completion_time);
+                }
+                if(time_passed > max_completion_time) {
+                        if(debug) printf("Time passed. Finishing up\n");
+                        finish(0);
+                }
+
+                /* catch the packets that might come in within the timeframe, but
+                 * haven't yet */
+                if(debug) printf("Waiting for %u micro-seconds (%0.3f msecs)\n",
+                                                 final_wait, (float)final_wait / 1000);
+                result = wait_for_reply(icmp_sock, final_wait);
+        }
+}
+
+/* response structure:
+ * ip header   : 20 bytes
+ * icmp header : 28 bytes
+ * icmp echo reply : the rest
+ */
+static int
+wait_for_reply(int sock, u_int t)
+{
+        int n, hlen;
+        static char buf[4096];
+        struct sockaddr_in resp_addr;
+        struct ip *ip;
+        struct icmp icp;
+        struct rta_host *host;
+        struct icmp_ping_data data;
+        struct timeval wait_start, now;
+        u_int tdiff, i, per_pkt_wait;
+
+        /* if we can't listen or don't have anything to listen to, just return */
+        if(!t || !icmp_pkts_en_route) return 0;
+
+        gettimeofday(&wait_start, &tz);
+
+        i = t;
+        per_pkt_wait = t / icmp_pkts_en_route;
+        while(icmp_pkts_en_route && get_timevaldiff(&wait_start, NULL) < i) {
+                t = per_pkt_wait;
+
+                /* wrap up if all targets are declared dead */
+                if(!targets_alive ||
+                   get_timevaldiff(&prog_start, NULL) >= max_completion_time ||
+                   (mode == MODE_HOSTCHECK && targets_down))
+                {
+                        finish(0);
+                }
+
+                /* reap responses until we hit a timeout */
+                n = recvfrom_wto(sock, buf, sizeof(buf),
+                                                 (struct sockaddr *)&resp_addr, &t);
+                if(!n) {
+                        if(debug > 1) {
+                                printf("recvfrom_wto() timed out during a %u usecs wait\n",
+                                           per_pkt_wait);
+                        }
+                        continue;       /* timeout for this one, so keep trying */
+                }
+                if(n < 0) {
+                        if(debug) printf("recvfrom_wto() returned errors\n");
+                        return n;
+                }
+
+                ip = (struct ip *)buf;
+                if(debug > 1) printf("received %u bytes from %s\n",
+                                                 ntohs(ip->ip_len), inet_ntoa(resp_addr.sin_addr));
+
+/* obsolete. alpha on tru64 provides the necessary defines, but isn't broken */
+/* #if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) */
+                /* alpha headers are decidedly broken. Using an ansi compiler,
+                 * they provide ip_vhl instead of ip_hl and ip_v, so we mask
+                 * off the bottom 4 bits */
+/*              hlen = (ip->ip_vhl & 0x0f) << 2; */
+/* #else */
+                hlen = ip->ip_hl << 2;
+/* #endif */
+
+                if(n < (hlen + ICMP_MINLEN)) {
+                        crash("received packet too short for ICMP (%d bytes, expected %d) from %s\n",
+                                  n, hlen + icmp_pkt_size, inet_ntoa(resp_addr.sin_addr));
+                }
+                /* else if(debug) { */
+                /*      printf("ip header size: %u, packet size: %u (expected %u, %u)\n", */
+                /*                 hlen, ntohs(ip->ip_len) - hlen, */
+                /*                 sizeof(struct ip), icmp_pkt_size); */
+                /* } */
+
+                /* check the response */
+                memcpy(&icp, buf + hlen, sizeof(icp));
+
+                if(icp.icmp_id != pid) {
+                        handle_random_icmp(&icp, &resp_addr);
+                        continue;
+                }
+
+                if(icp.icmp_type != ICMP_ECHOREPLY || icp.icmp_seq >= targets) {
+                        if(debug > 2) printf("not a proper ICMP_ECHOREPLY\n");
+                        handle_random_icmp(&icp, &resp_addr);
+                        continue;
+                }
+
+                /* this is indeed a valid response */
+                memcpy(&data, icp.icmp_data, sizeof(data));
+
+                host = table[icp.icmp_seq];
+                gettimeofday(&now, &tz);
+                tdiff = get_timevaldiff(&data.stime, &now);
+
+                host->time_waited += tdiff;
+                host->icmp_recv++;
+                icmp_recv++;
+
+                if(debug) {
+                        printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u\n",
+                                   (float)tdiff / 1000, inet_ntoa(resp_addr.sin_addr),
+                                   ttl, ip->ip_ttl);
+                }
+
+                /* if we're in hostcheck mode, exit with limited printouts */
+                if(mode == MODE_HOSTCHECK) {
+                        printf("OK - %s responds to ICMP. Packet %u, rta %0.3fms|"
+                                   "pkt=%u;;0;%u rta=%0.3f;%0.3f;%0.3f;;\n",
+                                   host->name, icmp_recv, (float)tdiff / 1000,
+                                   icmp_recv, packets, (float)tdiff / 1000,
+                                   (float)warn.rta / 1000, (float)crit.rta / 1000);
+                        exit(STATE_OK);
+                }
+        }
+
+        return 0;
+}
+
+/* the ping functions */
+static int
+send_icmp_ping(int sock, struct rta_host *host)
+{
+        static union {
+                char *buf; /* re-use so we prevent leaks */
+                struct icmp *icp;
+                u_short *cksum_in;
+        } packet = { NULL };
+        long int len;
+        struct icmp_ping_data data;
+        struct timeval tv;
+        struct sockaddr *addr;
+
+        if(sock == -1) {
+                errno = 0;
+                crash("Attempt to send on bogus socket");
+                return -1;
+        }
+        addr = (struct sockaddr *)&host->saddr_in;
+
+        if(!packet.buf) {
+                if (!(packet.buf = malloc(icmp_pkt_size))) {
+                        crash("send_icmp_ping(): failed to malloc %d bytes for send buffer",
+                                  icmp_pkt_size);
+                        return -1;      /* might be reached if we're in debug mode */
+                }
+        }
+        memset(packet.buf, 0, icmp_pkt_size);
+
+        if((gettimeofday(&tv, &tz)) == -1) return -1;
+
+        data.ping_id = 10; /* host->icmp.icmp_sent; */
+        memcpy(&data.stime, &tv, sizeof(tv));
+        memcpy(&packet.icp->icmp_data, &data, sizeof(data));
+        packet.icp->icmp_type = ICMP_ECHO;
+        packet.icp->icmp_code = 0;
+        packet.icp->icmp_cksum = 0;
+        packet.icp->icmp_id = pid;
+        packet.icp->icmp_seq = host->id;
+        packet.icp->icmp_cksum = icmp_checksum(packet.cksum_in, icmp_pkt_size);
+
+        len = sendto(sock, packet.buf, icmp_pkt_size, 0, (struct sockaddr *)addr,
+                                 sizeof(struct sockaddr));
+
+        if(len < 0 || (unsigned int)len != icmp_pkt_size) {
+                if(debug) printf("Failed to send ping to %s\n",
+                                                 inet_ntoa(host->saddr_in.sin_addr));
+                return -1;
+        }
+
+        icmp_sent++;
+        host->icmp_sent++;
+
+        return 0;
+}
+
+static int
+recvfrom_wto(int sock, char *buf, unsigned int len, struct sockaddr *saddr,
+                         u_int *timo)
+{
+        u_int slen;
+        int n;
+        struct timeval to, then, now;
+        fd_set rd, wr;
+
+        if(!*timo) {
+                if(debug) printf("*timo is not\n");
+                return 0;
+        }
+
+        to.tv_sec = *timo / 1000000;
+        to.tv_usec = (*timo - (to.tv_sec * 1000000));
+
+        FD_ZERO(&rd);
+        FD_ZERO(&wr);
+        FD_SET(sock, &rd);
+        errno = 0;
+        gettimeofday(&then, &tz);
+        n = select(sock + 1, &rd, &wr, NULL, &to);
+        if(n < 0) crash("select() in recvfrom_wto");
+        gettimeofday(&now, &tz);
+        *timo = get_timevaldiff(&then, &now);
+
+        if(!n) return 0;                                /* timeout */
+
+        slen = sizeof(struct sockaddr);
+
+        return recvfrom(sock, buf, len, 0, saddr, &slen);
+}
+
+static void
+finish(int sig)
+{
+        u_int i = 0;
+        unsigned char pl;
+        double rta;
+        struct rta_host *host;
+        char *status_string[] =
+        {"OK", "WARNING", "CRITICAL", "UNKNOWN", "DEPENDENT"};
+        int hosts_ok = 0;
+        int hosts_warn = 0;
+
+        alarm(0);
+        if(debug > 1) printf("finish(%d) called\n", sig);
+
+        if(icmp_sock != -1) close(icmp_sock);
+        if(udp_sock != -1) close(udp_sock);
+        if(tcp_sock != -1) close(tcp_sock);
+
+        if(debug) {
+                printf("icmp_sent: %u  icmp_recv: %u  icmp_lost: %u\n",
+                           icmp_sent, icmp_recv, icmp_lost);
+                printf("targets: %u  targets_alive: %u\n", targets, targets_alive);
+        }
+
+        /* iterate thrice to calculate values, give output, and print perfparse */
+        host = list;
+        while(host) {
+                if(!host->icmp_recv) {
+                        /* rta 0 is ofcourse not entirely correct, but will still show up
+                         * conspicuosly as missing entries in perfparse and cacti */
+                        pl = 100;
+                        rta = 0;
+                        status = STATE_CRITICAL;
+                        /* up the down counter if not already counted */
+                        if(!(host->flags & FLAG_LOST_CAUSE) && targets_alive) targets_down++;
+                }
+                else {
+                        pl = ((host->icmp_sent - host->icmp_recv) * 100) / host->icmp_sent;
+                        rta = (double)host->time_waited / host->icmp_recv;
+                }
+                host->pl = pl;
+                host->rta = rta;
+                if(pl >= crit.pl || rta >= crit.rta) {
+                        status = STATE_CRITICAL;
+                }
+                else if(!status && (pl >= warn.pl || rta >= warn.rta)) {
+                        status = STATE_WARNING;
+                        hosts_warn++;
+                }
+                else {
+                        hosts_ok++;
+                }
+
+                host = host->next;
+        }
+        /* this is inevitable */
+        if(!targets_alive) status = STATE_CRITICAL;
+        if(min_hosts_alive > -1) {
+                if(hosts_ok >= min_hosts_alive) status = STATE_OK;
+                else if((hosts_ok + hosts_warn) >= min_hosts_alive) status = STATE_WARNING;
+        }
+        printf("%s - ", status_string[status]);
+
+        host = list;
+        while(host) {
+                if(debug) puts("");
+                if(i) {
+                        if(i < targets) printf(" :: ");
+                        else printf("\n");
+                }
+                i++;
+                if(!host->icmp_recv) {
+                        status = STATE_CRITICAL;
+                        if(host->flags & FLAG_LOST_CAUSE) {
+                                printf("%s: %s @ %s. rta nan, lost %d%%",
+                                           host->name,
+                                           get_icmp_error_msg(host->icmp_type, host->icmp_code),
+                                           inet_ntoa(host->error_addr),
+                                           100);
+                        }
+                        else { /* not marked as lost cause, so we have no flags for it */
+                                printf("%s: rta nan, lost 100%%", host->name);
+                        }
+                }
+                else {  /* !icmp_recv */
+                        printf("%s: rta %0.3fms, lost %u%%",
+                                   host->name, host->rta / 1000, host->pl);
+                }
+
+                host = host->next;
+        }
+
+        /* iterate once more for pretty perfparse output */
+        printf("|");
+        i = 0;
+        host = list;
+        while(host) {
+                if(debug) puts("");
+                printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; ",
+                           (targets > 1) ? host->name : "",
+                           host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
+                           (targets > 1) ? host->name : "",
+                           host->pl, warn.pl, crit.pl);
+
+                host = host->next;
+        }
+
+        if(min_hosts_alive > -1) {
+                if(hosts_ok >= min_hosts_alive) status = STATE_OK;
+                else if((hosts_ok + hosts_warn) >= min_hosts_alive) status = STATE_WARNING;
+        }
+
+        /* finish with an empty line */
+        puts("");
+        if(debug) printf("targets: %u, targets_alive: %u, hosts_ok: %u, hosts_warn: %u, min_hosts_alive: %i\n",
+                                         targets, targets_alive, hosts_ok, hosts_warn, min_hosts_alive);
+
+        exit(status);
+}
+
+static u_int
+get_timevaldiff(struct timeval *early, struct timeval *later)
+{
+        u_int ret;
+        struct timeval now;
+
+        if(!later) {
+                gettimeofday(&now, &tz);
+                later = &now;
+        }
+        if(!early) early = &prog_start;
+
+        /* if early > later we return 0 so as to indicate a timeout */
+        if(early->tv_sec > early->tv_sec ||
+           (early->tv_sec == later->tv_sec && early->tv_usec > later->tv_usec))
+        {
+                return 0;
+        }
+
+        ret = (later->tv_sec - early->tv_sec) * 1000000;
+        ret += later->tv_usec - early->tv_usec;
+
+        return ret;
+}
+
+static int
+add_target_ip(char *arg, struct in_addr *in)
+{
+        struct rta_host *host;
+
+        /* disregard obviously stupid addresses */
+        if(in->s_addr == INADDR_NONE || in->s_addr == INADDR_ANY)
+                return -1;
+
+        /* no point in adding two identical IP's, so don't. ;) */
+        host = list;
+        while(host) {
+                if(host->saddr_in.sin_addr.s_addr == in->s_addr) {
+                        if(debug) printf("Identical IP already exists. Not adding %s\n", arg);
+                        return -1;
+                }
+                host = host->next;
+        }
+
+        /* add the fresh ip */
+        host = malloc(sizeof(struct rta_host));
+        if(!host) {
+                crash("add_target_ip(%s, %s): malloc(%d) failed",
+                          arg, inet_ntoa(*in), sizeof(struct rta_host));
+        }
+        memset(host, 0, sizeof(struct rta_host));
+
+        /* set the values. use calling name for output */
+        host->name = strdup(arg);
+
+        /* fill out the sockaddr_in struct */
+        host->saddr_in.sin_family = AF_INET;
+        host->saddr_in.sin_addr.s_addr = in->s_addr;
+
+        if(!list) list = cursor = host;
+        else cursor->next = host;
+
+        cursor = host;
+        targets++;
+
+        return 0;
+}
+
+/* wrapper for add_target_ip */
+static int
+add_target(char *arg)
+{
+        int i;
+        struct hostent *he;
+        struct in_addr *in, ip;
+
+        /* don't resolve if we don't have to */
+        if((ip.s_addr = inet_addr(arg)) != INADDR_NONE) {
+                /* don't add all ip's if we were given a specific one */
+                return add_target_ip(arg, &ip);
+                /* he = gethostbyaddr((char *)in, sizeof(struct in_addr), AF_INET); */
+                /* if(!he) return add_target_ip(arg, in); */
+        }
+        else {
+                errno = 0;
+                he = gethostbyname(arg);
+                if(!he) {
+                        errno = 0;
+                        crash("Failed to resolve %s", arg);
+                        return -1;
+                }
+        }
+
+        /* possibly add all the IP's as targets */
+        for(i = 0; he->h_addr_list[i]; i++) {
+                in = (struct in_addr *)he->h_addr_list[i];
+                add_target_ip(arg, in);
+
+                /* this is silly, but it works */
+                if(mode == MODE_HOSTCHECK || mode == MODE_ALL) {
+                        printf("mode: %d\n", mode);
+                        continue;
+                }
+                break;
+        }
+
+        return 0;
+}
+/*
+ * u = micro
+ * m = milli
+ * s = seconds
+ * return value is in microseconds
+ */
+static u_int
+get_timevar(const char *str)
+{
+        char p, u, *ptr;
+        unsigned int len;
+        u_int i, d;                 /* integer and decimal, respectively */
+        u_int factor = 1000;    /* default to milliseconds */
+
+        if(!str) return 0;
+        len = strlen(str);
+        if(!len) return 0;
+
+        /* unit might be given as ms|m (millisec),
+         * us|u (microsec) or just plain s, for seconds */
+        u = p = '\0';
+        u = str[len - 1];
+        if(len >= 2 && !isdigit((int)str[len - 2])) p = str[len - 2];
+        if(p && u == 's') u = p;
+        else if(!p) p = u;
+        if(debug > 2) printf("evaluating %s, u: %c, p: %c\n", str, u, p);
+
+        if(u == 'u') factor = 1;            /* microseconds */
+        else if(u == 'm') factor = 1000;        /* milliseconds */
+        else if(u == 's') factor = 1000000;     /* seconds */
+        if(debug > 2) printf("factor is %u\n", factor);
+
+        i = strtoul(str, &ptr, 0);
+        if(!ptr || *ptr != '.' || strlen(ptr) < 2 || factor == 1)
+                return i * factor;
+
+        /* time specified in usecs can't have decimal points, so ignore them */
+        if(factor == 1) return i;
+
+        d = strtoul(ptr + 1, NULL, 0);
+
+        /* d is decimal, so get rid of excess digits */
+        while(d >= factor) d /= 10;
+
+        /* the last parenthesis avoids floating point exceptions. */
+        return ((i * factor) + (d * (factor / 10)));
+}
+
+/* not too good at checking errors, but it'll do (main() should barfe on -1) */
+static int
+get_threshold(char *str, threshold *th)
+{
+        char *p = NULL, i = 0;
+
+        if(!str || !strlen(str) || !th) return -1;
+
+        /* pointer magic slims code by 10 lines. i is bof-stop on stupid libc's */
+        p = &str[strlen(str) - 1];
+        while(p != &str[1]) {
+                if(*p == '%') *p = '\0';
+                else if(*p == ',' && i) {
+                        *p = '\0';      /* reset it so get_timevar(str) works nicely later */
+                        th->pl = (unsigned char)strtoul(p+1, NULL, 0);
+                        break;
+                }
+                i = 1;
+                p--;
+        }
+        th->rta = get_timevar(str);
+
+        if(!th->rta) return -1;
+
+        if(th->rta > MAXTTL * 1000000) th->rta = MAXTTL * 1000000;
+        if(th->pl > 100) th->pl = 100;
+
+        return 0;
+}
+
+unsigned short
+icmp_checksum(unsigned short *p, int n)
+{
+        register unsigned short cksum;
+        register long sum = 0;
+
+        while(n > 1) {
+                sum += *p++;
+                n -= 2;
+        }
+
+        /* mop up the occasional odd byte */
+        if(n == 1) sum += (unsigned char)*p;
+
+        sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
+        sum += (sum >> 16);                     /* add carry */
+        cksum = ~sum;                           /* ones-complement, trunc to 16 bits */
+
+        return cksum;
+}
+
+void
+print_help(void)
+{
+
+  /*print_revision (progname, revision);*/ /* FIXME: Why? */
+  
+  printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
+  printf (COPYRIGHT, copyright, email);
+  
+  printf ("\n\n");
+  
+  print_usage ();
+  
+  printf (_(UT_HELP_VRSN));
+  
+  printf (" %s\n", "-H");
+  printf ("    %s\n", _("specify a target"));
+  printf (" %s\n", "-w");
+  printf ("    %s", _("warning threshold (currently "));
+  printf ("%0.3fms,%u%%)\n", (float)warn.rta / 1000 , warn.pl / 1000);
+  printf (" %s\n", "-c");
+  printf ("    %s", _("critical threshold (currently "));
+  printf ("%0.3fms,%u%%)\n", (float)crit.rta, crit.pl);
+  printf (" %s\n", "-n");
+  printf ("    %s", _("number of packets to send (currently "));
+  printf ("%u)\n",packets);
+  printf (" %s\n", "-i");
+  printf ("    %s", _("max packet interval (currently "));
+  printf ("%0.3fms)\n",(float)pkt_interval / 1000);
+  printf (" %s\n", "-I");
+  printf ("    %s", _("max target interval (currently "));
+  printf ("%0.3fms)\n", (float)target_interval / 1000);
+  printf (" %s\n", "-m");
+  printf ("    %s",_("number of alive hosts required for success"));
+  printf ("\n");
+  printf (" %s\n", "-l");
+  printf ("    %s", _("TTL on outgoing packets (currently "));
+  printf ("%u)", ttl);
+  printf (" %s\n", "-t");
+  printf ("    %s",_("timeout value (seconds, currently  "));
+  printf ("%u)\n", timeout);
+  printf (" %s\n", "-b");
+  printf ("    %s\n", _("icmp packet size (currenly ignored)"));
+  printf (" -T\n    set TOS in Hex\n"); 
+  printf (" %s\n", "-v");
+  printf ("    %s\n", _("verbose"));
+
+  printf ("\n");
+        printf ("%s\n\n", _("The -H switch is optional. Naming a host (or several) to check is not."));
+  printf ("%s\n", _("Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"));
+  printf ("%s\n", _("packet loss.  The default values should work well for most users."));
+  printf ("%s\n", _("You can specify different RTA factors using the standardized abbreviations"));
+  printf ("%s\n\n", _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
+/* -d not yet implemented */
+/*  printf ("%s\n", _("Threshold format for -d is warn,crit.  12,14 means WARNING if >= 12 hops"));
+  printf ("%s\n", _("are spent and CRITICAL if >= 14 hops are spent."));
+  printf ("%s\n\n", _("NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not."));*/
+  printf ("%s\n\n", _("The -v switch can be specified several times for increased verbosity."));
+
+/*  printf ("%s\n", _("Long options are currently unsupported."));
+  printf ("%s\n", _("Options marked with * require an argument"));
+*/
+  printf (_(UT_SUPPORT));
+  
+  printf (_(UT_NOWARRANTY));
+}
+
+
+
+void
+print_usage (void)
+{
+  printf (_("Usage:"));
+  printf(" %s [options] [-H] host1 host2 hostn\n", progname);
+}
diff --git a/web/attachments/284178-34_fix_smbclient_check_disk_smb.dpatch b/web/attachments/284178-34_fix_smbclient_check_disk_smb.dpatch
new file mode 100644
index 0000000..0e53eb1
--- /dev/null
+++ b/web/attachments/284178-34_fix_smbclient_check_disk_smb.dpatch
@@ -0,0 +1,138 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 34_fix_smbclient_check_disk_smb.dpatch by Jan Wagner <waja@cyconet.org>
+## patch provided by Stephane Chazelas <stephane@artesyncp.com>
+##
+## DP: Fixes use of smbclient
+
+@DPATCH@
+diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl
+--- nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl    2008-07-02 23:08:03.000000000 +0200
++++ nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl     2008-07-02 23:10:42.000000000 +0200
+@@ -26,17 +26,13 @@
+ use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose);
+ use vars qw($PROGNAME);
+ use lib utils.pm ;
+-use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
++use utils qw($TIMEOUT %ERRORS &print_revision &support &usage &output_and_error_of);
+ 
+ sub print_help ();
+ sub print_usage ();
+ 
+ $PROGNAME = "check_disk_smb";
+ 
+-$ENV{'PATH'}='';
+-$ENV{'BASH_ENV'}=''; 
+-$ENV{'ENV'}='';
+-
+ Getopt::Long::Configure('bundling');
+ GetOptions
+        ("v"   => \$verbose, "verbose"    => \$verbose,
+@@ -59,9 +55,7 @@
+ 
+ if ($opt_h) {print_help(); exit $ERRORS{'OK'};}
+ 
+-my $smbclient= "$utils::PATH_TO_SMBCLIENT " ;
+-my $smbclientoptions= $opt_P ? "-p $opt_P " : "";
+-
++my $smbclient = $utils::PATH_TO_SMBCLIENT;
+ 
+ # Options checking
+ 
+@@ -73,13 +67,12 @@
+ my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/);
+ ($share) || usage("Invalid share: $opt_s\n");
+ 
+-($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest");
+-my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/);
+-($user) || usage("Invalid user: $opt_u\n");
++defined($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest");
++my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]*)$/);
++defined($user) || usage("Invalid user: $opt_u\n");
+ 
+-($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = "");
++defined($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = "");
+ my $pass = $1 if ($opt_p =~ /(.*)/);
+-$pass = "-N" if ($opt_p eq "");
+ 
+ ($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 85);
+ my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
+@@ -163,23 +156,19 @@
+ 
+ # Execute an "ls" on the share using smbclient program
+ # get the results into $res
+-if (defined($workgroup)) {
+-       if (defined($address)) {
+-               print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls\n" if ($verbose);
+-               $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls/;
+-       } else {
+-               print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -c ls\n" if ($verbose);
+-               $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -c ls/;
+-       }
+-} else {
+-       if (defined($address)) {
+-               print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -I $address -c ls\n" if ($verbose);
+-               $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -I $address -c ls/;
+-       } else {
+-               print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
+-               $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -c ls/;
+-       }
+-}
++my @cmd = (
++  $smbclient,
++  "//$host/$share",
++  "-U", "$user%$pass",
++  defined($workgroup) ? ("-W", $workgroup) : (),
++  defined($address) ? ("-I", $address) : (),
++  defined($opt_P) ? ("-p", $opt_P) : (),
++  "-c", "ls"
++);
++
++print join(" ", @cmd) . "\n" if ($verbose);
++$res = output_and_error_of(@cmd) or exit $ERRORS{"UNKNOWN"};
++
+ #Turn off alarm
+ alarm(0);
+ 
+diff -urNad nagios-plugins-1.4.12~/plugins-scripts/utils.pm.in nagios-plugins-1.4.12/plugins-scripts/utils.pm.in
+--- nagios-plugins-1.4.12~/plugins-scripts/utils.pm.in  2007-07-07 13:55:48.000000000 +0200
++++ nagios-plugins-1.4.12/plugins-scripts/utils.pm.in   2008-07-02 23:08:04.000000000 +0200
+@@ -8,7 +8,8 @@
+ 
+ require Exporter;
+ @ISA = qw(Exporter);
+-@EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage);
++@EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage
++               &output_of &output_and_error_of);
+ 
+ #use strict;
+ #use vars($TIMEOUT %ERRORS);
+@@ -67,4 +68,29 @@
+        }
+ }
+ 
++sub output_of {
++       local *CMD;
++       local $/ = undef;
++       if (open CMD, "-|", @_) {
++               return <CMD>;
++               close CMD;
++       }
++       return undef;
++}
++
++sub output_and_error_of {
++       local *CMD;
++       local $/ = undef;
++       my $pid = open CMD, "-|";
++       if (defined($pid)) {
++               if ($pid) {
++                       return <CMD>;
++               } else {
++                       open STDERR, ">&STDOUT" and exec @_;
++                       exit(1);
++               }
++       }
++       return undef;
++}
++
+ 1;
diff --git a/web/attachments/289932-check_http.extented_status_codes.diff.2 b/web/attachments/289932-check_http.extented_status_codes.diff.2
new file mode 100644
index 0000000..a703883
--- /dev/null
+++ b/web/attachments/289932-check_http.extented_status_codes.diff.2
@@ -0,0 +1,78 @@
+Index: THANKS.in
+===================================================================
+--- THANKS.in   (revision 2045)
++++ THANKS.in   (working copy)
+@@ -237,3 +237,4 @@
+ Rob Windsor
+ Hilko Bengen
+ Michael Harris
++Sven Nierlein
+Index: NEWS
+===================================================================
+--- NEWS        (revision 2045)
++++ NEWS        (working copy)
+@@ -10,6 +10,7 @@
+        check_snmp now only prints perfdata for non numeric values (#1867716)
+        check_icmp now supports packet size modification
+        check_http now sends the Host header first to fix 301s on servers with vitrual hosts (Michael Harris).
++       check_http -e now accepts a comma-delimited list of expected status codes
+        libtap now included with this distribution for easier testing. Run ./configure with --enable-libtap
+ 
+ 1.4.12 27th May 2008
+Index: plugins/check_http.c
+===================================================================
+--- plugins/check_http.c        (revision 2045)
++++ plugins/check_http.c        (working copy)
+@@ -573,8 +573,22 @@
+   }
+ }
+ 
++/* Checks if the server 'reply' is one of the expected 'statuscodes' */
++static int
++expected_statuscode (const char *reply, const char *statuscodes)
++{
++  char *expected, *code;
+ 
++  if ((expected = strdup (statuscodes)) == NULL)
++    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+ 
++  for (code = strtok (expected, ","); code != NULL; code = strtok (NULL, ","))
++    if (strstr (reply, code) != NULL)
++      return 1;
++
++  return 0;
++}
++
+ static void
+ check_document_dates (const char *headers)
+ {
+@@ -878,14 +892,15 @@
+                 (no_body ? "  [[ skipped ]]" : page));
+ 
+   /* make sure the status line matches the response we are looking for */
+-  if (!strstr (status_line, server_expect)) {
++  if (!expected_statuscode (status_line, server_expect)) {
+     if (server_port == HTTP_PORT)
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host\n"));
++                _("Invalid HTTP response received from host: %s\n"),
++                status_line);
+     else
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host on port %d\n"),
+-                server_port);
++                _("Invalid HTTP response received from host on port %d: %s\n"),
++                server_port, status_line);
+     die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
+   }
+ 
+@@ -1262,7 +1277,8 @@
+ #endif
+ 
+   printf (" %s\n", "-e, --expect=STRING");
+-  printf ("    %s\n", _("String to expect in first (status) line of server response (default: "));
++  printf ("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
++  printf ("    %s\n", _("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", "-s, --string=STRING");
diff --git a/web/attachments/289944-check_http.extented_status_codes.diff.3 b/web/attachments/289944-check_http.extented_status_codes.diff.3
new file mode 100644
index 0000000..141e707
--- /dev/null
+++ b/web/attachments/289944-check_http.extented_status_codes.diff.3
@@ -0,0 +1,82 @@
+Index: THANKS.in
+===================================================================
+--- THANKS.in   (revision 2045)
++++ THANKS.in   (working copy)
+@@ -237,3 +237,4 @@
+ Rob Windsor
+ Hilko Bengen
+ Michael Harris
++Sven Nierlein
+Index: NEWS
+===================================================================
+--- NEWS        (revision 2045)
++++ NEWS        (working copy)
+@@ -10,6 +10,7 @@
+        check_snmp now only prints perfdata for non numeric values (#1867716)
+        check_icmp now supports packet size modification
+        check_http now sends the Host header first to fix 301s on servers with vitrual hosts (Michael Harris).
++       check_http -e now accepts a comma-delimited list of expected status codes
+        libtap now included with this distribution for easier testing. Run ./configure with --enable-libtap
+ 
+ 1.4.12 27th May 2008
+Index: plugins/check_http.c
+===================================================================
+--- plugins/check_http.c        (revision 2045)
++++ plugins/check_http.c        (working copy)
+@@ -573,8 +573,26 @@
+   }
+ }
+ 
++/* Checks if the server 'reply' is one of the expected 'statuscodes' */
++static int
++expected_statuscode (const char *reply, const char *statuscodes)
++{
++  char *expected, *code;
++  int result = 0;
+ 
++  if ((expected = strdup (statuscodes)) == NULL)
++    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+ 
++  for (code = strtok (expected, ","); code != NULL; code = strtok (NULL, ","))
++    if (strstr (reply, code) != NULL) {
++      result = 1;
++      break;
++    }
++
++  free (expected);
++  return result;
++}
++
+ static void
+ check_document_dates (const char *headers)
+ {
+@@ -878,14 +896,15 @@
+                 (no_body ? "  [[ skipped ]]" : page));
+ 
+   /* make sure the status line matches the response we are looking for */
+-  if (!strstr (status_line, server_expect)) {
++  if (!expected_statuscode (status_line, server_expect)) {
+     if (server_port == HTTP_PORT)
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host\n"));
++                _("Invalid HTTP response received from host: %s\n"),
++                status_line);
+     else
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host on port %d\n"),
+-                server_port);
++                _("Invalid HTTP response received from host on port %d: %s\n"),
++                server_port, status_line);
+     die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
+   }
+ 
+@@ -1262,7 +1281,8 @@
+ #endif
+ 
+   printf (" %s\n", "-e, --expect=STRING");
+-  printf ("    %s\n", _("String to expect in first (status) line of server response (default: "));
++  printf ("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
++  printf ("    %s\n", _("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", "-s, --string=STRING");
diff --git a/web/attachments/291715-nagios-plugins-1.4.12-ommit-default-port.patch b/web/attachments/291715-nagios-plugins-1.4.12-ommit-default-port.patch
new file mode 100644
index 0000000..c43e6ed
--- /dev/null
+++ b/web/attachments/291715-nagios-plugins-1.4.12-ommit-default-port.patch
@@ -0,0 +1,21 @@
+--- nagios-plugins-1.4.12-orig/plugins/check_http.c     2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12-ommit-default-port/plugins/check_http.c       2008-09-02 10:32:30.000000000 +0200
+@@ -753,7 +753,17 @@
+ 
+   /* optionally send the host header info */
+   if (host_name)
+-    asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port);
++  {
++    /* Ommit the server port if it's the standard port (80 for http and 443 for https). */
++    /* Some applications like wordpress do a redirect to a portless host if you named */
++    /* a portnumber like www.wordpress-thingy.invalid:80. It will redirect to */
++    /* www.wordpress-thingy.invalid and check_http adds the port number in the next */
++    /* http call again resulting in a "redirection creates an infinite loop" */
++    if ((use_ssl == false && server_port == HTTP_PORT) || (use_ssl == true && server_port == HTTPS_PORT))
++      asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
++    else
++      asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port);
++  }
+ 
+   /* optionally send any other header tag */
+   if (http_opt_headers_count) {
diff --git a/web/attachments/292902-patch.patch b/web/attachments/292902-patch.patch
new file mode 100644
index 0000000..32ea878
--- /dev/null
+++ b/web/attachments/292902-patch.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378823565" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378823565" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378823565" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378823565" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378823565');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2104167&group_id=29880&atid=397597&file_id=292902"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/292903-check_mssql.sh-errorfile_deletion-patch.txt b/web/attachments/292903-check_mssql.sh-errorfile_deletion-patch.txt
new file mode 100644
index 0000000..56eaedd
--- /dev/null
+++ b/web/attachments/292903-check_mssql.sh-errorfile_deletion-patch.txt
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-6 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378823564" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378823564" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378823564" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378823564" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378823564');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2104167&group_id=29880&atid=397597&file_id=292903"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/292904-check_mssql.sh-errorfile_deletion.patch b/web/attachments/292904-check_mssql.sh-errorfile_deletion.patch
new file mode 100644
index 0000000..1a882f9
--- /dev/null
+++ b/web/attachments/292904-check_mssql.sh-errorfile_deletion.patch
@@ -0,0 +1,17 @@
+--- check_mssql.sh.orig 2008-09-10 11:20:25.000000000 -0700
++++ check_mssql.sh      2008-09-10 11:20:48.000000000 -0700
+@@ -92,7 +92,7 @@
+ else
+        nmbr=`$catcmd $resultfile | $grepcmd -v locale | $grepcmd -v charset|
+$grepcmd -v 1\> | $sedcmd '/^$/d' | $sedcmd 's/ //g' | $wccmd -l | sed 's/
+//g'`
+        users=`$catcmd $resultfile | $grepcmd -v locale | $grepcmd -v charset|
+$grepcmd -v 1\> | $sedcmd '/^$/d' | $sedcmd 's/ //g' | $uniqcmd -c | $trcmd
+\\\n , | $sedcmd 's/,$/./g' | $sedcmd 's/,/, /g' | $sedcmd 's/  //g' | $trcmd
+\\\t " " | $sedcmd 's/ \./\./g' | $sedcmd 's/ ,/,/g'`
+-        $rmcmd -f $tmpfile $resultfile;
++        $rmcmd -f $tmpfile $resultfile $errorfile;
+         echo "OK - MS SQL Server $srv has $nmbr user(s) connected: $users" |
+sed 's/: $/./g';
+         exit 0;
+ fi
diff --git a/web/attachments/293580-check_ircd.pl.patch b/web/attachments/293580-check_ircd.pl.patch
new file mode 100644
index 0000000..511b719
--- /dev/null
+++ b/web/attachments/293580-check_ircd.pl.patch
@@ -0,0 +1,121 @@
+--- check_ircd.pl.orig  2008-09-16 12:41:20.000000000 +0200
++++ check_ircd.pl       2008-09-16 12:43:23.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#! /usr/bin/perl -wT
+ 
+ # -----------------------------------------------------------------------------
+ # File Name:           check_ircd.pl
+@@ -50,7 +50,7 @@
+ use Socket;
+ use strict;
+ use Getopt::Long;
+-use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
++use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose $opt_6);
+ use vars qw($PROGNAME);
+ use lib utils.pm;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
+@@ -60,7 +60,7 @@
+ sub print_help ();
+ sub print_usage ();
+ sub connection ($$$$);
+-sub bindRemote ($$$);
++sub connectRemote ($$);
+ 
+ # -------------------------------------------------------------[ Enviroment ]--
+ 
+@@ -140,30 +140,36 @@
+ ";
+ }
+ 
+-# -------------------------------------------------------------[ bindRemote ]--
++# ----------------------------------------------------------[ connectRemote ]--
+ 
+-sub bindRemote ($$$)
++sub connectRemote ($$)
+ {
+-       my ($in_remotehost, $in_remoteport, $in_hostname) = @_;
++       my ($in_remotehost, $in_remoteport) = @_;
+        my $proto = getprotobyname('tcp');
+        my $sockaddr;
+-       my $this;
+-       my $thisaddr = gethostbyname($in_hostname);
+        my $that;
+-       my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
+-#      ($name,$aliases,$type,$len,$thisaddr) = gethostbyname($in_hostname);
++       my $pf;
++       if ($opt_6) {
++           require Socket6;
++           $pf = PF_INET6;
++           unless ($that = (Socket6::getaddrinfo($in_remotehost, $in_remoteport, AF_INET6, SOCK_STREAM, $proto))[3]) {
++               print "IRCD UNKNOWN: Could not resolve $in_remotehost\n";
++               exit $ERRORS{"UNKNOWN"};
++           }
++       } else {
++           $pf = PF_INET;
++           unless ($that = gethostbyname($in_remotehost)) {
++               print "IRCD UNKNOWN: Could not resolve $in_remotehost\n";
++               exit $ERRORS{"UNKNOWN"};
++           }
++           $sockaddr = 'S n a4 x8';
++           $that = pack($sockaddr, AF_INET, $in_remoteport, $that);
++       }
+ 
+-       if (!socket(ClientSocket,AF_INET, SOCK_STREAM, $proto)) {
++       if (!socket(ClientSocket, $pf, SOCK_STREAM, $proto)) {
+            print "IRCD UNKNOWN: Could not start socket ($!)\n";
+            exit $ERRORS{"UNKNOWN"};
+        }
+-       $sockaddr = 'S n a4 x8';
+-       $this = pack($sockaddr, AF_INET, 0, $thisaddr);
+-       $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
+-       if (!bind(ClientSocket, $this)) {
+-           print "IRCD UNKNOWN: Could not bind socket ($!)\n";
+-           exit $ERRORS{"UNKNOWN"};
+-       }
+        if (!connect(ClientSocket, $that)) { 
+            print "IRCD UNKNOWN: Could not connect socket ($!)\n";
+            exit $ERRORS{"UNKNOWN"};
+@@ -183,6 +189,7 @@
+         ("V"   => \$opt_V,  "version"    => \$opt_V,
+                "h"   => \$opt_h,  "help"       => \$opt_h,
+                "v"   => \$verbose,"verbose"    => \$verbose,
++               "6"   => \$opt_6,
+                "t=i" => \$opt_t,  "timeout=i"  => \$opt_t,
+                "w=i" => \$opt_w,  "warning=i"  => \$opt_w,
+                "c=i" => \$opt_c,  "critical=i" => \$opt_c,
+@@ -190,15 +197,16 @@
+                "H=s" => \$opt_H,  "hostname=s" => \$opt_H);
+ 
+        if ($opt_V) {
+-               print_revision($PROGNAME,'$Revision$ ');
++               print_revision($PROGNAME,'$Revision: 1.3 $ ');
+                exit $ERRORS{'OK'};
+        }
+ 
+        if ($opt_h) {print_help(); exit $ERRORS{'OK'};}
+ 
+        ($opt_H) || ($opt_H = shift) || usage("Host name/address not specified\n");
+-       my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/);
++       my $remotehost = $1 if ($opt_H =~ /^([-.:A-Za-z0-9]+)$/);
+        ($remotehost) || usage("Invalid host: $opt_H\n");
++       $opt_6 ++ if $remotehost =~ /:/;
+ 
+        ($opt_w) || ($opt_w = shift) || ($opt_w = 50);
+        my $warn = $1 if ($opt_w =~ /^([0-9]+)$/);
+@@ -222,13 +230,8 @@
+        
+        alarm($TIMEOUT);
+ 
+-       chomp($hostname = `/bin/hostname`);
+-       $hostname = $1 if ($hostname =~ /([-.a-zA-Z0-9]+)/);
+-       my ($name, $alias, $proto) = getprotobyname('tcp');
+-       print "MAIN(debug): hostname = $hostname\n" if $verbose;
+-
+-       print "MAIN(debug): binding to remote host: $remotehost -> $remoteport -> $hostname\n" if $verbose;
+-       my $ClientSocket = &bindRemote($remotehost,$remoteport,$hostname);
++       print "MAIN(debug): connecting to $remotehost:$remoteport\n" if $verbose;
++       my $ClientSocket = &connectRemote($remotehost,$remoteport);
+        
+        print ClientSocket "NICK $NICK\nUSER $USER_INFO\n";
+        
diff --git a/web/attachments/295310-config.zip b/web/attachments/295310-config.zip
new file mode 100644
index 0000000..b0dcdcc
--- /dev/null
+++ b/web/attachments/295310-config.zip
diff --git a/web/attachments/295596-check_ircd.pl.diff b/web/attachments/295596-check_ircd.pl.diff
new file mode 100644
index 0000000..b3792c4
--- /dev/null
+++ b/web/attachments/295596-check_ircd.pl.diff
@@ -0,0 +1,119 @@
+--- check_ircd.pl.orig  2002-05-06 22:35:49.000000000 -0700
++++ check_ircd.pl       2008-10-01 01:22:43.496305819 -0700
+@@ -43,15 +43,17 @@
+ 
+ # ----------------------------------------------------------------[ Require ]--
+ 
+-require 5.004;
++require 5.6.0;
+ 
+ # -------------------------------------------------------------------[ Uses ]--
+ 
+-use Socket;
+ use strict;
++use IO::Socket;
++use Sys::Hostname;
+ use Getopt::Long;
+ use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
+ use vars qw($PROGNAME);
++use vars qw($ClientSocket);
+ use lib utils.pm;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
+ 
+@@ -60,7 +62,6 @@
+ sub print_help ();
+ sub print_usage ();
+ sub connection ($$$$);
+-sub bindRemote ($$$);
+ 
+ # -------------------------------------------------------------[ Enviroment ]--
+ 
+@@ -104,7 +105,7 @@
+                $answer = "Server $in_remotehost has less than 0 users! Something is Really WRONG!\n";
+        }
+        
+-       print ClientSocket "quit\n";
++       print $ClientSocket "quit\n";
+        print $answer;
+        exit $ERRORS{$state};
+ }
+@@ -140,38 +141,6 @@
+ ";
+ }
+ 
+-# -------------------------------------------------------------[ bindRemote ]--
+-
+-sub bindRemote ($$$)
+-{
+-       my ($in_remotehost, $in_remoteport, $in_hostname) = @_;
+-       my $proto = getprotobyname('tcp');
+-       my $sockaddr;
+-       my $this;
+-       my $thisaddr = gethostbyname($in_hostname);
+-       my $that;
+-       my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
+-#      ($name,$aliases,$type,$len,$thisaddr) = gethostbyname($in_hostname);
+-
+-       if (!socket(ClientSocket,AF_INET, SOCK_STREAM, $proto)) {
+-           print "IRCD UNKNOWN: Could not start socket ($!)\n";
+-           exit $ERRORS{"UNKNOWN"};
+-       }
+-       $sockaddr = 'S n a4 x8';
+-       $this = pack($sockaddr, AF_INET, 0, $thisaddr);
+-       $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
+-       if (!bind(ClientSocket, $this)) {
+-           print "IRCD UNKNOWN: Could not bind socket ($!)\n";
+-           exit $ERRORS{"UNKNOWN"};
+-       }
+-       if (!connect(ClientSocket, $that)) { 
+-           print "IRCD UNKNOWN: Could not connect socket ($!)\n";
+-           exit $ERRORS{"UNKNOWN"};
+-       }
+-       select(ClientSocket); $| = 1; select(STDOUT);
+-       return \*ClientSocket;
+-}
+-
+ # ===================================================================[ MAIN ]==
+ 
+ MAIN:
+@@ -222,24 +191,34 @@
+        
+        alarm($TIMEOUT);
+ 
+-       chomp($hostname = `/bin/hostname`);
++       $hostname = hostname;
+        $hostname = $1 if ($hostname =~ /([-.a-zA-Z0-9]+)/);
+-       my ($name, $alias, $proto) = getprotobyname('tcp');
+        print "MAIN(debug): hostname = $hostname\n" if $verbose;
+ 
+        print "MAIN(debug): binding to remote host: $remotehost -> $remoteport -> $hostname\n" if $verbose;
+-       my $ClientSocket = &bindRemote($remotehost,$remoteport,$hostname);
++
++       $ClientSocket = IO::Socket::INET->new(
++                               PeerAddr  => $remotehost,
++                               PeerPort  => $remoteport,
++                               LocalAddr => $hostname,
++                               Proto     => "tcp"
++       );
++
++       if (! $ClientSocket) {
++               print "IRCD UNKNOWN: Could not connect socket ($!)\n";
++               exit $ERRORS{"UNKNOWN"};
++       }
+        
+-       print ClientSocket "NICK $NICK\nUSER $USER_INFO\n";
++       print $ClientSocket "NICK $NICK\nUSER $USER_INFO\n";
+        
+-       while (<ClientSocket>) {
++       while (<$ClientSocket>) {
+                print "MAIN(debug): default var = $_\n" if $verbose;
+ 
+                # DALnet,LagNet,UnderNet etc. Require this!
+                # Replies with a PONG when presented with a PING query.
+                # If a server doesn't require it, it will be ignored.
+        
+-               if (m/^PING (.*)/) {print ClientSocket "PONG $1\n";}
++               if (m/^PING (.*)/) {print $ClientSocket "PONG $1\n";}
+        
+                alarm(0);
+        
diff --git a/web/attachments/296709-check_http.patch b/web/attachments/296709-check_http.patch
new file mode 100644
index 0000000..04d83f1
--- /dev/null
+++ b/web/attachments/296709-check_http.patch
@@ -0,0 +1,158 @@
+Index: check_http.c
+===================================================================
+--- check_http.c        (revision 2059)
++++ check_http.c        (working copy)
+@@ -187,6 +187,7 @@
+     {"nohtml", no_argument, 0, 'n'},
+     {"ssl", no_argument, 0, 'S'},
+     {"post", required_argument, 0, 'P'},
++    {"method", required_argument, 0, 'j'},
+     {"IP-address", required_argument, 0, 'I'},
+     {"url", required_argument, 0, 'u'},
+     {"port", required_argument, 0, 'p'},
+@@ -228,7 +229,7 @@
+   }
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
++    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -344,11 +345,19 @@
+       strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
+       user_auth[MAX_INPUT_BUFFER - 1] = 0;
+       break;
+-    case 'P': /* HTTP POST data in URL encoded format */
+-      if (http_method || http_post_data) break;
++    case 'P': /* HTTP POST data in URL encoded format; only sets data when method already set*/
++      if (http_post_data) break;
++      if (http_method)
++      {
++          http_post_data = strdup (optarg);
++          break;
++      }
+       http_method = strdup("POST");
+       http_post_data = strdup (optarg);
+       break;
++    case 'j': /* SET HTTP METHOD */
++      http_method = strdup (optarg);
++      break;
+     case 's': /* string or substring */
+       strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
+       string_expect[MAX_INPUT_BUFFER - 1] = 0;
+@@ -817,7 +826,7 @@
+     asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
+   }
+ 
+-  /* either send http POST data */
++  /* either send http POST data (any data, not only POST)*/
+   if (http_post_data) {
+     if (http_content_type) {
+       asprintf (&buf, "%sContent-Type: %s\r\n", buf, http_content_type);
+@@ -1312,7 +1321,9 @@
+   printf (" %s\n", "-u, --url=PATH");
+   printf ("    %s\n", _("URL to GET or POST (default: /)"));
+   printf (" %s\n", "-P, --post=STRING");
+-  printf ("    %s\n", _("URL encoded http POST data"));
++  printf ("    %s\n", _("URL encoded http POST data. When used with -j only sets data."));
++  printf (" %s\n", "-j, --method=STRING  (ex. OPTIONS, TRACE, PUT, DELETE)");
++  printf ("    %s\n", _("Set HTTP method."));
+   printf (" %s\n", "-N, --no-body");
+   printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));
+   printf ("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
+@@ -1396,5 +1407,5 @@
+   printf ("       [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n");
+   printf ("       [-s string] [-l] [-r <regex> | -R <case-insensitive regex>] [-P string]\n");
+   printf ("       [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>] [-A string]\n");
+-  printf ("       [-k string] [-S] [-C <age>] [-T <content-type>]\n");
++  printf ("       [-k string] [-S] [-C <age>] [-T <content-type>] [-j string]\n");
+ }
+Index: tests/check_http.t
+===================================================================
+--- tests/check_http.t  (revision 2059)
++++ tests/check_http.t  (working copy)
+@@ -33,9 +33,7 @@
+        print "Please contact me at: <URL:", $d->url, ">\n";
+        while (my $c = $d->accept ) {
+                while (my $r = $c->get_request) {
+-                       if ($r->method eq "GET" and $r->url->path eq "/xyzzy") {
+-                               $c->send_file_response("/etc/passwd");
+-                       } elsif ($r->method eq "GET" and $r->url->path =~ m^/statuscode/(\d+)^) {
++                       if ($r->method eq "GET" and $r->url->path =~ m^/statuscode/(\d+)^) {
+                                $c->send_basic_header($1);
+                                $c->send_crlf;
+                        } elsif ($r->method eq "GET" and $r->url->path =~ m^/file/(.*)^) {
+@@ -46,8 +44,15 @@
+                                $c->send_basic_header;
+                                $c->send_crlf;
+                                sleep 1;
+-                               $c->send_response("slow");
++                       } elsif ($r->url->path eq "/method") {
++                               if ($r->method eq "DELETE") {
++                                       $c->send_error(RC_METHOD_NOT_ALLOWED);
++                               } elsif ($r->method eq "foo") {
++                                       $c->send_error(RC_NOT_IMPLEMENTED);
+                        } else {
++                                       $c->send_status_line(200, $r->method);
++                               }
++                       } else {
+                                $c->send_error(RC_FORBIDDEN);
+                        }
+                        $c->close;
+@@ -63,7 +68,7 @@
+ }
+ 
+ if (-x "./check_http") {
+-       plan tests => 19;
++       plan tests => 33;
+ } else {
+        plan skip_all => "No check_http compiled";
+ }
+@@ -84,7 +89,7 @@
+ 
+ $result = NPTest->testCmd( "$command -u /slow" );
+ is( $result->return_code, 0, "/file/root");
+-like( $result->output, '/^HTTP OK HTTP/1.1 200 OK - 177 bytes in ([\d\.]+) seconds/', "Output correct" );
++like( $result->output, '/^HTTP OK HTTP/1.1 200 OK - 89 bytes in ([\d\.]+) seconds/', "Output correct" );
+ $result->output =~ /in ([\d\.]+) seconds/;
+ cmp_ok( $1, ">", 1, "Time is > 1 second" );
+ 
+@@ -119,3 +124,37 @@
+ is( $result->return_code, 2, $cmd);
+ like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information/', "Output correct: ".$result->output );
+ 
++$cmd = "$command -j HEAD -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 0, $cmd);
++like( $result->output, '/^HTTP OK HTTP/1.1 200 HEAD - 19 bytes in ([\d\.]+) seconds/', "Output correct: ".$result->output );
++
++$cmd = "$command -j POST -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 0, $cmd);
++like( $result->output, '/^HTTP OK HTTP/1.1 200 POST - 19 bytes in ([\d\.]+) seconds/', "Output correct: ".$result->output );
++
++$cmd = "$command -j GET -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 0, $cmd);
++like( $result->output, '/^HTTP OK HTTP/1.1 200 GET - 18 bytes in ([\d\.]+) seconds/', "Output correct: ".$result->output );
++
++$cmd = "$command -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 0, $cmd);
++like( $result->output, '/^HTTP OK HTTP/1.1 200 GET - 18 bytes in ([\d\.]+) seconds/', "Output correct: ".$result->output );
++
++$cmd = "$command -P foo -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 0, $cmd);
++like( $result->output, '/^HTTP OK HTTP/1.1 200 POST - 19 bytes in ([\d\.]+) seconds/', "Output correct: ".$result->output );
++
++$cmd = "$command -j DELETE -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 1, $cmd);
++like( $result->output, '/^HTTP WARNING: HTTP/1.1 405 Method Not Allowed/', "Output correct: ".$result->output );
++
++$cmd = "$command -j foo -u /method";
++$result = NPTest->testCmd( $cmd );
++is( $result->return_code, 2, $cmd);
++like( $result->output, '/^HTTP CRITICAL: HTTP/1.1 501 Not Implemented/', "Output correct: ".$result->output );
diff --git a/web/attachments/297946-patch-plugins__check_nt.c.txt b/web/attachments/297946-patch-plugins__check_nt.c.txt
new file mode 100644
index 0000000..a004ad4
--- /dev/null
+++ b/web/attachments/297946-patch-plugins__check_nt.c.txt
@@ -0,0 +1,77 @@
+--- plugins/check_nt.c.orig     2008-10-19 14:39:43.000000000 +0200
++++ plugins/check_nt.c  2008-10-19 14:47:19.000000000 +0200
+@@ -97,6 +97,8 @@
+        char *temp_string_perf=NULL;
+        char *description=NULL,*counter_unit = NULL;
+        char *minval = NULL, *maxval = NULL, *errcvt = NULL;
++       char *fds=NULL;
++       char *tds=NULL;
+
+        double total_disk_space=0;
+        double free_disk_space=0;
+@@ -218,33 +220,41 @@
+                else {
+                        asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+-                       free_disk_space=atof(strtok(recv_buffer,"&"));
+-                       total_disk_space=atof(strtok(NULL,"&"));
+-                       percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+-                       warning_used_space = ((float)warning_value / 100) * total_disk_space;
+-                       critical_used_space = ((float)critical_value / 100) * total_disk_space;
+-
+-                       if (free_disk_space>=0) {
+-                               asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
+-                                 value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
+-                                 percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
+-                               asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
+-                                 (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+-                                 critical_used_space / 1073741824, total_disk_space / 1073741824);
++                       fds=strtok(recv_buffer,"&");
++                       tds=strtok(NULL,"&");
+
+-                               if(check_critical_value==TRUE && percent_used_space >= critical_value)
+-                                       return_code=STATE_CRITICAL;
+-                               else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+-                                       return_code=STATE_WARNING;
+-                               else
+-                                       return_code=STATE_OK;
+-
+-                               output_message = strdup (temp_string);
+-                               perfdata = temp_string_perf;
++                       if (fds != NULL)
++                               free_disk_space=atof(fds);
++                       if (tds != NULL)
++                               total_disk_space=atof(tds);
++
++                       if (total_disk_space>0) {
++                               percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
++                               warning_used_space = ((float)warning_value / 100) * total_disk_space;
++                               critical_used_space = ((float)critical_value / 100) * total_disk_space;
++
++                               if (free_disk_space>=0) {
++                                       asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
++                                         value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
++                                         percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
++                                       asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
++                                         (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
++                                         critical_used_space / 1073741824, total_disk_space / 1073741824);
++
++                                       if(check_critical_value==TRUE && percent_used_space >= critical_value)
++                                               return_code=STATE_CRITICAL;
++                                       else if (check_warning_value==TRUE && percent_used_space >= warning_value)
++                                               return_code=STATE_WARNING;
++                                       else
++                                               return_code=STATE_OK;
++
++                                       output_message = strdup (temp_string);
++                                       perfdata = temp_string_perf;
++                               }
+                        } else {
+-                               output_message = strdup (_("Free disk space : Invalid drive "));
+-                               return_code=STATE_UNKNOWN;
+-                       }
++                                       output_message = strdup (_("Free disk space : Invalid drive "));
++                                       return_code=STATE_UNKNOWN;
++                               }
+                }
+                break;
diff --git a/web/attachments/299119-check_http.diff b/web/attachments/299119-check_http.diff
new file mode 100644
index 0000000..e745e36
--- /dev/null
+++ b/web/attachments/299119-check_http.diff
@@ -0,0 +1,16 @@
+*** check_http.c_old    2008-10-27 08:52:54.000000000 +0000
+--- check_http.c        2008-10-27 08:54:15.000000000 +0000
+***************
+*** 968,974 ****
+--- 968,978 ----
+      else if (http_status >= 300) {
+  
+        if (onredirect == STATE_DEPENDENT)
++       {
++         microsec = socket_timeout - deltime(tv)/1.0e6;
++       alarm( microsec>1?microsec:1 );
+          redir (header, status_line);
++       }
+        else if (onredirect == STATE_UNKNOWN)
+          printf (_("HTTP UNKNOWN"));
+        else if (onredirect == STATE_OK)
diff --git a/web/attachments/299693-patch-plugins__check_nt.c.txt b/web/attachments/299693-patch-plugins__check_nt.c.txt
new file mode 100644
index 0000000..a004ad4
--- /dev/null
+++ b/web/attachments/299693-patch-plugins__check_nt.c.txt
@@ -0,0 +1,77 @@
+--- plugins/check_nt.c.orig     2008-10-19 14:39:43.000000000 +0200
++++ plugins/check_nt.c  2008-10-19 14:47:19.000000000 +0200
+@@ -97,6 +97,8 @@
+        char *temp_string_perf=NULL;
+        char *description=NULL,*counter_unit = NULL;
+        char *minval = NULL, *maxval = NULL, *errcvt = NULL;
++       char *fds=NULL;
++       char *tds=NULL;
+
+        double total_disk_space=0;
+        double free_disk_space=0;
+@@ -218,33 +220,41 @@
+                else {
+                        asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+-                       free_disk_space=atof(strtok(recv_buffer,"&"));
+-                       total_disk_space=atof(strtok(NULL,"&"));
+-                       percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+-                       warning_used_space = ((float)warning_value / 100) * total_disk_space;
+-                       critical_used_space = ((float)critical_value / 100) * total_disk_space;
+-
+-                       if (free_disk_space>=0) {
+-                               asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
+-                                 value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
+-                                 percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
+-                               asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
+-                                 (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+-                                 critical_used_space / 1073741824, total_disk_space / 1073741824);
++                       fds=strtok(recv_buffer,"&");
++                       tds=strtok(NULL,"&");
+
+-                               if(check_critical_value==TRUE && percent_used_space >= critical_value)
+-                                       return_code=STATE_CRITICAL;
+-                               else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+-                                       return_code=STATE_WARNING;
+-                               else
+-                                       return_code=STATE_OK;
+-
+-                               output_message = strdup (temp_string);
+-                               perfdata = temp_string_perf;
++                       if (fds != NULL)
++                               free_disk_space=atof(fds);
++                       if (tds != NULL)
++                               total_disk_space=atof(tds);
++
++                       if (total_disk_space>0) {
++                               percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
++                               warning_used_space = ((float)warning_value / 100) * total_disk_space;
++                               critical_used_space = ((float)critical_value / 100) * total_disk_space;
++
++                               if (free_disk_space>=0) {
++                                       asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
++                                         value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
++                                         percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
++                                       asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
++                                         (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
++                                         critical_used_space / 1073741824, total_disk_space / 1073741824);
++
++                                       if(check_critical_value==TRUE && percent_used_space >= critical_value)
++                                               return_code=STATE_CRITICAL;
++                                       else if (check_warning_value==TRUE && percent_used_space >= warning_value)
++                                               return_code=STATE_WARNING;
++                                       else
++                                               return_code=STATE_OK;
++
++                                       output_message = strdup (temp_string);
++                                       perfdata = temp_string_perf;
++                               }
+                        } else {
+-                               output_message = strdup (_("Free disk space : Invalid drive "));
+-                               return_code=STATE_UNKNOWN;
+-                       }
++                                       output_message = strdup (_("Free disk space : Invalid drive "));
++                                       return_code=STATE_UNKNOWN;
++                               }
+                }
+                break;
diff --git a/web/attachments/301093-check_by_ssh_patch.diff b/web/attachments/301093-check_by_ssh_patch.diff
new file mode 100644
index 0000000..ca57d51
--- /dev/null
+++ b/web/attachments/301093-check_by_ssh_patch.diff
@@ -0,0 +1,310 @@
+--- plugins/check_by_ssh.c
++++ plugins/check_by_ssh.c
+@@ -38,8 +38,11 @@ const char *email = "nagiosplug-devel@li
+ #include "netutils.h"
+ #include "utils.h"
+ #include "runcmd.h"
++#ifndef MAXARGS
++#define MAXARGS 255
++#endif
+ 
+-int process_arguments (int, char **);
++int process_arguments (int, char **, char **);
+ int validate_arguments (void);
+ void print_help (void);
+ void print_usage (void);
+@@ -49,7 +52,6 @@ unsigned int services = 0;
+ int skip_stdout = 0;
+ int skip_stderr = 0;
+ char *remotecmd = NULL;
+-char *comm = NULL;
+ char *hostname = NULL;
+ char *outputfile = NULL;
+ char *host_shortname = NULL;
+@@ -68,9 +70,16 @@ main (int argc, char **argv)
+        time_t local_time;
+        FILE *fp = NULL;
+        struct output chld_out, chld_err;
++       char **newargv;
++
++
++       if ((newargv = calloc ((MAXARGS + 1), sizeof(char *))) == NULL)
++               printf (_("malloc failed"));
++
++       newargv[MAXARGS] = (char *)1;
+ 
+        remotecmd = "";
+-       comm = strdup (SSH_COMMAND);
++       newargv[0] = strdup (SSH_COMMAND);
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -80,7 +89,7 @@ main (int argc, char **argv)
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+        /* process arguments */
+-       if (process_arguments (argc, argv) == ERROR)
++       if (process_arguments (argc, argv, newargv) == ERROR)
+                usage_va(_("Could not parse arguments"));
+ 
+        /* Set signal handling and alarm timeout */
+@@ -90,11 +99,28 @@ main (int argc, char **argv)
+        alarm (timeout_interval);
+ 
+        /* run the command */
+-       if (verbose)
+-               printf ("%s\n", comm);
++       if (verbose) {
++               printf ("%s ", newargv[0]);
++               for (i=1; i <= MAXARGS; i++) {
++                       if (newargv[i] > (char *)1 ) {
++                                       printf ("'%s' ", newargv[i]);
++                       }
++               }
++               printf ("\n");
++       }
++
++       result = np_runcmdv(newargv[0], newargv, &chld_out, &chld_err, 0);
+ 
+-       result = np_runcmd(comm, &chld_out, &chld_err, 0);
+ 
++       // free memory to prevent valgrind errors
++       for (i=0; i <= MAXARGS; i++) {
++               if (newargv[i] > (char *)1 ) {
++                       free (newargv[i]);
++                       newargv[i]=0;
++               }
++       }
++       free (newargv);
++       
+        if (skip_stdout == -1) /* --skip-stdout specified without argument */
+                skip_stdout = chld_out.lines;
+        if (skip_stderr == -1) /* --skip-stderr specified without argument */
+@@ -152,10 +178,11 @@ main (int argc, char **argv)
+ 
+ /* process command-line arguments */
+ int
+-process_arguments (int argc, char **argv)
++process_arguments (int argc, char **argv, char **newargv)
+ {
+        int c;
+        char *p1, *p2;
++       char **opts = newargv + 2;
+ 
+        int option = 0;
+        static struct option longopts[] = {
+@@ -222,7 +249,8 @@ process_arguments (int argc, char **argv
+                case 'p': /* port number */
+                        if (!is_integer (optarg))
+                                usage_va(_("Port must be a positive integer"));
+-                       asprintf (&comm,"%s -p %s", comm, optarg);
++                       add_argument (&opts, "-p");
++                       add_argument (&opts, optarg);
+                        break;
+                case 'O':                                                                       /* output file */
+                        outputfile = optarg;
+@@ -246,16 +274,27 @@ process_arguments (int argc, char **argv
+                case 'u':
+                        c = 'l';
+                case 'l':                                                                       /* login name */
++                       add_argument (&opts, "-l");
++                       add_argument (&opts, optarg);
++                       break;
+                case 'i':                                                                       /* identity */
+-                       asprintf (&comm, "%s -%c %s", comm, c, optarg);
++                       add_argument (&opts, "-i");
++                       add_argument (&opts, optarg);
+                        break;
+-
+                case '1':                                                                       /* Pass these switches directly to ssh */
++                       add_argument (&opts, "-1");
++                       break;
+                case '2':                                                                       /* 1 to force version 1, 2 to force version 2 */
++                       add_argument (&opts, "-2");
++                       break;
+                case '4':                                                                       /* -4 for IPv4 */
+-               case '6':                                                               /* -6 for IPv6 */
++                       add_argument (&opts, "-4");
++                       break;
++               case '6':                                                                       /* -6 for IPv6 */
++                       add_argument (&opts, "-6");
++                       break;
+                case 'f':                                                                       /* fork to background */
+-                       asprintf (&comm, "%s -%c", comm, c);
++                       add_argument (&opts, "-f");
+                        break;
+                case 'C':                                                                       /* Command for remote machine */
+                        commands++;
+@@ -280,10 +319,11 @@ process_arguments (int argc, char **argv
+                                skip_stderr = atoi (optarg);
+                        break;
+                case 'o':                                                                       /* Extra options for the ssh command */
+-                       asprintf (&comm, "%s -%c '%s'", comm, c, optarg);
++                       add_argument (&opts, "-o");
++                       add_argument (&opts, optarg);
+                        break;
+                case 'q':                                                                       /* Tell the ssh command to be quiet */
+-                       asprintf (&comm, "%s -%c", comm, c);
++                       add_argument (&opts, "-q");
+                        break;
+                default:                                                                        /* help */
+                        usage5();
+@@ -313,12 +353,25 @@ process_arguments (int argc, char **argv
+        if (remotecmd == NULL || strlen (remotecmd) <= 1)
+                usage_va(_("No remotecmd"));
+ 
+-       asprintf (&comm, "%s %s '%s'", comm, hostname, remotecmd);
++       add_argument (&opts, remotecmd);
++       opts = newargv+1;
++       add_argument (&opts, hostname);
+ 
+        return validate_arguments ();
+ }
+ 
++int add_argument (char ***argv, const char *str)
++{
++       
++       if (**argv == (char *)1)
++               die (STATE_UNKNOWN, _("%s: Argument limit of %d exceeded\n"), progname, MAXARGS);
+ 
++       **argv = (char *)malloc((strlen(str) * sizeof(char)) +1);
++
++       strcpy(**argv, str);
++       (*argv)++;
++       return 0;
++}
+ 
+ int
+ validate_arguments (void)
+--- plugins/runcmd.c
++++ plugins/runcmd.c
+@@ -46,6 +46,7 @@
+ #ifdef HAVE_SYS_WAIT_H
+ # include <sys/wait.h>
+ #endif
++#include <sys/ioctl.h>
+ 
+ /** macros **/
+ #ifndef WEXITSTATUS
+@@ -87,6 +88,8 @@ static long maxfd = 0;
+ static int np_runcmd_open(const char *, int *, int *)
+        __attribute__((__nonnull__(1, 2, 3)));
+ 
++static int np_runcmd_open_argv(const char *, char **, int *, int *);
++
+ static int np_fetch_output(int, output *, int)
+        __attribute__((__nonnull__(2)));
+ 
+@@ -118,24 +121,14 @@ void np_runcmd_init(void)
+ static int
+ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
+ {
+-       char *env[2];
+        char *cmd = NULL;
+        char **argv = NULL;
+        char *str;
+        int argc;
+        size_t cmdlen;
+-       pid_t pid;
+-#ifdef RLIMIT_CORE
+-       struct rlimit limit;
+-#endif
+ 
+        int i = 0;
+ 
+-       if(!np_pids) NP_RUNCMD_INIT;
+-
+-       env[0] = strdup("LC_ALL=C");
+-       env[1] = '\0';
+-
+        /* if no command was passed, return with no error */
+        if (cmdstring == NULL)
+                return -1;
+@@ -191,6 +184,35 @@ np_runcmd_open(const char *cmdstring, in
+                argv[i++] = str;
+        }
+ 
++
++       return (np_runcmd_open_argv(argv[0], argv, pfd, pfderr));
++}
++
++static int
++np_runcmd_open_argv(const char *cmdstring, char **argv, int *pfd, int *pfderr)
++{
++       char *env[2];
++       pid_t pid;
++#ifdef RLIMIT_CORE
++       struct rlimit limit;
++#endif
++
++       int i = 0;
++       int master,slave;
++
++       if(!np_pids) NP_RUNCMD_INIT;
++
++       env[0] = strdup("LC_ALL=C");
++       env[1] = '\0';
++
++       /* if no command was passed, return with an error */
++       if (cmdstring == NULL)
++               return -1;
++
++       /* make sure that the command name is also argv[0] */
++       if (strcmp(cmdstring, argv[0]) != 0)
++               return -1;
++
+        if (pipe(pfd) < 0 || pipe(pfderr) < 0 || (pid = fork()) < 0)
+                return -1; /* errno set by the failing function */
+ 
+@@ -202,6 +224,11 @@ np_runcmd_open(const char *cmdstring, in
+                limit.rlim_cur = 0;
+                setrlimit (RLIMIT_CORE, &limit);
+ #endif
++#ifdef TIOCNOTTY
++               /* disassociate from tty to prevent e.g. ssh asking for passwords */
++               if(isatty(STDOUT_FILENO))
++                       ioctl(STDOUT_FILENO, TIOCNOTTY);
++#endif
+                close (pfd[0]);
+                if (pfd[1] != STDOUT_FILENO) {
+                        dup2 (pfd[1], STDOUT_FILENO);
+@@ -235,7 +262,6 @@ np_runcmd_open(const char *cmdstring, in
+        return pfd[0];
+ }
+ 
+-
+ static int
+ np_runcmd_close(int fd)
+ {
+@@ -360,3 +386,21 @@ np_runcmd(const char *cmd, output *out, 
+ 
+        return np_runcmd_close(fd);
+ }
++
++int
++np_runcmdv(const char *cmd, char ** argv, output *out, output *err, int flags)
++{
++       int fd, pfd_out[2], pfd_err[2];
++
++       /* initialize the structs */
++       if(out) memset(out, 0, sizeof(output));
++       if(err) memset(err, 0, sizeof(output));
++
++       if((fd = np_runcmd_open_argv(cmd, argv, pfd_out, pfd_err)) == -1)
++               die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
++
++       if(out) out->lines = np_fetch_output(pfd_out[0], out, flags);
++       if(err) err->lines = np_fetch_output(pfd_err[0], err, flags);
++
++       return np_runcmd_close(fd);
++}
+--- plugins/runcmd.h
++++ plugins/runcmd.h
+@@ -40,6 +40,7 @@ typedef struct output output;
+ 
+ /** prototypes **/
+ int np_runcmd(const char *, output *, output *, int);
++int np_runcmdv(const char *, char **, output *, output *, int);
+ void popen_timeout_alarm_handler(int)
+        __attribute__((__noreturn__));
+ 
diff --git a/web/attachments/302833-nagios-plugins-check_fping-timeout-1.4.13.patch b/web/attachments/302833-nagios-plugins-check_fping-timeout-1.4.13.patch
new file mode 100644
index 0000000..965631e
--- /dev/null
+++ b/web/attachments/302833-nagios-plugins-check_fping-timeout-1.4.13.patch
@@ -0,0 +1,62 @@
+diff -urN nagios-plugins-1.4.13.ORIG/plugins/check_fping.c nagios-plugins-1.4.13/plugins/check_fping.c

+--- nagios-plugins-1.4.13.ORIG/plugins/check_fping.c    2008-11-15 08:39:42.000000000 +0000

++++ nagios-plugins-1.4.13/plugins/check_fping.c 2008-11-15 10:03:56.000000000 +0000

+@@ -46,7 +46,8 @@

+   PACKET_COUNT = 1,

+   PACKET_SIZE = 56,

+   PL = 0,

+-  RTA = 1

++  RTA = 1,

++  TARGET_TIMEOUT = 500

+ };

+

+ int textscan (char *buf);

+@@ -58,6 +59,7 @@

+ char *server_name = NULL;

+ int packet_size = PACKET_SIZE;

+ int packet_count = PACKET_COUNT;

++int target_timeout = TARGET_TIMEOUT;

+ int verbose = FALSE;

+ int cpl;

+ int wpl;

+@@ -92,8 +94,8 @@

+   server = strscpy (server, server_name);

+

+   /* compose the command */

+-  asprintf (&command_line, "%s -b %d -c %d %s", PATH_TO_FPING,

+-            packet_size, packet_count, server);

++  asprintf (&command_line, "%s -t %d -b %d -c %d %s", PATH_TO_FPING,

++            target_timeout, packet_size, packet_count, server);

+

+   if (verbose)

+     printf ("%s\n", command_line);

+@@ -252,7 +254,7 @@

+   }

+

+   while (1) {

+-    c = getopt_long (argc, argv, "+hVvH:c:w:b:n:", longopts, &option);

++    c = getopt_long (argc, argv, "+hVvH:c:w:b:n:t:", longopts, &option);

+

+     if (c == -1 || c == EOF || c == 1)

+       break;

+@@ -313,6 +315,12 @@

+       else

+         usage (_("Packet count must be a positive integer"));

+       break;

++    case 't':                 /* timeout in msec */

++      if (is_intpos (optarg))

++        target_timeout = atoi (optarg);

++      else

++        usage (_("Target timeout must be a positive integer"));

++      break;

+     }

+   }

+

+@@ -414,5 +422,5 @@

+ print_usage (void)

+ {

+   printf (_("Usage:"));

+-  printf (" %s <host_address> -w limit -c limit [-b size] [-n number]\n", progname);

++  printf (" %s <host_address> -w limit -c limit [-b size] [-n number] [-t number]\n", progname);

+ }

+

diff --git a/web/attachments/302869-perl-snmpv3.patch.gz b/web/attachments/302869-perl-snmpv3.patch.gz
new file mode 100644
index 0000000..fc80fbd
--- /dev/null
+++ b/web/attachments/302869-perl-snmpv3.patch.gz
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824082" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824082" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824082" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824082" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824082');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2343438&group_id=29880&atid=397597&file_id=302869"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/302871-perl-snmpv3.patch.gz b/web/attachments/302871-perl-snmpv3.patch.gz
new file mode 100644
index 0000000..c9d745e
--- /dev/null
+++ b/web/attachments/302871-perl-snmpv3.patch.gz
diff --git a/web/attachments/302952-check_ifstatus b/web/attachments/302952-check_ifstatus
new file mode 100644
index 0000000..2381fd2
--- /dev/null
+++ b/web/attachments/302952-check_ifstatus
@@ -0,0 +1,483 @@
+#! /opt/coolstack/bin/perl -w
+# vim:foldmethod=syntax:tabstop=4:shiftwidth=4
+#
+# Matthew Martin, Tuesday August 14, 2007
+# Problems with check_ifstatus.pl
+#       1) "No response from remote host" should be unknown, not critical, right?
+#       2) Serial link "dormant" should be critical, not okay
+#       3) dormant, excluded and unused interfaces are not correctly counted
+#       4) add some default exclusions
+#
+# check_ifstatus.pl - nagios plugin
+#
+#
+# Copyright (C) 2000 Christoph Kron
+# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
+#  Added -x option (4/2003)
+#  Added -u option (4/2003)
+#  Added -M option (10/2003)
+#  Added SNMPv3 support (10/2003)
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#
+# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net
+# 
+# 11.01.2000 Version 1.0
+#
+# $Id: check_ifstatus.pl 884 2004-08-18 19:51:35Z tonvoon $
+
+use POSIX;
+use strict;
+use lib "/opt/nagios-3.0.5/libexec"  ;
+use utils qw($TIMEOUT %ERRORS &print_revision &support);
+
+use Net::SNMP;
+use Getopt::Long;
+Getopt::Long::Configure('bundling');
+
+my $PROGNAME = "check_ifstatus";
+
+sub print_help ();
+sub usage ();
+sub process_arguments ();
+
+
+my $status;
+my %ifOperStatus =      ('1','up',
+                         '2','down',
+                         '3','testing',
+                         '4','unknown',
+                         '5','dormant',
+                         '6','notPresent',
+                         '7','lowerLayerDown');  # down due to the state of lower layer interface(s));
+
+my $timeout ;
+my $state = "UNKNOWN";
+my $answer = "";
+my $snmpkey=0;
+my $snmpoid=0;
+my $key=0;
+my $community = "public";
+my $maxmsgsize = 1472 ; # Net::SNMP default is 1472
+my ($seclevel, $authproto, $secname, $authpass, $privpass, $auth, $priv, $context);
+my $port = 161;
+my @snmpoids;
+my $snmpIfAdminStatus = '1.3.6.1.2.1.2.2.1.7';
+my $snmpIfDescr = '1.3.6.1.2.1.2.2.1.2';
+my $snmpIfOperStatus = '1.3.6.1.2.1.2.2.1.8';
+my $snmpIfName = '1.3.6.1.2.1.31.1.1.1.1';
+my $snmpIfAlias = '1.3.6.1.2.1.31.1.1.1.18';
+my $snmpLocIfDescr = '1.3.6.1.4.1.9.2.2.1.1.28';
+my $snmpIfType = '1.3.6.1.2.1.2.2.1.3';
+my $hostname;
+my $session;
+my $error;
+my $response;
+my %ifStatus;
+my $ifup =0 ;
+my $ifdown =0;
+my $ifdormant = 0;
+my $ifexclude = 0 ;
+my $ifunused = 0;
+my $ifmessage = "";
+my $snmp_version = 1;
+my $ifXTable;
+my $opt_h ;
+my $opt_V ;
+my $opt_u;
+my $opt_x ;
+my %excluded ;
+my @unused_ports ;
+
+# Just in case of problems, let's not hang Nagios
+$SIG{'ALRM'} = sub {
+     print ("ERROR: No snmp response from $hostname (alarm timeout)\n");
+     exit $ERRORS{"UNKNOWN"};
+};
+
+
+#Option checking
+$status = process_arguments();
+
+if ($status != 0)
+{
+        print_help() ;
+        exit $ERRORS{'OK'};
+}
+
+
+alarm($timeout);
+
+push(@snmpoids,$snmpIfOperStatus);
+push(@snmpoids,$snmpIfAdminStatus);
+push(@snmpoids,$snmpIfDescr);
+push(@snmpoids,$snmpIfType);
+push(@snmpoids,$snmpIfName) if ( defined $ifXTable);
+push(@snmpoids,$snmpIfAlias) if ( defined $ifXTable);
+
+
+
+
+foreach $snmpoid (@snmpoids) {
+
+   if (!defined($response = $session->get_table($snmpoid))) {
+      $answer=$session->error;
+      $session->close;
+                # mgmart6. Tuesday August 14, 2007
+                # I think a SNMP error should give UNKNOWN, not CRITICAL
+                #$state = 'CRITICAL';
+                $state = 'UNKNOWN';
+                        if ( ( $snmpoid =~ $snmpIfName ) && defined $ifXTable ) {
+                                print ("$state: Device does not support ifTable - try without -I option\n");
+                        }else{
+                                print ("$state: $answer for $snmpoid  with snmp version $snmp_version\n");
+                        }
+      exit $ERRORS{$state};
+   }
+
+   foreach $snmpkey (keys %{$response}) {
+      $snmpkey =~ /.*\.(\d+)$/;
+      $key = $1;
+      $ifStatus{$key}{$snmpoid} = $response->{$snmpkey};
+   }
+}
+
+
+$session->close;
+
+alarm(0);
+
+# mgmart6. This script cannot tell that specific logical interfaces are
+# associated with their phys IF so it checks them all.
+foreach $key (keys %ifStatus) {
+
+        # Skip interfaces flagged with -u (--unused_ports)
+        # "A comma separated list of ifIndex values that should be excluded"
+        if (!defined($ifStatus{$key}{'notInUse'})) {
+                # check only if interface is administratively up
+    if ($ifStatus{$key}{$snmpIfAdminStatus} == 1 ) {
+    
+                        # check only if interface type is not listed in %excluded
+                        if (!defined $excluded{$ifStatus{$key}{$snmpIfType}} ) {
+                                if ($ifStatus{$key}{$snmpIfOperStatus} == 1 ) { $ifup++ ;}
+                                if ($ifStatus{$key}{$snmpIfOperStatus} == 2 ) {
+                                                                $ifdown++ ;
+                                                                if (defined $ifXTable) {
+                                                                        $ifmessage .= sprintf("%s: down -> %s<BR>",
+                                                                                                                        $ifStatus{$key}{$snmpIfName},
+                                                                                                                        $ifStatus{$key}{$snmpIfAlias});
+                                                                }else{
+                                                                        $ifmessage .= sprintf("%s: down <BR>",
+                                                                                                                        $ifStatus{$key}{$snmpIfDescr});
+                                                                }
+                                }
+                                if ($ifStatus{$key}{$snmpIfOperStatus} == 5 ) { $ifdormant++ ;}
+                        # Matthew Martin Interface is listed in %excluded
+                        } else {
+                                $ifexclude++;
+                        }
+                # mgmart6 If not administratively up, mark as unused.
+                } elsif ($ifStatus{$key}{$snmpIfAdminStatus} == 2 ) {
+                        $ifunused++;
+                }
+        }else{
+                # mgmart6. Original line: $ifunused++;
+                # actually matches the flag 
+                # -u (--unused_ports) A comma separated list of ifIndex values that should be excluded
+                # They should be marked as excluded, not unused.
+                $ifexclude++;
+        }
+}
+
+# mgmart6
+# The original has dormant serial interfaces return status of "OK".
+# A dormant serial connection should be CRITICAL, right?
+# I changed the following line to address this:
+#if ($ifdown > 0) {
+if (($ifdown > 0) || ($ifdormant > 0)) {
+        $state = 'CRITICAL';
+        $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, excluded: %d, unused: %d<BR>",
+                $hostname,
+                $ifup,
+                $ifdown,
+                $ifdormant,
+                $ifexclude,
+                $ifunused);
+        $answer = $answer . $ifmessage . "\n";
+} else {
+        $state = 'OK';
+        $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, excluded: %d, unused: %d",
+                $hostname,
+                $ifup,
+                $ifdown,
+                $ifdormant,
+                $ifexclude,
+                $ifunused);
+}
+my $perfdata = sprintf("up=%d,down=%d,dormant=%d,excluded=%d,unused=%d",$ifup,$ifdown,$ifdormant,$ifexclude,$ifunused);
+print ("$state: $answer |$perfdata\n");
+exit $ERRORS{$state};
+
+
+sub usage (){
+        printf "\nMissing arguments!\n";
+        printf "\n";
+        printf "check_ifstatus -C <READCOMMUNITY> -p <PORT> -H <HOSTNAME>\n";
+        printf "Copyright (C) 2000 Christoph Kron\n";
+        printf "Updates 5/2002 Subhendu Ghosh\n";
+        printf "\n\n";
+        support();
+        exit $ERRORS{"UNKNOWN"};
+}
+
+sub print_help (){
+        printf "check_ifstatus plugin for Nagios monitors operational \n";
+        printf "status of each network interface on the target host\n";
+        printf "\nUsage:\n";
+        printf "   -H (--hostname)   Hostname to query - (required)\n";
+        printf "   -C (--community)  SNMP read community (defaults to public,\n";
+        printf "                     used with SNMP v1 and v2c\n";
+        printf "   -v (--snmp_version)  1 for SNMP v1 (default)\n";
+        printf "                        2 for SNMP v2c\n";
+        printf "                          SNMP v2c will use get_bulk for less overhead\n";
+        printf "                        3 for SNMPv3 (requires -U option)";
+        printf "   -p (--port)       SNMP port (default 161)\n";
+        printf "   -I (--ifmib)      Agent supports IFMIB ifXTable.  For Cisco - this will provide\n";
+        printf "                     the descriptive name.  Do not use if you don't know what this is. \n";
+        printf "   -x (--exclude)    A comma separated list of ifType values that should be excluded \n";
+        printf "                     from the report (default for an empty list is PPP(23).\n";
+        printf "   -u (--unused_ports) A comma separated list of ifIndex values that should be excluded \n";
+        printf "                     from the report (default is an empty exclusion list).\n";
+        printf "                     See the IANAifType-MIB for a list of interface types.\n";
+        printf "   -L (--seclevel)   choice of \"noAuthNoPriv\", \"authNoPriv\", or     \"authPriv\"\n";
+        printf "   -U (--secname)    username for SNMPv3 context\n";
+        printf "   -c (--context)    SNMPv3 context name (default is empty      string)";
+        printf "   -A (--authpass)   authentication password (cleartext ascii or localized key\n";
+        printf "                     in hex with 0x prefix generated by using   \"snmpkey\" utility\n"; 
+        printf "                     auth password and authEngineID\n";
+        printf "   -a (--authproto)  Authentication protocol ( MD5 or SHA1)\n";
+        printf "   -X (--privpass)   privacy password (cleartext ascii or localized key\n";
+        printf "                     in hex with 0x prefix generated by using   \"snmpkey\" utility\n"; 
+        printf "                     privacy password and authEngineID\n";
+        printf "   -M (--maxmsgsize) Max message size - usefull only for v1 or v2c\n";
+        printf "   -t (--timeout)    seconds before the plugin times out (default=$TIMEOUT)\n";
+        printf "   -V (--version)    Plugin version\n";
+        printf "   -h (--help)       usage help \n\n";
+        print_revision($PROGNAME, '$Revision: 884 $');
+        
+}
+
+sub process_arguments() {
+        $status = GetOptions(
+                "V"   => \$opt_V, "version"    => \$opt_V,
+                "h"   => \$opt_h, "help"       => \$opt_h,
+                "v=i" => \$snmp_version, "snmp_version=i"  => \$snmp_version,
+                "C=s" => \$community,"community=s" => \$community,
+                "L=s" => \$seclevel, "seclevel=s" => \$seclevel,
+                "a=s" => \$authproto, "authproto=s" => \$authproto,
+                "U=s" => \$secname,   "secname=s"   => \$secname,
+                "A=s" => \$authpass,  "authpass=s"  => \$authpass,
+                "X=s" => \$privpass,  "privpass=s"  => \$privpass,
+                "c=s" => \$context,   "context=s"   => \$context,
+                "p=i" =>\$port, "port=i" => \$port,
+                "H=s" => \$hostname, "hostname=s" => \$hostname,
+                "I"             => \$ifXTable, "ifmib" => \$ifXTable,
+                "x:s"           =>      \$opt_x,   "exclude:s" => \$opt_x,
+                "u=s" => \$opt_u,  "unused_ports=s" => \$opt_u,
+                "M=i" => \$maxmsgsize, "maxmsgsize=i" => \$maxmsgsize,
+                "t=i" => \$timeout,    "timeout=i" => \$timeout,
+                );
+                
+        if ($status == 0){
+                print_help() ;
+                exit $ERRORS{'OK'};
+        }
+        if ($opt_V) {
+                print_revision($PROGNAME,'$Revision: 884 $ ');
+                exit $ERRORS{'OK'};
+        }
+
+        if ($opt_h) {
+                print_help();
+                exit $ERRORS{'OK'};
+        }
+
+        unless (defined $timeout) {
+                $timeout = $TIMEOUT;
+        }
+
+        if ($snmp_version =~ /3/ ) {
+                # Must define a security level even though default is noAuthNoPriv
+                # v3 requires a security username
+                if (defined $seclevel  && defined $secname) {
+                
+                        # Must define a security level even though defualt is noAuthNoPriv
+                        unless ($seclevel eq ('noAuthNoPriv' || 'authNoPriv' || 'authPriv' ) ) {
+                                usage();
+                                exit $ERRORS{"UNKNOWN"};
+                        }
+                        
+                        # Authentication wanted
+                        if ($seclevel eq ('authNoPriv' || 'authPriv') ) {
+                
+                                unless ($authproto eq ('MD5' || 'SHA1') ) {
+                                        usage();
+                                        exit $ERRORS{"UNKNOWN"};
+                                }
+
+                                if ( !defined $authpass) {
+                                        usage();
+                                        exit $ERRORS{"UNKNOWN"};
+                                }else{
+                                        if ($authpass =~ /^0x/ ) {
+                                                $auth = "-authkey => $authpass" ;
+                                        }else{
+                                                $auth = "-authpassword => $authpass";
+                                        }
+                                }
+                                        
+                        }
+                        
+                        # Privacy (DES encryption) wanted
+                        if ($seclevel eq  'authPriv' ) {
+                                if (! defined $privpass) {
+                                        usage();
+                                        exit $ERRORS{"UNKNOWN"};
+                                }else{
+                                        if ($privpass =~ /^0x/){
+                                                $priv = "-privkey => $privpass";
+                                        }else{
+                                                $priv = "-privpassword => $privpass";
+                                        }
+                                }
+                        }
+
+                        # Context name defined or default
+
+                        unless ( defined $context) {
+                                $context = "";
+                        }
+                
+                
+                
+                }else {
+                                        usage();
+                                        exit $ERRORS{'UNKNOWN'}; ;
+                }
+        } # end snmpv3
+
+        # for snmp v1 & v2c we default to community = "public"
+        
+        # Excluded interfaces types (ifType) (backup interfaces, dial-on demand interfaces, PPP interfaces
+        if (defined $opt_x) {
+                my @x = split(/,/, $opt_x);
+                if ( @x) {
+                        foreach $key (@x){
+                                $excluded{$key} = 1;
+                        }
+                }
+        # Matthew Martin In the original this else was nested wrong and never matched
+        } else {
+                $excluded{23} = 1; # default PPP(23) if empty list - note (AIX seems to think PPP is 22 according to a post)
+                $excluded{24} = 1; # mgmart6, Tuesday August 14, 2007, Nokia, ifDescr.6 = loop0c0 Software Loopback Layer -- ifType.6 = softwareLoopback(24) (taken from a Nokia IP330)
+                $excluded{25} = 1; # mgmart6, Tuesday August 14, 2007, Nokia, ifDescr.1 = pppoe0 Ethernet Layer -- ifType.1 = eon(25) (from a Nokia IP350)
+        }
+        
+        # Excluded interface ports (ifIndex) - management reasons
+        if ($opt_u) {
+                @unused_ports = split(/,/,$opt_u);
+                foreach $key (@unused_ports) { 
+                        $ifStatus{$key}{'notInUse'}++ ;
+                }
+        }
+
+        if (! utils::is_hostname($hostname)){
+                usage();
+                exit $ERRORS{"UNKNOWN"};
+        }
+
+        # create SNMP session handle based on options passed.
+
+        if ( ! $snmp_version ) {
+                $snmp_version =1 ;
+        }else{
+                if ( $snmp_version =~ /[12]/ ) {
+        
+                        ($session, $error) = Net::SNMP->session(
+                                                -hostname  => $hostname,
+                                                -community => $community,
+                                                -port      => $port,
+                                                -version        => $snmp_version,
+                                                -maxmsgsize => $maxmsgsize
+                         );
+
+                if (!defined($session)) {
+                                        $state='UNKNOWN';
+                                        $answer=$error;
+                                        print ("$state: $answer");
+                                        exit $ERRORS{$state};
+                }
+
+                
+        }elsif ( $snmp_version =~ /3/ ) {
+
+                if ($seclevel eq 'noAuthNoPriv') {
+                        ($session, $error) = Net::SNMP->session(
+                                -hostname  => $hostname,
+                                -port      => $port,
+                                -version  => $snmp_version,
+                                -username => $secname,
+                        );
+
+                }elsif ( $seclevel eq 'authNoPriv' ) {
+                        ($session, $error) = Net::SNMP->session(
+                                -hostname  => $hostname,
+                                -port      => $port,
+                                -version  => $snmp_version,
+                                -username => $secname,
+                                -authprotocol => $authproto,
+                                $auth
+                        );      
+                }elsif ($seclevel eq 'authPriv' ) {
+                        ($session, $error) = Net::SNMP->session(
+                                -hostname  => $hostname,
+                                -port      => $port,
+                                -version  => $snmp_version,
+                                -username => $secname,
+                                -authprotocol => $authproto,
+                                $auth,
+                                $priv
+                        );
+                }
+                                        
+                                        
+                if (!defined($session)) {
+                                        $state='UNKNOWN';
+                                        $answer=$error;
+                                        print ("$state: $answer");
+                                        exit $ERRORS{$state};
+                }
+                        
+        }else{
+                $state='UNKNOWN';
+                print ("$state: No support for SNMP v$snmp_version yet\n");
+                exit $ERRORS{$state};
+        }
+}
+
+return $ERRORS{"OK"};
+                                
+}
diff --git a/web/attachments/302976-nagios-plugins-check_fping-timeout-1.4.13.patch b/web/attachments/302976-nagios-plugins-check_fping-timeout-1.4.13.patch
new file mode 100644
index 0000000..965631e
--- /dev/null
+++ b/web/attachments/302976-nagios-plugins-check_fping-timeout-1.4.13.patch
@@ -0,0 +1,62 @@
+diff -urN nagios-plugins-1.4.13.ORIG/plugins/check_fping.c nagios-plugins-1.4.13/plugins/check_fping.c

+--- nagios-plugins-1.4.13.ORIG/plugins/check_fping.c    2008-11-15 08:39:42.000000000 +0000

++++ nagios-plugins-1.4.13/plugins/check_fping.c 2008-11-15 10:03:56.000000000 +0000

+@@ -46,7 +46,8 @@

+   PACKET_COUNT = 1,

+   PACKET_SIZE = 56,

+   PL = 0,

+-  RTA = 1

++  RTA = 1,

++  TARGET_TIMEOUT = 500

+ };

+

+ int textscan (char *buf);

+@@ -58,6 +59,7 @@

+ char *server_name = NULL;

+ int packet_size = PACKET_SIZE;

+ int packet_count = PACKET_COUNT;

++int target_timeout = TARGET_TIMEOUT;

+ int verbose = FALSE;

+ int cpl;

+ int wpl;

+@@ -92,8 +94,8 @@

+   server = strscpy (server, server_name);

+

+   /* compose the command */

+-  asprintf (&command_line, "%s -b %d -c %d %s", PATH_TO_FPING,

+-            packet_size, packet_count, server);

++  asprintf (&command_line, "%s -t %d -b %d -c %d %s", PATH_TO_FPING,

++            target_timeout, packet_size, packet_count, server);

+

+   if (verbose)

+     printf ("%s\n", command_line);

+@@ -252,7 +254,7 @@

+   }

+

+   while (1) {

+-    c = getopt_long (argc, argv, "+hVvH:c:w:b:n:", longopts, &option);

++    c = getopt_long (argc, argv, "+hVvH:c:w:b:n:t:", longopts, &option);

+

+     if (c == -1 || c == EOF || c == 1)

+       break;

+@@ -313,6 +315,12 @@

+       else

+         usage (_("Packet count must be a positive integer"));

+       break;

++    case 't':                 /* timeout in msec */

++      if (is_intpos (optarg))

++        target_timeout = atoi (optarg);

++      else

++        usage (_("Target timeout must be a positive integer"));

++      break;

+     }

+   }

+

+@@ -414,5 +422,5 @@

+ print_usage (void)

+ {

+   printf (_("Usage:"));

+-  printf (" %s <host_address> -w limit -c limit [-b size] [-n number]\n", progname);

++  printf (" %s <host_address> -w limit -c limit [-b size] [-n number] [-t number]\n", progname);

+ }

+

diff --git a/web/attachments/30350-check_smtp.c.diff b/web/attachments/30350-check_smtp.c.diff
new file mode 100644
index 0000000..aa1c86c
--- /dev/null
+++ b/web/attachments/30350-check_smtp.c.diff
@@ -0,0 +1,96 @@
+--- nagiosplug-1.3-beta1/plugins/check_smtp.c   Mon Jun 10 05:24:06 2002
++++ nagiosplug-1.3-beta1-BALU/plugins/check_smtp.c      Tue Sep  3 15:01:09 2002
+@@ -49,7 +49,8 @@
+  * You can disable sending DUMMYCMD by undefining SMTP_USE_DUMMYCMD.
+  */
+ #define SMTP_DUMMYCMD  "MAIL\n"
+-#define SMTP_USE_DUMMYCMD 1
++// BALU 20020903: added "--sendmail", so it is not needed anymore
++// #define SMTP_USE_DUMMYCMD 1 
+ #define SMTP_QUIT      "QUIT\n"
+ 
+ int process_arguments (int, char **);
+@@ -67,6 +68,7 @@
+ int critical_time = 0;
+ int check_critical_time = FALSE;
+ int verbose = FALSE;
++int sendmail = FALSE;
+ 
+ int
+ main (int argc, char **argv)
+@@ -138,11 +140,11 @@
+                }
+ 
+                /* close the connection */
+-#ifdef SMTP_USE_DUMMYCMD
+-               send(sd,SMTP_DUMMYCMD,strlen(SMTP_DUMMYCMD),0);
+-               /* allow for response to DUMMYCMD to reach us */
+-               recv(sd,buffer,MAX_INPUT_BUFFER-1,0);
+-#endif /* SMTP_USE_DUMMYCMD */
++               if (sendmail == TRUE) {
++                      send(sd,SMTP_DUMMYCMD,strlen(SMTP_DUMMYCMD),0);
++                      /* allow for response to DUMMYCMD to reach us */
++                      recv(sd,buffer,MAX_INPUT_BUFFER-1,0);
++               }
+ 
+                send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+                close (sd);
+@@ -225,17 +227,17 @@
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
++               {"sendmail", no_argument, 0, 's'},
+                {0, 0, 0, 0}
+        };
+ #endif
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+-               c =
+-                       getopt_long (argc, argv, "+hVvt:p:e:c:w:H:", long_options,
++               c = getopt_long (argc, argv, "+?hVvst:p:e:c:w:H:", long_options,
+                                                                         &option_index);
+ #else
+-               c = getopt (argc, argv, "+?hVvt:p:e:c:w:H:");
++               c = getopt (argc, argv, "+?hVvst:p:e:c:w:H:");
+ #endif
+ 
+                i++;
+@@ -250,6 +252,7 @@
+                case 'c':
+                case 'w':
+                case 'H':
++               case 's':
+                        i++;
+                }
+ 
+@@ -302,6 +305,9 @@
+                                usage ("Time interval must be a nonnegative integer\n");
+                        }
+                        break;
++               case 's':                                                                       /* sendmail-quirk? */
++                       sendmail = TRUE;
++                       break;
+                case 'V':                                                                       /* version */
+                        print_revision (PROGNAME, "$Revision: 1.2 $");
+                        exit (STATE_OK);
+@@ -356,7 +362,9 @@
+                 " -h, --help\n"
+                 "   Print detailed help screen\n"
+                 " -V, --version\n"
+-                "   Print version information\n\n",
++                "   Print version information\n"
++                " -s, --sendmail\n"
++                "   Enable dummy command to stop sendmail from logging NOQUEUE\n\n",
+                 SMTP_PORT, SMTP_EXPECT, DEFAULT_SOCKET_TIMEOUT);
+        support ();
+ }
+@@ -369,7 +377,7 @@
+ print_usage (void)
+ {
+        printf
+-               ("Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v]\n"
++               ("Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v] [-s]\n"
+                 "       %s --help\n"
+                 "       %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+ }
diff --git a/web/attachments/303749-check_mrtg.diff b/web/attachments/303749-check_mrtg.diff
new file mode 100644
index 0000000..8b4dfd5
--- /dev/null
+++ b/web/attachments/303749-check_mrtg.diff
@@ -0,0 +1,12 @@
+diff -Naubr nagios-plugins-1.4.13.old/plugins/check_mrtg.c nagios-plugins-1.4.13.new/plugins/check_mrtg.c
+--- nagios-plugins-1.4.13.old/plugins/check_mrtg.c      2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13.new/plugins/check_mrtg.c      2008-12-02 16:50:55.000000000 +0100
+@@ -57,7 +57,7 @@
+ int
+ main (int argc, char **argv)
+ {
+-       int result = STATE_UNKNOWN;
++       int result = STATE_OK;
+        FILE *fp;
+        int line;
+        char input_buffer[MAX_INPUT_BUFFER];
diff --git a/web/attachments/304167-check_ifoperstatus_perfdata.diff b/web/attachments/304167-check_ifoperstatus_perfdata.diff
new file mode 100644
index 0000000..437f47f
--- /dev/null
+++ b/web/attachments/304167-check_ifoperstatus_perfdata.diff
@@ -0,0 +1,35 @@
+--- check_ifoperstatus.pl       2007-03-16 13:11:46.000000000 +0100
++++ check_ifoperstatus_perfdata 2008-12-05 12:53:33.000000000 +0100
+@@ -73,6 +73,8 @@
+ my $snmpIfLastChange = '1.3.6.1.2.1.2.2.1.9';
+ my $snmpIfAlias      = '1.3.6.1.2.1.31.1.1.1.18';
+ my $snmpLocIfDescr   = '1.3.6.1.4.1.9.2.2.1.1.28';
++my $snmpIfInOctets   = '1.3.6.1.2.1.2.2.1.10';
++my $snmpIfOutOctets  = '1.3.6.1.2.1.2.2.1.16';
+ my $hostname;
+ my $ifName;
+ my $session;
+@@ -127,10 +129,14 @@
+ $snmpIfDescr = $snmpIfDescr . "." . $snmpkey;
+ $snmpIfName    = $snmpIfName . "." . $snmpkey ;
+ $snmpIfAlias = $snmpIfAlias . "." . $snmpkey ; 
++$snmpIfInOctets = $snmpIfInOctets . "." . $snmpkey ; 
++$snmpIfOutOctets = $snmpIfOutOctets . "." . $snmpkey ; 
+ 
+ push(@snmpoids,$snmpIfAdminStatus);
+ push(@snmpoids,$snmpIfOperStatus);
+ push(@snmpoids,$snmpIfDescr);
++push(@snmpoids,$snmpIfInOctets);
++push(@snmpoids,$snmpIfOutOctets);
+ push(@snmpoids,$snmpIfName) if (defined $ifXTable) ;
+ push(@snmpoids,$snmpIfAlias) if (defined $ifXTable) ;
+ 
+@@ -219,7 +225,7 @@
+ 
+ 
+ 
+-print ("$state: $answer");
++print ("$state: $answer|in=" . $response->{$snmpIfInOctets} . " out=" . $response->{$snmpIfOutOctets});
+ exit $ERRORS{$state};
+ 
+ 
diff --git a/web/attachments/30441-check_dns_random.diff b/web/attachments/30441-check_dns_random.diff
new file mode 100644
index 0000000..785fbc5
--- /dev/null
+++ b/web/attachments/30441-check_dns_random.diff
@@ -0,0 +1,15 @@
+--- check_dns_random.pl    Thu Sep  5 09:43:22 2002
++++ check_dns_random.pl Thu Sep  5 09:58:32 2002
+@@ -55,9 +55,8 @@
+ $x = rand $wc;
+ ($z,$y) = split(/\./,$x);
+
+-print `$check $data[$z] $host`;
+-
+-
++system($check, $data[$z], $host);
++exit ($? / 256);
+
+ sub usage
+ {
+
diff --git a/web/attachments/304650-check_ntp_peer.patch b/web/attachments/304650-check_ntp_peer.patch
new file mode 100644
index 0000000..632a106
--- /dev/null
+++ b/web/attachments/304650-check_ntp_peer.patch
@@ -0,0 +1,147 @@
+diff -Nur nagios-plugins-1.4.13.orig/plugins/check_ntp_peer.c nagios-plugins-1.4.13/plugins/check_ntp_peer.c
+--- nagios-plugins-1.4.13.orig/plugins/check_ntp_peer.c 2008-09-02 14:28:04.000000000 +0200
++++ nagios-plugins-1.4.13/plugins/check_ntp_peer.c      2008-12-09 14:12:32.000000000 +0100
+@@ -60,6 +60,9 @@
+ static short do_jitter=0;
+ static char *jwarn="-1:5000";
+ static char *jcrit="-1:10000";
++static short do_peer=0;
++static char *pwarn="@1";
++static char *pcrit="@1";
+ static int syncsource_found=0;
+ static int li_alarm=0;
+ 
+@@ -67,6 +70,7 @@
+ thresholds *offset_thresholds = NULL;
+ thresholds *jitter_thresholds = NULL;
+ thresholds *stratum_thresholds = NULL;
++thresholds *peer_thresholds = NULL;
+ void print_help (void);
+ void print_usage (void);
+ 
+@@ -252,7 +256,7 @@
+  *  status is pretty much useless as syncsource_found is a global variable
+  *  used later in main to check is the server was synchronized. It works
+  *  so I left it alone */
+-int ntp_request(const char *host, double *offset, int *offset_result, double *jitter, int *stratum){
++int ntp_request(const char *host, double *offset, int *offset_result, double *jitter, int *stratum, int *peer){
+        int conn=-1, i, npeers=0, num_candidates=0;
+        double tmp_offset = 0;
+        int min_peer_sel=PEER_INCLUDED;
+@@ -266,7 +270,7 @@
+ 
+        status = STATE_OK;
+        *offset_result = STATE_UNKNOWN;
+-       *jitter = *stratum = -1;
++       *jitter = *stratum = *peer = -1;
+ 
+        /* Long-winded explanation:
+         * Getting the sync peer offset, jitter and stratum requires a number of
+@@ -328,6 +332,7 @@
+                }
+        }
+        if(verbose) printf("%d candiate peers available\n", num_candidates);
++       *peer = num_candidates;
+        if(verbose && syncsource_found) printf("synchronization source found\n");
+        if(! syncsource_found){
+                status = STATE_WARNING;
+@@ -471,6 +476,8 @@
+                {"scrit", required_argument, 0, 'C'},
+                {"jwarn", required_argument, 0, 'j'},
+                {"jcrit", required_argument, 0, 'k'},
++               {"pwarn", required_argument, 0, 'o'},
++               {"pcrit", required_argument, 0, 'P'},
+                {"timeout", required_argument, 0, 't'},
+                {"hostname", required_argument, 0, 'H'},
+                {"port", required_argument, 0, 'p'},
+@@ -482,7 +489,7 @@
+                usage ("\n");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:t:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:t:H:p:P:o:", longopts, &option);
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+ 
+@@ -525,6 +532,14 @@
+                        do_jitter=1;
+                        jcrit = optarg;
+                        break;
++               case 'o':
++                       do_peer=1;
++                       pwarn = optarg;
++                       break;
++               case 'P':
++                       do_peer=1;
++                       pcrit = optarg;
++                       break;
+                case 'H':
+                        if(is_host(optarg) == FALSE)
+                                usage2(_("Invalid hostname/address"), optarg);
+@@ -584,8 +599,16 @@
+                TRUE, 0, TRUE, 16);
+ }
+ 
++char *perfd_peer (int num_peer)
++{
++       return perfdata ("num_peer", num_peer, "",
++               do_peer, (int)peer_thresholds->warning->end,
++               do_peer, (int)peer_thresholds->critical->end,
++               TRUE, 0, TRUE, 16);
++}
++
+ int main(int argc, char *argv[]){
+-       int result, offset_result, stratum;
++       int result, offset_result, stratum, peer;
+        double offset=0, jitter=0;
+        char *result_line, *perfdata_line;
+ 
+@@ -602,6 +625,7 @@
+        set_thresholds(&offset_thresholds, owarn, ocrit);
+        set_thresholds(&jitter_thresholds, jwarn, jcrit);
+        set_thresholds(&stratum_thresholds, swarn, scrit);
++       set_thresholds(&peer_thresholds, pwarn, pcrit);
+ 
+        /* initialize alarm signal handling */
+        signal (SIGALRM, socket_timeout_alarm_handler);
+@@ -610,7 +634,7 @@
+        alarm (socket_timeout);
+ 
+        /* This returns either OK or WARNING (See comment preceeding ntp_request) */
+-       result = ntp_request(server_address, &offset, &offset_result, &jitter, &stratum);
++       result = ntp_request(server_address, &offset, &offset_result, &jitter, &stratum, &peer);
+ 
+        if(offset_result == STATE_UNKNOWN) {
+                /* if there's no sync peer (this overrides ntp_request output): */
+@@ -628,6 +652,9 @@
+        if(do_jitter)
+                result = max_state_alt(result, get_status(jitter, jitter_thresholds));
+ 
++       if(do_peer)
++               result = max_state_alt(result, get_status(peer, peer_thresholds));
++
+        switch (result) {
+                case STATE_CRITICAL :
+                        asprintf(&result_line, _("NTP CRITICAL:"));
+@@ -662,6 +689,10 @@
+                asprintf(&result_line, "%s, stratum=%i", result_line, stratum);
+                asprintf(&perfdata_line, "%s %s", perfdata_line, perfd_stratum(stratum));
+        }
++       if (do_peer) {
++               asprintf(&result_line, "%s, num_peer=%i", result_line, peer);
++               asprintf(&perfdata_line, "%s %s", perfdata_line, perfd_peer(peer));
++       }
+        printf("%s|%s\n", result_line, perfdata_line);
+ 
+        if(server_address!=NULL) free(server_address);
+@@ -698,6 +729,10 @@
+        printf ("    %s\n", _("Warning threshold for jitter"));
+        printf (" %s\n", "-k, --jcrit=THRESHOLD");
+        printf ("    %s\n", _("Critical threshold for jitter"));
++       printf (" %s\n", "-o, --pwarn=THRESHOLD");
++       printf ("    %s\n", _("Warning threshold for peer"));
++       printf (" %s\n", "-P, --pcrit=THRESHOLD");
++       printf ("    %s\n", _("Critical threshold for peer"));
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (_(UT_VERBOSE));
+ 
diff --git a/web/attachments/305194-sslutils.c.correcteddayleft.patch b/web/attachments/305194-sslutils.c.correcteddayleft.patch
new file mode 100644
index 0000000..3110327
--- /dev/null
+++ b/web/attachments/305194-sslutils.c.correcteddayleft.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378823707" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378823707" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378823707" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378823707" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378823707');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2424562&group_id=29880&atid=397599&file_id=305194"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/305196-sslutils.c.localtimeformat.patch b/web/attachments/305196-sslutils.c.localtimeformat.patch
new file mode 100644
index 0000000..66435b8
--- /dev/null
+++ b/web/attachments/305196-sslutils.c.localtimeformat.patch
@@ -0,0 +1,25 @@
+--- nagios-plugins-1.4.13/plugins/sslutils.c.prelocaltimeformat 2008-12-13 22:26:49.000000000 +0000
++++ nagios-plugins-1.4.13/plugins/sslutils.c    2008-12-13 22:34:15.000000000 +0000
+@@ -93,7 +93,8 @@
+        int offset;
+        struct tm stamp;
+        int days_left;
+-       char timestamp[17] = "";
++       char timestamp[50] = "";
++       time_t tm_t;
+ 
+        certificate=SSL_get_peer_certificate(s);
+        if(! certificate){
+@@ -139,10 +140,8 @@
+        stamp.tm_isdst = -1;
+ 
+        days_left = (mktime (&stamp) - time (NULL)) / 86400;
+-       snprintf
+-               (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+-                stamp.tm_mon + 1,
+-                stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
++       tm_t = mktime (&stamp);
++       strftime(timestamp, 50, "%c", localtime(&tm_t));
+ 
+        if (days_left > 0 && days_left <= days_till_exp) {
+                printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
diff --git a/web/attachments/305359-sslutils.c.expiry.patch b/web/attachments/305359-sslutils.c.expiry.patch
new file mode 100644
index 0000000..151fc62
--- /dev/null
+++ b/web/attachments/305359-sslutils.c.expiry.patch
@@ -0,0 +1,45 @@
+--- nagios-plugins-1.4.13/plugins/sslutils.c.orig       2008-12-13 22:26:49.000000000 +0000
++++ nagios-plugins-1.4.13/plugins/sslutils.c    2008-12-15 11:46:37.000000000 +0000
+@@ -92,7 +92,7 @@
+         ASN1_STRING *tm;
+        int offset;
+        struct tm stamp;
+-       int days_left;
++       double days_left, hours_left, minutes_left;
+        char timestamp[17] = "";
+ 
+        certificate=SSL_get_peer_certificate(s);
+@@ -138,20 +138,26 @@
+        stamp.tm_sec = 0;
+        stamp.tm_isdst = -1;
+ 
+-       days_left = (mktime (&stamp) - time (NULL)) / 86400;
++       minutes_left = (mktime (&stamp) - time (NULL)) / 60.0;
++       hours_left = minutes_left / 60.0;
++       days_left = hours_left / 24.0;
+        snprintf
+                (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+                 stamp.tm_mon + 1,
+                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+ 
+-       if (days_left > 0 && days_left <= days_till_exp) {
+-               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
+-               return STATE_WARNING;
+-       } else if (days_left < 0) {
++       if (days_left < 0) {
+                printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
+                return STATE_CRITICAL;
+-       } else if (days_left == 0) {
+-               printf (_("WARNING - Certificate expires today (%s).\n"), timestamp);
++       }
++       else if (days_left <= days_till_exp) {
++               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
++               return STATE_WARNING;
++       } else if (days_left < 1 && hours_left > 1 && days_left <= days_till_exp) {
++               printf (_("WARNING - Certificate expires in %d hours (%s).\n"), hours_left, timestamp);
++               return STATE_WARNING;
++       } else if (days_left < 1 && hours_left < 1 && days_left <= days_till_exp) {
++               printf (_("WARNING - Certificate expires in %d minutes (%s).\n"), minutes_left, timestamp);
+                return STATE_WARNING;
+        }
+ 
diff --git a/web/attachments/305360-sslutils.c.expiry.patch b/web/attachments/305360-sslutils.c.expiry.patch
new file mode 100644
index 0000000..151fc62
--- /dev/null
+++ b/web/attachments/305360-sslutils.c.expiry.patch
@@ -0,0 +1,45 @@
+--- nagios-plugins-1.4.13/plugins/sslutils.c.orig       2008-12-13 22:26:49.000000000 +0000
++++ nagios-plugins-1.4.13/plugins/sslutils.c    2008-12-15 11:46:37.000000000 +0000
+@@ -92,7 +92,7 @@
+         ASN1_STRING *tm;
+        int offset;
+        struct tm stamp;
+-       int days_left;
++       double days_left, hours_left, minutes_left;
+        char timestamp[17] = "";
+ 
+        certificate=SSL_get_peer_certificate(s);
+@@ -138,20 +138,26 @@
+        stamp.tm_sec = 0;
+        stamp.tm_isdst = -1;
+ 
+-       days_left = (mktime (&stamp) - time (NULL)) / 86400;
++       minutes_left = (mktime (&stamp) - time (NULL)) / 60.0;
++       hours_left = minutes_left / 60.0;
++       days_left = hours_left / 24.0;
+        snprintf
+                (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+                 stamp.tm_mon + 1,
+                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+ 
+-       if (days_left > 0 && days_left <= days_till_exp) {
+-               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
+-               return STATE_WARNING;
+-       } else if (days_left < 0) {
++       if (days_left < 0) {
+                printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
+                return STATE_CRITICAL;
+-       } else if (days_left == 0) {
+-               printf (_("WARNING - Certificate expires today (%s).\n"), timestamp);
++       }
++       else if (days_left <= days_till_exp) {
++               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
++               return STATE_WARNING;
++       } else if (days_left < 1 && hours_left > 1 && days_left <= days_till_exp) {
++               printf (_("WARNING - Certificate expires in %d hours (%s).\n"), hours_left, timestamp);
++               return STATE_WARNING;
++       } else if (days_left < 1 && hours_left < 1 && days_left <= days_till_exp) {
++               printf (_("WARNING - Certificate expires in %d minutes (%s).\n"), minutes_left, timestamp);
+                return STATE_WARNING;
+        }
+ 
diff --git a/web/attachments/305376-nagios-plugins-1.4.13-check_ldap_certificate.patch b/web/attachments/305376-nagios-plugins-1.4.13-check_ldap_certificate.patch
new file mode 100644
index 0000000..c1a45f1
--- /dev/null
+++ b/web/attachments/305376-nagios-plugins-1.4.13-check_ldap_certificate.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-2 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378825124" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378825124" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378825124" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378825124" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378825124');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2430999&group_id=29880&atid=397599&file_id=305376"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/306172-nagios-plugins-1.4.13-check_ldap_certificate.patch b/web/attachments/306172-nagios-plugins-1.4.13-check_ldap_certificate.patch
new file mode 100644
index 0000000..9f8fa2a
--- /dev/null
+++ b/web/attachments/306172-nagios-plugins-1.4.13-check_ldap_certificate.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-10 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378825124" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378825124" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378825124" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378825124" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378825124');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2430999&group_id=29880&atid=397599&file_id=306172"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/306246-check_procs_perf b/web/attachments/306246-check_procs_perf
new file mode 100644
index 0000000..acbd997
--- /dev/null
+++ b/web/attachments/306246-check_procs_perf
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+RET=`/usr/lib/nagios/plugins/check_procs "$@"`
+STATUS=$?
+
+getopts c:w: name "$@"
+eval $name=$OPTARG
+getopts c:w: name "$@"
+eval $name=$OPTARG
+
+VAL=`echo $RET | sed 's/^.*: \([0-9]*\) process.*$/\1/'`
+echo "$RET|procs=$VAL;$w;$c;0"
+
+exit $STATUS
diff --git a/web/attachments/309099-check_disk.txt b/web/attachments/309099-check_disk.txt
new file mode 100644
index 0000000..500ab18
--- /dev/null
+++ b/web/attachments/309099-check_disk.txt
@@ -0,0 +1,68 @@
+*** plugins/check_disk.c.orig   Thu Jul 10 11:03:55 2008
+--- plugins/check_disk.c        Wed Jan 14 11:49:37 2009
+***************
+*** 155,160 ****
+--- 155,161 ----
+  int path_selected = FALSE;
+  char *group = NULL;
+  struct stat *stat_buf;
++ int no_match_ok = 0;
+  
+  
+  int
+***************
+*** 493,498 ****
+--- 494,500 ----
+      {"ignore-ereg-partition", required_argument, 0, 'i'},
+      {"ignore-eregi-path", required_argument, 0, 'I'},
+      {"ignore-eregi-partition", required_argument, 0, 'I'},
++     {"no-match-ok", no_argument, 0, 'n'},
+      {"local", no_argument, 0, 'l'},
+      {"stat-remote-fs", no_argument, 0, 'L'},
+      {"mountpoint", no_argument, 0, 'M'},
+***************
+*** 517,523 ****
+        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);
+  
+      if (c == -1 || c == EOF)
+        break;
+--- 519,525 ----
+        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:MEAn", longopts, &option);
+  
+      if (c == -1 || c == EOF)
+        break;
+***************
+*** 669,674 ****
+--- 671,679 ----
+          die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set group value before selecting pathes \n"));
+        group = optarg;
+        break;
++     case 'n':                 /* Don't complain if a regular expression doesn't match anything */
++       no_match_ok = 1;
++       break;
+      case 'I':
+        cflags |= REG_ICASE;
+      case 'i':
+***************
+*** 741,747 ****
+          }
+        }
+  
+!       if (!fnd)
+          die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"),
+              _("Regular expression did not match any path or disk"), optarg);
+  
+--- 746,752 ----
+          }
+        }
+  
+!       if (!fnd && !no_match_ok)
+          die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"),
+              _("Regular expression did not match any path or disk"), optarg);
+  
diff --git a/web/attachments/310361-nagios-1.4.13-no_pass.diff b/web/attachments/310361-nagios-1.4.13-no_pass.diff
new file mode 100644
index 0000000..b621967
--- /dev/null
+++ b/web/attachments/310361-nagios-1.4.13-no_pass.diff
@@ -0,0 +1,44 @@
+--- nagios-plugins-1.4.13/plugins/check_mysql.c 2008-08-16 00:47:32.000000000 -0400
++++ nagios-plugins-1.4.13-no_pass/plugins/check_mysql.c 2009-01-23 18:10:48.000000000 -0500
+@@ -265,7 +265,7 @@
+                return ERROR;
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:s:c:w:", longopts, &option);
++               c = getopt_long (argc, argv, "hvVSP:p::u:d:H:s:c:w:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -289,12 +289,16 @@
+                        db_user = optarg;
+                        break;
+                case 'p':                                                                       /* authentication information: password */
+-                       db_pass = strdup(optarg);
+-
+-                       /* Delete the password from process list */
+-                       while (*optarg != '\0') {
+-                               *optarg = 'X';
+-                               optarg++;
++                       if (optarg == NULL)
++                               db_pass = strdup("");
++                       else
++                       {
++                               db_pass = strdup(optarg);
++                               /* Delete the password from process list */
++                               while (*optarg != '\0') {
++                                       *optarg = 'X';
++                                       optarg++;
++                               }
+                        }
+                        break;
+                case 'P':                                                                       /* critical time threshold */
+@@ -361,9 +365,6 @@
+        if (db_host == NULL)
+                db_host = strdup("");
+ 
+-       if (db_pass == NULL)
+-               db_pass = strdup("");
+-
+        if (db == NULL)
+                db = strdup("");
+ 
diff --git a/web/attachments/310959-libexec.zip b/web/attachments/310959-libexec.zip
new file mode 100644
index 0000000..2aa0318
--- /dev/null
+++ b/web/attachments/310959-libexec.zip
diff --git a/web/attachments/31133-check_http.diff b/web/attachments/31133-check_http.diff
new file mode 100644
index 0000000..1e80479
--- /dev/null
+++ b/web/attachments/31133-check_http.diff
@@ -0,0 +1,32 @@
+--- check_http.c        Thu Feb 28 07:42:57 2002
++++ /root/check_http.c  Sat Sep 14 22:51:21 2002
+@@ -529,6 +529,9 @@
+        size_t pagesize = 0;
+        char *full_page = NULL;
+        char *pos = NULL;
++#ifdef HAVE_SSL
++       int sslerr;
++#endif
+ 
+        /* try to connect to the host at the given port number */
+ #ifdef HAVE_SSL
+@@ -660,8 +663,18 @@
+                pagesize += i;
+        }
+ 
+-       if (i < 0)
++       if (i < 0) {
++#ifdef HAVE_SSL
++               sslerr=SSL_get_error(ssl, i);
++               if ( sslerr == SSL_ERROR_SSL ) {
++                       terminate (STATE_WARNING, "Client Certificate Required\n");
++               } else {
++                       terminate (STATE_CRITICAL, "Error in recv()");
++               }
++#else
+                terminate (STATE_CRITICAL, "Error in recv()");
++#endif
++       }
+ 
+        /* return a CRITICAL status if we couldn't read any data */
+        if (pagesize == (size_t) 0)
diff --git a/web/attachments/311556-patch-nagios-plugins-1.4.12 b/web/attachments/311556-patch-nagios-plugins-1.4.12
new file mode 100644
index 0000000..49a3d6f
--- /dev/null
+++ b/web/attachments/311556-patch-nagios-plugins-1.4.12
@@ -0,0 +1,56 @@
+--- check_smtp.orig     2009-01-19 10:57:05.000000000 +0100
++++ check_smtp.c        2009-01-19 11:34:04.000000000 +0100
+@@ -103,9 +103,9 @@
+ 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;
+@@ -432,9 +432,9 @@
+        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;
+        }
+ 
+@@ -565,21 +565,19 @@
+                        nresponses++;
+                        break;
+                case 'c':                                                                       /* critical time threshold */
+-                       if (is_intnonneg (optarg)) {
+-                               critical_time = atoi (optarg);
+-                               check_critical_time = TRUE;
+-                       }
++                       if (!is_nonnegative (optarg))
++                               usage4 (_("Critical time must be a positive"));
+                        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)) {
+-                               warning_time = atoi (optarg);
+-                               check_warning_time = TRUE;
+-                       }
++                       if (!is_nonnegative (optarg))
++                               usage4 (_("Warning time must be a positive"));
+                        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/web/attachments/313868-check_snmp.patch b/web/attachments/313868-check_snmp.patch
new file mode 100644
index 0000000..439617f
--- /dev/null
+++ b/web/attachments/313868-check_snmp.patch
@@ -0,0 +1,11 @@
+--- check_snmp-old.c    2008-12-23 06:53:16.000000000 -0500
++++ check_snmp.c        2009-02-17 01:10:44.094965523 -0500
+@@ -968,6 +968,8 @@
+   printf ("    %s\n", _("SNMPv3 authentication password"));
+   printf (" %s\n", "-X, --privpasswd=PASSWORD");
+   printf ("    %s\n", _("SNMPv3 privacy password"));
++  printf (" %s\n", "-e, --retries=INTEGER");
++  printf ("    %s\n", _("Number of times to retry query"));
+ 
+        /* OID Stuff */
+        printf (" %s\n", "-o, --oid=OID(s)");
diff --git a/web/attachments/314900-truss-check_procs b/web/attachments/314900-truss-check_procs
new file mode 100644
index 0000000..87d91d0
--- /dev/null
+++ b/web/attachments/314900-truss-check_procs
@@ -0,0 +1,128 @@
+execve("/usit/spider/local/store/localhost/.nagios-plugins/ver-1.4.13/opt/nagios/libexec/check_procs@sun4os58", 0xFFBEFC1C, 0xFFBEFC24)  argc = 1
+resolvepath("/usr/lib/ld.so.1", "/usr/lib/ld.so.1", 1023) = 16
+open("/var/ld/ld.config", O_RDONLY)             Err#2 ENOENT
+stat("/local/lib/libm.so.1", 0xFFBEF33C)        Err#2 ENOENT
+stat("/usr/openwin/lib/libm.so.1", 0xFFBEF33C)  Err#2 ENOENT
+stat("/usr/lib/libm.so.1", 0xFFBEF33C)          = 0
+open("/usr/lib/libm.so.1", O_RDONLY)            = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0x00000000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE, 3, 0) = 0xFF3A0000
+mmap(0x00000000, 155648, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF370000
+mmap(0xFF370000, 84962, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF370000
+mmap(0xFF394000, 4228, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 81920) = 0xFF394000
+munmap(0xFF386000, 57344)                       = 0
+mmap(0x00000000, 8192, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) = 0xFF360000
+memcntl(0xFF370000, 8144, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/local/lib/libintl.so.8", 0xFFBEF33C)     = 0
+open("/local/lib/libintl.so.8", O_RDONLY)       = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0xFF3A0000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF3A0000
+mmap(0x00000000, 122880, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF330000
+mmap(0xFF330000, 49728, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF330000
+mmap(0xFF34C000, 2476, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 49152) = 0xFF34C000
+munmap(0xFF33E000, 57344)                       = 0
+memcntl(0xFF330000, 14872, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/local/lib/libiconv.so.2", 0xFFBEF33C)    = 0
+open("/local/lib/libiconv.so.2", O_RDONLY)      = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0xFF3A0000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF3A0000
+mmap(0x00000000, 1081344, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF200000
+mmap(0xFF200000, 1003443, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF200000
+mmap(0xFF304000, 9144, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 999424) = 0xFF304000
+munmap(0xFF2F6000, 57344)                       = 0
+memcntl(0xFF200000, 68624, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/local/lib/libc.so.1", 0xFFBEF33C)        Err#2 ENOENT
+stat("/usr/openwin/lib/libc.so.1", 0xFFBEF33C)  Err#2 ENOENT
+stat("/usr/lib/libc.so.1", 0xFFBEF33C)          = 0
+open("/usr/lib/libc.so.1", O_RDONLY)            = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0xFF3A0000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF3A0000
+mmap(0x00000000, 802816, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF100000
+mmap(0xFF100000, 702416, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF100000
+mmap(0xFF1BC000, 24772, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 704512) = 0xFF1BC000
+munmap(0xFF1AC000, 65536)                       = 0
+memcntl(0xFF100000, 113528, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/local/lib/libnsl.so.1", 0xFFBEF33C)      Err#2 ENOENT
+stat("/usr/openwin/lib/libnsl.so.1", 0xFFBEF33C) Err#2 ENOENT
+stat("/usr/lib/libnsl.so.1", 0xFFBEF33C)        = 0
+open("/usr/lib/libnsl.so.1", O_RDONLY)          = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0xFF3A0000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF3A0000
+mmap(0x00000000, 712704, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF000000
+mmap(0xFF000000, 579850, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF000000
+mmap(0xFF09E000, 33168, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 581632) = 0xFF09E000
+mmap(0xFF0A8000, 23224, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED|MAP_ANON, -1, 0) = 0xFF0A8000
+munmap(0xFF08E000, 65536)                       = 0
+memcntl(0xFF000000, 83740, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/local/lib/libsocket.so.1", 0xFFBEF33C)   Err#2 ENOENT
+stat("/usr/openwin/lib/libsocket.so.1", 0xFFBEF33C) Err#2 ENOENT
+stat("/usr/lib/libsocket.so.1", 0xFFBEF33C)     = 0
+open("/usr/lib/libsocket.so.1", O_RDONLY)       = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0xFF3A0000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF3A0000
+mmap(0x00000000, 114688, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF1E0000
+mmap(0xFF1E0000, 40558, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF1E0000
+mmap(0xFF1FA000, 4365, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 40960) = 0xFF1FA000
+munmap(0xFF1EA000, 65536)                       = 0
+memcntl(0xFF1E0000, 14496, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/local/lib/libdl.so.1", 0xFFBEF33C)       Err#2 ENOENT
+stat("/usr/openwin/lib/libdl.so.1", 0xFFBEF33C) Err#2 ENOENT
+stat("/usr/lib/libdl.so.1", 0xFFBEF33C)         = 0
+open("/usr/lib/libdl.so.1", O_RDONLY)           = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0xFF3A0000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF3A0000
+close(3)                                        = 0
+stat("/usr/lib/libmp.so.2", 0xFFBEF33C)         = 0
+open("/usr/lib/libmp.so.2", O_RDONLY)           = 3
+fstat(3, 0xFFBEF33C)                            = 0
+mmap(0x00000000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE, 3, 0) = 0xFF320000
+mmap(0x00000000, 90112, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF0E0000
+mmap(0xFF0E0000, 11316, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF0E0000
+mmap(0xFF0F4000, 865, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 16384) = 0xFF0F4000
+munmap(0xFF0E4000, 65536)                       = 0
+memcntl(0xFF0E0000, 3124, MC_ADVISE, MADV_WILLNEED, 0, 0) = 0
+close(3)                                        = 0
+stat("/usr/platform/SUNW,Ultra-5_10/lib/libc_psr.so.1", 0xFFBEF104) = 0
+open("/usr/platform/SUNW,Ultra-5_10/lib/libc_psr.so.1", O_RDONLY) = 3
+fstat(3, 0xFFBEF104)                            = 0
+mmap(0xFF320000, 8192, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF320000
+mmap(0x00000000, 16384, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE|MAP_ANON, -1, 0) = 0xFF310000
+mmap(0xFF310000, 13800, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xFF310000
+close(3)                                        = 0
+mmap(0x00000000, 8192, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) = 0xFF1D0000
+munmap(0xFF320000, 8192)                        = 0
+brk(0x0004B630)                                 = 0
+brk(0x0004D630)                                 = 0
+brk(0x0004D630)                                 = 0
+brk(0x0004F630)                                 = 0
+brk(0x0004F630)                                 = 0
+brk(0x00051630)                                 = 0
+getpid()                                        = 5322 [5321]
+sigaction(SIGALRM, 0xFFBED9E8, 0xFFBEDA68)      = 0
+alarm(10)                                       = 0
+sysconfig(_CONFIG_OPEN_FILES)                   = 256
+brk(0x00051630)                                 = 0
+brk(0x00053630)                                 = 0
+pipe()                                          = 3 [4]
+pipe()                                          = 5 [6]
+fork()                                          = 5323
+close(4)                                        = 0
+close(6)                                        = 0
+read(3, 0xFFBEC9D8, 4096)                       = 0
+read(5, 0xFFBEC9D8, 4096)                       = 0
+close(3)                                        = 0
+waitid(P_PID, 5323, 0xFFBED8F0, WEXITED|WTRAPPED) = 0
+getuid()                                        = 0 [0]
+getuid()                                        = 0 [0]
+getgid()                                        = 1 [1]
+getgid()                                        = 1 [1]
+ioctl(1, TCGETA, 0xFFBECD14)                    = 0
+write(1, " U n a b l e   t o   r e".., 22)      = 22
+llseek(0, 0, SEEK_CUR)                          = 3219
+_exit(3)
diff --git a/web/attachments/316148-patch.diff b/web/attachments/316148-patch.diff
new file mode 100644
index 0000000..65f71d5
--- /dev/null
+++ b/web/attachments/316148-patch.diff
@@ -0,0 +1,12 @@
+*** check_nrpe.c        2009-03-04 15:21:49.000000000 +0100
+--- check_nrpe_new.c    2009-03-04 15:21:36.000000000 +0100
+***************
+*** 389,394 ****
+--- 389,395 ----
+                        return ERROR;
+                        break;
+                        }
++         if (argindex > 0) break;   
+                }
+  
+        /* determine (base) command query */
diff --git a/web/attachments/317729-check_snmp.patch b/web/attachments/317729-check_snmp.patch
new file mode 100644
index 0000000..63ae35f
--- /dev/null
+++ b/web/attachments/317729-check_snmp.patch
@@ -0,0 +1,406 @@
+Index: plugins/check_snmp.c
+===================================================================
+--- plugins/check_snmp.c        (revision 2160)
++++ plugins/check_snmp.c        (working copy)
+@@ -34,7 +34,7 @@
+ 
+ #include "common.h"
+ #include "utils.h"
+-#include "popen.h"
++#include "utils_cmd.h"
+ 
+ #define DEFAULT_COMMUNITY "public"
+ #define DEFAULT_PORT "161"
+@@ -91,14 +91,14 @@
+ regmatch_t pmatch[10];
+ char timestamp[10] = "";
+ char errbuf[MAX_INPUT_BUFFER] = "";
+-char perfstr[MAX_INPUT_BUFFER] = "";
++char perfstr[MAX_INPUT_BUFFER] = "| ";
+ int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+ int eflags = 0;
+ int errcode, excode;
+ 
+ char *server_address = NULL;
+ char *community = NULL;
+-char *authpriv = NULL;
++char **authpriv = NULL;
+ char *proto = NULL;
+ char *seclevel = NULL;
+ char *secname = NULL;
+@@ -106,10 +106,11 @@
+ char *privproto = NULL;
+ char *authpasswd = NULL;
+ char *privpasswd = NULL;
+-char *oid;
++char **oids = NULL; 
+ char *label;
+ char *units;
+ char *port;
++char *snmpcmd;
+ char string_value[MAX_INPUT_BUFFER] = "";
+ char **labels = NULL;
+ char **unitv = NULL;
+@@ -117,6 +118,8 @@
+ size_t labels_size = 8;
+ size_t nunits = 0;
+ size_t unitv_size = 8;
++int numoids = 0;
++int numauthpriv = 0;
+ int verbose = FALSE;
+ int usesnmpgetnext = FALSE;
+ unsigned long long lower_warn_lim[MAX_OIDS];
+@@ -139,18 +142,16 @@
+ {
+        int i = 0;
+        int iresult = STATE_UNKNOWN;
+-       int found = 0;
+-       int result = STATE_DEPENDENT;
+-       char input_buffer[MAX_INPUT_BUFFER];
+-       char *command_line = NULL;
++       int result = STATE_UNKNOWN;
++       char **command_line = NULL;
+        char *cl_hidden_auth = NULL;
++       char *oidname = NULL;
+        char *response = NULL;
+        char *outbuff;
+-       char *output;
+        char *ptr = NULL;
+-       char *p2 = NULL;
+        char *show = NULL;
+        char type[8] = "";
++       output chld_out, chld_err;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -162,12 +163,10 @@
+                eval_method[i] = CHECK_UNDEF;
+        i = 0;
+ 
+-       oid = strdup ("");
+        label = strdup ("SNMP");
+        units = strdup ("");
+        port = strdup (DEFAULT_PORT);
+        outbuff = strdup ("");
+-       output = strdup ("");
+        delimiter = strdup (" = ");
+        output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
+        /* miblist = strdup (DEFAULT_MIBLIST); */
+@@ -180,92 +179,71 @@
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+-       /* create the command line to execute */
+-               if(usesnmpgetnext == TRUE) {
+-               asprintf(&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+-                       PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
+-                       authpriv, server_address, port, oid);
+-               asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+-                       PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
+-                       "[authpriv]", server_address, port, oid);
++       /* Create the command array to execute */
++       if(usesnmpgetnext == TRUE) {
++               snmpcmd = strdup (PATH_TO_SNMPGETNEXT);
+        }else{
++               snmpcmd = strdup (PATH_TO_SNMPGET);
++       } 
++       
++        /* 10 is the number of arguments to pass before authpriv options and OIDs. Add one for terminating NULL */
++       command_line = calloc (10 + numauthpriv + numoids + 1, sizeof (char *));
++       command_line[0] = snmpcmd;
++       command_line[1] = strdup ("-t");
++       asprintf (&command_line[2], "%d", timeout_interval);
++       command_line[3] = strdup ("-r");
++       asprintf (&command_line[4], "%d", retries);
++       command_line[5] = strdup ("-m");
++       command_line[6] = strdup (miblist);
++       command_line[7] = "-v";
++       command_line[8] = strdup (proto);
++       asprintf (&command_line[9], "%s:%s", server_address, port);
+ 
+-               asprintf (&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+-                       PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+-                       authpriv, server_address, port, oid);
+-               asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+-                       PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+-                       "[authpriv]", server_address, port, oid);
++       for (i = 0; i < numauthpriv; i++) {
++               command_line[10 + numoids + i] = authpriv[i];
+        }
+ 
+-       if (verbose)
+-               printf ("%s\n", command_line);
++        /* This is just for display purposes, so it can remain a string */
++       asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s:%s %s",
++               snmpcmd, timeout_interval, retries, miblist, proto,
++               server_address, port, "[authpriv]");
+ 
+-
+-       /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), cl_hidden_auth);
+-               exit (STATE_UNKNOWN);
++       for (i = 0; i < numoids; i++) {
++               command_line[10 + i] = oids[i];
++               asprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);    
+        }
+ 
+-#if 0          /* Removed May 29, 2007 */
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL) {
+-               printf (_("Could not open stderr for %s\n"), cl_hidden_auth);
+-       }
+-#endif
+-
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+-               asprintf (&output, "%s%s", output, input_buffer);
+-
+        if (verbose)
+-               printf ("%s\n", output);
++               printf ("%s\n", cl_hidden_auth);
+ 
+-       ptr = output;
++       /* Run the command */
++       result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
+ 
+-       strncat(perfstr, "| ", sizeof(perfstr)-strlen(perfstr)-1);
+-       while (ptr) {
+-               char *foo, *ptr2;
+-               unsigned int copylen;
++       if (chld_err.lines > 0) {
++               printf ("%s problem - error output from command\nCMD: %s\n", label, cl_hidden_auth);
++               for (i = 0; i < chld_err.lines; i++) {
++                       printf ("%s\n", chld_err.line[i]);
++               }
++               exit (STATE_WARNING);
++       }
+ 
+-               foo = strstr (ptr, delimiter);
+-               copylen = foo-ptr;
+-               if (copylen > sizeof(perfstr)-strlen(perfstr)-1)
+-                       copylen = sizeof(perfstr)-strlen(perfstr)-1;
+-               ptr2 = ptr;
+-               ptr = foo;
++       /* Return UNKNOWN or worse if no output is returned */
++       if (chld_out.lines == 0)
++               die (max_state_alt (result, STATE_UNKNOWN), _("%s problem - No data received from host\nCMD: %s\n"),
++                                                               label,
++                                                               cl_hidden_auth);
+ 
+-               if (ptr == NULL)
+-                       break;
+-
+-               ptr += strlen (delimiter);
+-               ptr += strspn (ptr, " ");
+-
+-               found++;
+-
+-               if (ptr[0] == '"') {
+-                       ptr++;
+-                       response = strpcpy (response, ptr, "\"");
+-                       ptr = strpbrk (ptr, "\"");
+-                       ptr += strspn (ptr, "\"\n");
++       if (verbose) {
++               for (i = 0; i < chld_out.lines; i++) {
++                       printf ("%s\n", chld_out.line[i]);
+                }
+-               else {
+-                       response = strpcpy (response, ptr, "\n");
+-                       ptr = strpbrk (ptr, "\n");
+-                       ptr += strspn (ptr, "\n");
+-                       while
+-                               (strstr (ptr, delimiter) &&
+-                                strstr (ptr, "\n") && strstr (ptr, "\n") < strstr (ptr, delimiter)) {
+-                               response = strpcat (response, ptr, "\n");
+-                               ptr = strpbrk (ptr, "\n");
+-                       }
+-                       if (ptr && strstr (ptr, delimiter) == NULL) {
+-                               asprintf (&response, "%s%s", response, ptr);
+-                               ptr = NULL;
+-                       }
+-               }
++       }
+ 
++       for (i = 0; i < chld_out.lines; i++) {
++               ptr = chld_out.line[i];
++               oidname = strpcpy (oidname, ptr, delimiter); 
++               response = strstr (ptr, delimiter);
++
+                /* We strip out the datatype indicator for PHBs */
+ 
+                /* Clean up type array - Sol10 does not necessarily zero it out */
+@@ -289,7 +267,6 @@
+                        show = strstr (response, "STRING: ") + 8;
+                else
+                        show = response;
+-               p2 = show;
+ 
+                iresult = STATE_DEPENDENT;
+ 
+@@ -306,10 +283,10 @@
+                    eval_method[i] & WARN_LE ||
+                    eval_method[i] & WARN_EQ ||
+                    eval_method[i] & WARN_NE) {
+-                       p2 = strpbrk (p2, "0123456789");
+-                       if (p2 == NULL)
++                       ptr = strpbrk (show, "0123456789");
++                       if (ptr == NULL)
+                                die (STATE_UNKNOWN,_("No valid data returned"));
+-                       response_value[i] = strtoul (p2, NULL, 10);
++                       response_value[i] = strtoul (ptr, NULL, 10);
+                        iresult = check_num (i);
+                        asprintf (&show, "%llu", response_value[i]);
+                }
+@@ -364,10 +341,8 @@
+                if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
+                        asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
+ 
+-               i++;
+-
+                if (is_numeric(show)) {
+-                       strncat(perfstr, ptr2, copylen);
++                       strncat(perfstr, oidname, sizeof(perfstr)-strlen(perfstr)-1);
+                        strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
+                        strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
+ 
+@@ -375,29 +350,6 @@
+                                strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
+                        strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
+                }
+-
+-       }       /* end while (ptr) */
+-
+-       if (found == 0)
+-               die (STATE_UNKNOWN,
+-                       _("%s problem - No data received from host\nCMD: %s\n"),
+-                       label,
+-                       cl_hidden_auth);
+-
+-#if 0          /* Removed May 29, 2007 */
+-       /* WARNING if output found on stderr */
+-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+-               result = max_state (result, STATE_WARNING);
+-
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-#endif
+-
+-       /* close the pipe */
+-       if (spclose (child_process)) {
+-               if (result == STATE_OK)
+-                       result = STATE_UNKNOWN;
+-               asprintf (&outbuff, "%s (%s)", outbuff, _("snmpget returned an error status"));
+        }
+ 
+ /*     if (nunits == 1 || i == 1) */
+@@ -563,12 +515,12 @@
+                                         */
+                                        needmibs = TRUE;
+                        }
+-
+-                       for (ptr = optarg; (ptr = index (ptr, ',')); ptr++)
+-                               ptr[0] = ' '; /* relpace comma with space */
+-                       for (ptr = optarg; (ptr = index (ptr, ' ')); ptr++)
+-                               j++; /* count OIDs */
+-                       asprintf (&oid, "%s %s", (oid?oid:""), optarg);
++                       oids = calloc(MAX_OIDS, sizeof (char *));
++                       for (ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", ")) {
++                               oids[j] = strdup(ptr);
++                               j++;
++                       }
++                       numoids = j;
+                        if (c == 'E' || c == 'e') {
+                                jj++;
+                                ii++;
+@@ -728,16 +680,25 @@
+ 
+        if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) {  /* default protocol version */
+                asprintf(&proto, DEFAULT_PROTOCOL);
+-               asprintf(&authpriv, "%s%s", "-c ", community);
++               numauthpriv = 2;
++               authpriv = calloc (numauthpriv, sizeof (char *));
++               authpriv[0] = strdup ("-c");
++               authpriv[1] = strdup (community);
+        }
+        else if ( strcmp (proto, "2c") == 0 ) {         /* snmpv2c args */
+-               asprintf(&authpriv, "%s%s", "-c ", community);
++               numauthpriv = 2;
++               authpriv = calloc (numauthpriv, sizeof (char *));
++               authpriv[0] = strdup ("-c");
++               authpriv[1] = strdup (community);
+        }
+        else if ( strcmp (proto, "3") == 0 ) {          /* snmpv3 args */
+                asprintf(&proto, "%s", "3");
+ 
+                if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) {
+-                       asprintf(&authpriv, "%s", "-l noAuthNoPriv" );
++                       numauthpriv = 2;
++                       authpriv = calloc (numauthpriv, sizeof (char *));
++                       authpriv[0] = strdup ("-l");
++                       authpriv[1] = strdup ("noAuthNoPriv");
+                }
+                else if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+                        if ( secname == NULL || authpasswd == NULL) {
+@@ -745,7 +706,16 @@
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+                        }
+-                       asprintf(&authpriv, "-l authNoPriv -a %s -u %s -A %s ", authproto, secname, authpasswd);
++                       numauthpriv = 8;
++                       authpriv = calloc (numauthpriv, sizeof (char *));
++                       authpriv[0] = strdup ("-l");
++                       authpriv[1] = strdup ("authNoPriv");
++                       authpriv[3] = strdup ("-a");
++                       authpriv[4] = strdup (authproto);
++                       authpriv[5] = strdup ("-u");
++                       authpriv[6] = strdup (secname);
++                       authpriv[7] = strdup ("-A");
++                       authpriv[8] = strdup (authpasswd);
+                }
+                else if ( strcmp(seclevel, "authPriv") == 0 ) {
+                        if ( secname == NULL || authpasswd == NULL || privpasswd == NULL ) {
+@@ -753,7 +723,20 @@
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+                        }
+-                       asprintf(&authpriv, "-l authPriv -a %s -u %s -A %s -x %s -X %s ", authproto, secname, authpasswd, privproto, privpasswd);
++                       numauthpriv = 12;
++                       authpriv = calloc (numauthpriv, sizeof (char *));
++                       authpriv[0] = strdup ("-l");
++                       authpriv[1] = strdup ("authPriv");
++                       authpriv[3] = strdup ("-a");
++                       authpriv[4] = strdup (authproto);
++                       authpriv[5] = strdup ("-u");
++                       authpriv[6] = strdup (secname);
++                       authpriv[7] = strdup ("-A");
++                       authpriv[8] = strdup (authpasswd);
++                       authpriv[9] = strdup ("-x");
++                       authpriv[10] = strdup (privproto);
++                       authpriv[11] = strdup ("-X");
++                       authpriv[12] = strdup (privpasswd);
+                }
+ 
+        }
+Index: plugins/Makefile.am
+===================================================================
+--- plugins/Makefile.am (revision 2160)
++++ plugins/Makefile.am (working copy)
+@@ -93,7 +93,7 @@
+ check_procs_LDADD = $(BASEOBJS)
+ check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
+ check_real_LDADD = $(NETLIBS)
+-check_snmp_LDADD = $(BASEOBJS) popen.o
++check_snmp_LDADD = $(BASEOBJS)
+ check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+ check_ssh_LDADD = $(NETLIBS)
+ check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
+@@ -135,7 +135,7 @@
+ 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) popen.o $(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)
diff --git a/web/attachments/318264-check_snmp_max_oids.patch b/web/attachments/318264-check_snmp_max_oids.patch
new file mode 100644
index 0000000..c2a3217
--- /dev/null
+++ b/web/attachments/318264-check_snmp_max_oids.patch
@@ -0,0 +1,15 @@
+diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
+index 3dc52df..41a5ea1 100644
+--- a/plugins/check_snmp.c
++++ b/plugins/check_snmp.c
+@@ -527,9 +527,8 @@ process_arguments (int argc, char **argv)
+                                        needmibs = TRUE;
+                        }
+                        oids = calloc(MAX_OIDS, sizeof (char *));
+-                       for (ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", ")) {
++                       for (ptr = strtok(optarg, ", "); ptr != NULL && j < MAX_OIDS; ptr = strtok(NULL, ", "), j++) {
+                                oids[j] = strdup(ptr);
+-                               j++;
+                        }
+                        numoids = j;
+                        if (c == 'E' || c == 'e') {
diff --git a/web/attachments/318691-check_mysql.patch b/web/attachments/318691-check_mysql.patch
new file mode 100644
index 0000000..1716c74
--- /dev/null
+++ b/web/attachments/318691-check_mysql.patch
@@ -0,0 +1,19 @@
+--- nagios-plugins-1.4.13/plugins/check_mysql.c 2008-08-16 06:47:32.000000000 +0200
++++ nagios-plugins-1.4.13.oskar/plugins/check_mysql.c   2009-03-19 16:50:18.000000000 +0100
+@@ -181,13 +181,14 @@
+                                        continue;
+                                }
+                        }
++
+                        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");
+                        }
+                        
+-                       snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], row[seconds_behind_field]);
++                       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");
+                        if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
+                                mysql_free_result (res);
+                                mysql_close (&mysql);
+
diff --git a/web/attachments/318840-sslutils_sni.patch b/web/attachments/318840-sslutils_sni.patch
new file mode 100644
index 0000000..4251244
--- /dev/null
+++ b/web/attachments/318840-sslutils_sni.patch
@@ -0,0 +1,85 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index c8ae67f..33a9379 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -790,6 +790,9 @@ check_http (void)
+     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+ #ifdef HAVE_SSL
+   if (use_ssl == TRUE) {
++    /* Set host name for SSL/TLS hostname extension support (SNI) */
++    if (host_name)
++      np_net_ssl_set_host_name(host_name);
+     np_net_ssl_init(sd);
+     if (check_cert == TRUE) {
+       result = np_net_ssl_check_cert(days_till_exp);
+diff --git a/plugins/netutils.h b/plugins/netutils.h
+index 6bc5386..c6f863d 100644
+--- a/plugins/netutils.h
++++ b/plugins/netutils.h
+@@ -96,6 +96,7 @@ void np_net_ssl_cleanup();
+ int np_net_ssl_write(const void *buf, int num);
+ int np_net_ssl_read(void *buf, int num);
+ int np_net_ssl_check_cert(int days_till_exp);
++void np_net_ssl_set_host_name(const char *buf);
+ #endif /* HAVE_SSL */
+ 
+ #endif /* _NETUTILS_H_ */
+diff --git a/plugins/sslutils.c b/plugins/sslutils.c
+index 1d4ef94..a8aee93 100644
+--- a/plugins/sslutils.c
++++ b/plugins/sslutils.c
+@@ -34,6 +34,7 @@
+ static SSL_CTX *c=NULL;
+ static SSL *s=NULL;
+ static int initialized=0;
++const char *host_name=NULL;
+ 
+ int np_net_ssl_init (int sd){
+                if (!initialized) {
+@@ -48,6 +49,10 @@ int np_net_ssl_init (int sd){
+                                return STATE_CRITICAL;
+                }
+                if ((s = SSL_new (c)) != NULL){
++#ifdef SSL_set_tlsext_host_name
++                               if (host_name != NULL)
++                                               SSL_set_tlsext_host_name(s, host_name);
++#endif
+                                SSL_set_fd (s, sd);
+                                if (SSL_connect(s) == 1){
+                                                return OK;
+@@ -65,6 +70,9 @@ int np_net_ssl_init (int sd){
+ 
+ void np_net_ssl_cleanup (){
+                if(s){
++#ifdef SSL_set_tlsext_host_name
++                               SSL_set_tlsext_host_name(s, NULL);
++#endif
+                                SSL_shutdown (s);
+                                SSL_free (s);
+                                if(c) {
+@@ -73,6 +81,7 @@ void np_net_ssl_cleanup (){
+                                }
+                                s=NULL;
+                }
++               host_name = NULL;
+ }
+ 
+ int np_net_ssl_write(const void *buf, int num){
+@@ -86,7 +95,7 @@ int np_net_ssl_read(void *buf, int num){
+ int np_net_ssl_check_cert(int days_till_exp){
+ #  ifdef USE_OPENSSL
+        X509 *certificate=NULL;
+-        ASN1_STRING *tm;
++       ASN1_STRING *tm;
+        int offset;
+        struct tm stamp;
+        float time_left;
+@@ -163,4 +172,8 @@ int np_net_ssl_check_cert(int days_till_exp){
+ #  endif /* USE_OPENSSL */
+ }
+ 
++void np_net_ssl_set_host_name (const char *buf){
++       host_name = buf;
++}
++
+ #endif /* HAVE_SSL */
diff --git a/web/attachments/319236-check_file_age--allow_missing_file.diff b/web/attachments/319236-check_file_age--allow_missing_file.diff
new file mode 100644
index 0000000..6e51a5a
--- /dev/null
+++ b/web/attachments/319236-check_file_age--allow_missing_file.diff
@@ -0,0 +1,37 @@
+--- a/check_file_age    2008-12-29 07:54:29.000000000 -0800
++++ b/check_file_age    2009-03-23 22:35:54.000000000 -0700
+@@ -33,7 +33,7 @@ use utils qw (%ERRORS &print_revision &s
+ sub print_help ();
+ sub print_usage ();
+ 
+-my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
++my ($opt_c, $opt_f, $opt_m, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
+ my ($result, $message, $age, $size, $st);
+ 
+ $PROGNAME="check_file_age";
+@@ -48,6 +48,7 @@ Getopt::Long::Configure('bundling');
+ GetOptions(
+        "V"   => \$opt_V, "version"     => \$opt_V,
+        "h"   => \$opt_h, "help"        => \$opt_h,
++       "m"   => \$opt_m, "missing"     => \$opt_m,
+        "f=s" => \$opt_f, "file"        => \$opt_f,
+        "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
+        "W=f" => \$opt_W, "warning-size=f" => \$opt_W,
+@@ -73,8 +74,14 @@ if (! $opt_f) {
+ 
+ # Check that file exists (can be directory or link)
+ unless (-e $opt_f) {
+-       print "FILE_AGE CRITICAL: File not found - $opt_f\n";
+-       exit $ERRORS{'CRITICAL'};
++       # If we allow missing files/directories, return OK
++       if ($opt_m) {
++               print "FILE_AGE OK: File not found - $opt_f\n";
++               exit $ERRORS{'OK'};
++       } else {
++               print "FILE_AGE CRITICAL: File not found - $opt_f\n";
++               exit $ERRORS{'CRITICAL'};
++       }
+ }
+ 
+ $st = File::stat::stat($opt_f);
+
diff --git a/web/attachments/320396-nagios-plugins-subst.txt b/web/attachments/320396-nagios-plugins-subst.txt
new file mode 100644
index 0000000..b04dea5
--- /dev/null
+++ b/web/attachments/320396-nagios-plugins-subst.txt
@@ -0,0 +1,22 @@
+--- nagios-plugins-1.4.13/plugins-scripts/subst.in.orig 2009-03-31 13:59:58.000000000 +1100

++++ nagios-plugins-1.4.13/plugins-scripts/subst.in      2009-03-31 14:01:30.000000000 +1100

+@@ -62,11 +62,14 @@

+ # subst will replace the fully qualified command with whatever is

+ # returned from the which subroutine

+ #

+-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {

+-       match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);

+-       c=substr($0,RSTART,RLENGTH);

+-       sub(c,which(c,path));

+-}

++# REMOVED: had collateral dammage of also replacing library paths:

++#   use lib "/usr/lib/nagios/plugins" ==> use lib "nagios/plugins",

++#   this is wrong, and provides no real benefit for executables

++#/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {

++#      match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);

++#      c=substr($0,RSTART,RLENGTH);

++#      sub(c,which(c,path));

++#}

+

+ {

+        print;

diff --git a/web/attachments/320775-debian-subst.txt b/web/attachments/320775-debian-subst.txt
new file mode 100644
index 0000000..65e28ea
--- /dev/null
+++ b/web/attachments/320775-debian-subst.txt
@@ -0,0 +1,57 @@
+diff -urNad sid2~/plugins-scripts/subst.in sid2/plugins-scripts/subst.in

+--- sid2~/plugins-scripts/subst.in      2005-08-31 00:11:42.000000000 +0200

++++ sid2/plugins-scripts/subst.in       2005-10-07 22:37:45.000000000 +0200

+@@ -1,35 +1,9 @@

+ #!/usr/bin/awk

+

+-function which(c,path) {

+-       cmd = "test -x " c;

+-

+-       if (system(cmd)==0) {

+-               return c;

+-       }

+-

+-       sub(/\/.*\//,"",c);

+-  for (dir in path) {

+-                       cmd = "test -x " path[dir] "/" c;

+-                       if (system(cmd)==0) {

+-                                       return path[dir] "/" c;

+-                       }

+-       }

+-

+-

+-       return c;

+-}

+-

+ # used to replace "use lib utils.pm" with "use lib @libexecdir"

+ #

+ function led() {

+-       led1 = "@libexecdir@";

+-       led2 = "@exec_prefix@";

+-       led3 = "@prefix@";

+-       if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {

+-               return "\"" led3 "/libexec\" " ;

+-

+-       }

+-       return "\"" led1 "\"" ;

++       return "\"/usr/lib/nagios/plugins\"" ;

+ }

+

+ BEGIN {

+@@ -58,16 +32,6 @@

+        sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived");

+ }

+

+-# If a script contains a reference to a fully qualified command,

+-# subst will replace the fully qualified command with whatever is

+-# returned from the which subroutine

+-#

+-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {

+-       match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);

+-       c=substr($0,RSTART,RLENGTH);

+-       sub(c,which(c,path));

+-}

+-

+ {

+        print;

+ }
\ No newline at end of file
diff --git a/web/attachments/320776-nagios-plugins-subst.patch b/web/attachments/320776-nagios-plugins-subst.patch
new file mode 100644
index 0000000..9402d30
--- /dev/null
+++ b/web/attachments/320776-nagios-plugins-subst.patch
@@ -0,0 +1,36 @@
+--- nagios-plugins-1.4.13/plugins-scripts/subst.in.orig 2009-04-02 11:42:29.000000000 +1100

++++ nagios-plugins-1.4.13/plugins-scripts/subst.in      2009-04-02 11:43:39.000000000 +1100

+@@ -44,6 +44,16 @@

+ /^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}

+ /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}

+

++# If a script contains a reference to a fully qualified command,

++# subst will replace the fully qualified command with whatever is

++# returned from the which subroutine. run before changes to INC to add libexecdir

++#

++/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {

++       match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);

++       c=substr($0,RSTART,RLENGTH);

++       sub(c,which(c,path));

++}

++

+ # add to libexecdir to INC for perl utils.pm

+ /^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }

+

+@@ -58,16 +68,6 @@

+        sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived");

+ }

+

+-# If a script contains a reference to a fully qualified command,

+-# subst will replace the fully qualified command with whatever is

+-# returned from the which subroutine

+-#

+-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {

+-       match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);

+-       c=substr($0,RSTART,RLENGTH);

+-       sub(c,which(c,path));

+-}

+-

+ {

+        print;

+ }

diff --git a/web/attachments/321258-patch-521097.diff b/web/attachments/321258-patch-521097.diff
new file mode 100644
index 0000000..80d5386
--- /dev/null
+++ b/web/attachments/321258-patch-521097.diff
@@ -0,0 +1,23 @@
+diff -u nagios-plugins-1.4.12/debian/changelog nagios-plugins-1.4.12/debian/changelog
+--- nagios-plugins-1.4.12.orig/plugins/check_nt.c
++++ nagios-plugins-1.4.12/plugins/check_nt.c
+@@ -134,6 +134,11 @@
+        /* set socket timeout */
+        alarm(socket_timeout);
+ 
++       if (NULL==server_address) {
++               fputs("missing -H parameter\n", stderr);
++               exit(return_code);
++       }
++
+        switch (vars_to_check) {
+ 
+        case CHECK_CLIENTVERSION:
+@@ -517,7 +522,6 @@
+                                print_revision(progname,revision);
+                                exit(STATE_OK);
+                        case 'H': /* hostname */
+-                               if (server_address)     free(server_address);
+                                server_address = optarg;
+                                break;
+                        case 's': /* password */
diff --git a/web/attachments/321721-check_dns.patch.txt b/web/attachments/321721-check_dns.patch.txt
new file mode 100644
index 0000000..8dae235
--- /dev/null
+++ b/web/attachments/321721-check_dns.patch.txt
@@ -0,0 +1,183 @@
+Index: check_dns.c
+===================================================================
+--- check_dns.c (revision 2188)
++++ check_dns.c (working copy)
+@@ -45,15 +45,17 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-#define ADDRESS_LENGTH 256
++#define ADDRESS_LENGTH 384 
+ char query_address[ADDRESS_LENGTH] = "";
+ char dns_server[ADDRESS_LENGTH] = "";
+ char ptr_server[ADDRESS_LENGTH] = "";
++char query_type[16] = "";
+ int verbose = FALSE;
+ char **expected_address = NULL;
+ int expected_address_cnt = 0;
+ 
+ int expect_authority = FALSE;
++int accept_cname = FALSE;
+ thresholds *time_thresholds = NULL;
+ 
+ static int
+@@ -65,7 +67,23 @@
+        return strcmp(* (char * const *) p1, * (char * const *) p2);
+ }
+ 
++char *
++check_new_address(char *temp_buffer)
++{
++      temp_buffer++;
++      /* Strip leading spaces */
++      for (; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
++        /* NOOP */;
+ 
++      strip(temp_buffer);
++      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
++        die (STATE_CRITICAL,
++             _("DNS CRITICAL - '%s' returned empty host name string\n"),
++             NSLOOKUP_COMMAND);
++      }
++      return temp_buffer;
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -103,7 +121,7 @@
+   }
+ 
+   /* get the command to run */
+-  asprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND, query_address, dns_server);
++  asprintf (&command_line, "%s %s %s %s", NSLOOKUP_COMMAND, query_type, query_address, dns_server);
+ 
+   alarm (timeout_interval);
+   gettimeofday (&tv, NULL);
+@@ -136,28 +154,26 @@
+       }
+     }
+ 
++    if (strstr (chld_out.line[i], "Authoritative answers can be found from:"))
++      break;
+     /* the server is responding, we just got the host name... */
+     if (strstr (chld_out.line[i], "Name:"))
+       parse_address = TRUE;
++    else if (strstr (chld_out.line[i], "AAAA address")) {
++      temp_buffer = rindex (chld_out.line[i], ' ');
++      addresses[n_addresses++] = check_new_address(temp_buffer);
++    }
++    else if (strstr (chld_out.line[i], "text =") || strstr (chld_out.line[i], "exchanger =") \
++       || strstr (chld_out.line[i], "service =") || (accept_cname && strstr (chld_out.line[i], "name ="))) {
++      temp_buffer = index (chld_out.line[i], '=');
++      addresses[n_addresses++] = check_new_address(temp_buffer);
++    }
+     else if (parse_address == TRUE && (strstr (chld_out.line[i], "Address:") ||
+              strstr (chld_out.line[i], "Addresses:"))) {
+       temp_buffer = index (chld_out.line[i], ':');
+-      temp_buffer++;
+-
+-      /* Strip leading spaces */
+-      for (; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
+-        /* NOOP */;
+-
+-      strip(temp_buffer);
+-      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
+-        die (STATE_CRITICAL,
+-             _("DNS CRITICAL - '%s' returned empty host name string\n"),
+-             NSLOOKUP_COMMAND);
+-      }
+-
+-      addresses[n_addresses++] = strdup(temp_buffer);
+-    }
+-    else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
++      addresses[n_addresses++] = check_new_address(temp_buffer);
++    } 
++    if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
+       non_authoritative = TRUE;
+     }
+ 
+@@ -274,7 +290,7 @@
+     die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
+ 
+   /* Host name is valid, but server doesn't have records... */
+-  else if (strstr (input_buffer, "No records"))
++  else if (strstr (input_buffer, "No records") || strstr (input_buffer, "No answer"))
+     die (STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
+ 
+   /* Connection was refused */
+@@ -316,7 +332,6 @@
+ 
+ }
+ 
+-
+ /* process command-line arguments */
+ int
+ process_arguments (int argc, char **argv)
+@@ -334,8 +349,10 @@
+     {"hostname", required_argument, 0, 'H'},
+     {"server", required_argument, 0, 's'},
+     {"reverse-server", required_argument, 0, 'r'},
++    {"querytype", required_argument, 0, 'q'},
+     {"expected-address", required_argument, 0, 'a'},
+     {"expect-authority", no_argument, 0, 'A'},
++    {"accept-cname", no_argument, 0, 'n'},
+     {"warning", required_argument, 0, 'w'},
+     {"critical", required_argument, 0, 'c'},
+     {0, 0, 0, 0}
+@@ -349,7 +366,7 @@
+       strcpy (argv[c], "-t");
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "hVvAt:H:s:r:a:w:c:", long_opts, &opt_index);
++    c = getopt_long (argc, argv, "hVvAnt:H:s:r:a:q:w:c:", long_opts, &opt_index);
+ 
+     if (c == -1 || c == EOF)
+       break;
+@@ -394,9 +411,18 @@
+       expected_address[expected_address_cnt] = strdup(optarg);
+       expected_address_cnt++;
+       break;
++    case 'q': /* querytype -- A or AAAA or ANY or SRV or TXT, etc. */
++      if (strlen (optarg) < 1 || strlen (optarg) > 4)
++       die (STATE_UNKNOWN, _("Missing valid querytype parameter.  Try using 'A' or 'AAAA' or 'SRV'\n"));
++      strcpy(query_type, "-querytype=");
++      strcat(query_type, optarg);
++      break;
+     case 'A': /* expect authority */
+       expect_authority = TRUE;
+       break;
++    case 'n': /* accept cname responses as a result */
++      accept_cname = TRUE;
++      break;
+     case 'w':
+       warning = optarg;
+       break;
+@@ -462,13 +488,20 @@
+   printf ("    %s\n", _("The name or address you want to query"));
+   printf (" -s, --server=HOST\n");
+   printf ("    %s\n", _("Optional DNS server you want to use for the lookup"));
++  printf (" -q, --querytype=TYPE\n");
++  printf ("    %s\n", _("Optional DNS record query type where TYPE =(A, AAAA, SRV, TXT, MX, ANY)"));
++  printf ("    %s\n", _("The default query type is 'A' (IPv4 host entry)"));
+   printf (" -a, --expected-address=IP-ADDRESS|HOST\n");
+   printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with"));
+   printf ("    %s\n", _("a dot (.). This option can be repeated multiple times (Returns OK if any"));
+   printf ("    %s\n", _("value match). If multiple addresses are returned at once, you have to match"));
+   printf ("    %s\n", _("the whole string of addresses separated with commas (sorted alphabetically)."));
++  printf ("    %s\n", _("If you would like to test for the presence of a cname, combine with -n param."));
+   printf (" -A, --expect-authority\n");
+   printf ("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
++  printf (" -n, --accept-cname\n");
++  printf ("    %s\n", _("Optionally accept cname responses as a valid result to a query"));
++  printf ("    %s\n", _("The default is to ignore cname responses as part of the result"));
+   printf (" -w, --warning=seconds\n");
+   printf ("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
+   printf (" -c, --critical=seconds\n");
+@@ -490,5 +523,5 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-  printf ("%s -H host [-s server] [-a expected-address] [-A] [-t timeout] [-w warn] [-c crit]\n", progname);
++  printf ("%s -H host [-s server] [-q type ] [-a expected-address] [-A] [-n] [-t timeout] [-w warn] [-c crit]\n", progname);
+ }
diff --git a/web/attachments/321739-check_dns.patch.git.txt b/web/attachments/321739-check_dns.patch.git.txt
new file mode 100644
index 0000000..2f386cd
--- /dev/null
+++ b/web/attachments/321739-check_dns.patch.git.txt
@@ -0,0 +1,182 @@
+diff --git a/plugins/check_dns.c b/plugins/check_dns.c
+index 873dcae..4ca6b91 100644
+--- a/plugins/check_dns.c
++++ b/plugins/check_dns.c
+@@ -45,15 +45,17 @@ int error_scan (char *);
+ void print_help (void);
+ void print_usage (void);
+ 
+-#define ADDRESS_LENGTH 256
++#define ADDRESS_LENGTH 384 
+ char query_address[ADDRESS_LENGTH] = "";
+ char dns_server[ADDRESS_LENGTH] = "";
+ char ptr_server[ADDRESS_LENGTH] = "";
++char query_type[16] = "";
+ int verbose = FALSE;
+ char **expected_address = NULL;
+ int expected_address_cnt = 0;
+ 
+ int expect_authority = FALSE;
++int accept_cname = FALSE;
+ thresholds *time_thresholds = NULL;
+ 
+ static int
+@@ -65,6 +67,22 @@ qstrcmp(const void *p1, const void *p2)
+        return strcmp(* (char * const *) p1, * (char * const *) p2);
+ }
+ 
++char *
++check_new_address(char *temp_buffer)
++{
++      temp_buffer++;
++      /* Strip leading spaces */
++      for (; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
++        /* NOOP */;
++
++      strip(temp_buffer);
++      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
++        die (STATE_CRITICAL,
++             _("DNS CRITICAL - '%s' returned empty host name string\n"),
++             NSLOOKUP_COMMAND);
++      }
++      return temp_buffer;
++}
+ 
+ int
+ main (int argc, char **argv)
+@@ -103,7 +121,7 @@ main (int argc, char **argv)
+   }
+ 
+   /* get the command to run */
+-  asprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND, query_address, dns_server);
++  asprintf (&command_line, "%s %s %s %s", NSLOOKUP_COMMAND, query_type, query_address, dns_server);
+ 
+   alarm (timeout_interval);
+   gettimeofday (&tv, NULL);
+@@ -136,28 +154,26 @@ main (int argc, char **argv)
+       }
+     }
+ 
++    if (strstr (chld_out.line[i], "Authoritative answers can be found from:"))
++      break;
+     /* the server is responding, we just got the host name... */
+     if (strstr (chld_out.line[i], "Name:"))
+       parse_address = TRUE;
++    else if (strstr (chld_out.line[i], "AAAA address")) {
++      temp_buffer = rindex (chld_out.line[i], ' ');
++      addresses[n_addresses++] = check_new_address(temp_buffer);
++    }
++    else if (strstr (chld_out.line[i], "text =") || strstr (chld_out.line[i], "exchanger =") \
++       || strstr (chld_out.line[i], "service =") || (accept_cname && strstr (chld_out.line[i], "name ="))) {
++      temp_buffer = index (chld_out.line[i], '=');
++      addresses[n_addresses++] = check_new_address(temp_buffer);
++    }
+     else if (parse_address == TRUE && (strstr (chld_out.line[i], "Address:") ||
+              strstr (chld_out.line[i], "Addresses:"))) {
+       temp_buffer = index (chld_out.line[i], ':');
+-      temp_buffer++;
+-
+-      /* Strip leading spaces */
+-      for (; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
+-        /* NOOP */;
+-
+-      strip(temp_buffer);
+-      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
+-        die (STATE_CRITICAL,
+-             _("DNS CRITICAL - '%s' returned empty host name string\n"),
+-             NSLOOKUP_COMMAND);
+-      }
+-
+-      addresses[n_addresses++] = strdup(temp_buffer);
+-    }
+-    else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
++      addresses[n_addresses++] = check_new_address(temp_buffer);
++    } 
++    if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
+       non_authoritative = TRUE;
+     }
+ 
+@@ -274,7 +290,7 @@ error_scan (char *input_buffer)
+     die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
+ 
+   /* Host name is valid, but server doesn't have records... */
+-  else if (strstr (input_buffer, "No records"))
++  else if (strstr (input_buffer, "No records") || strstr (input_buffer, "No answer"))
+     die (STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
+ 
+   /* Connection was refused */
+@@ -316,7 +332,6 @@ error_scan (char *input_buffer)
+ 
+ }
+ 
+-
+ /* process command-line arguments */
+ int
+ process_arguments (int argc, char **argv)
+@@ -334,8 +349,10 @@ process_arguments (int argc, char **argv)
+     {"hostname", required_argument, 0, 'H'},
+     {"server", required_argument, 0, 's'},
+     {"reverse-server", required_argument, 0, 'r'},
++    {"querytype", required_argument, 0, 'q'},
+     {"expected-address", required_argument, 0, 'a'},
+     {"expect-authority", no_argument, 0, 'A'},
++    {"accept-cname", no_argument, 0, 'n'},
+     {"warning", required_argument, 0, 'w'},
+     {"critical", required_argument, 0, 'c'},
+     {0, 0, 0, 0}
+@@ -349,7 +366,7 @@ process_arguments (int argc, char **argv)
+       strcpy (argv[c], "-t");
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "hVvAt:H:s:r:a:w:c:", long_opts, &opt_index);
++    c = getopt_long (argc, argv, "hVvAnt:H:s:r:a:q:w:c:", long_opts, &opt_index);
+ 
+     if (c == -1 || c == EOF)
+       break;
+@@ -394,9 +411,18 @@ process_arguments (int argc, char **argv)
+       expected_address[expected_address_cnt] = strdup(optarg);
+       expected_address_cnt++;
+       break;
++    case 'q': /* querytype -- A or AAAA or ANY or SRV or TXT, etc. */
++      if (strlen (optarg) < 1 || strlen (optarg) > 4)
++       die (STATE_UNKNOWN, _("Missing valid querytype parameter.  Try using 'A' or 'AAAA' or 'SRV'\n"));
++      strcpy(query_type, "-querytype=");
++      strcat(query_type, optarg);
++      break;
+     case 'A': /* expect authority */
+       expect_authority = TRUE;
+       break;
++    case 'n': /* accept cname responses as a result */
++      accept_cname = TRUE;
++      break;
+     case 'w':
+       warning = optarg;
+       break;
+@@ -462,13 +488,20 @@ print_help (void)
+   printf ("    %s\n", _("The name or address you want to query"));
+   printf (" -s, --server=HOST\n");
+   printf ("    %s\n", _("Optional DNS server you want to use for the lookup"));
++  printf (" -q, --querytype=TYPE\n");
++  printf ("    %s\n", _("Optional DNS record query type where TYPE =(A, AAAA, SRV, TXT, MX, ANY)"));
++  printf ("    %s\n", _("The default query type is 'A' (IPv4 host entry)"));
+   printf (" -a, --expected-address=IP-ADDRESS|HOST\n");
+   printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with"));
+   printf ("    %s\n", _("a dot (.). This option can be repeated multiple times (Returns OK if any"));
+   printf ("    %s\n", _("value match). If multiple addresses are returned at once, you have to match"));
+   printf ("    %s\n", _("the whole string of addresses separated with commas (sorted alphabetically)."));
++  printf ("    %s\n", _("If you would like to test for the presence of a cname, combine with -n param."));
+   printf (" -A, --expect-authority\n");
+   printf ("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
++  printf (" -n, --accept-cname\n");
++  printf ("    %s\n", _("Optionally accept cname responses as a valid result to a query"));
++  printf ("    %s\n", _("The default is to ignore cname responses as part of the result"));
+   printf (" -w, --warning=seconds\n");
+   printf ("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
+   printf (" -c, --critical=seconds\n");
+@@ -490,5 +523,5 @@ void
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-  printf ("%s -H host [-s server] [-a expected-address] [-A] [-t timeout] [-w warn] [-c crit]\n", progname);
++  printf ("%s -H host [-s server] [-q type ] [-a expected-address] [-A] [-n] [-t timeout] [-w warn] [-c crit]\n", progname);
+ }
diff --git a/web/attachments/325264-nagios-plugins-1.4.13.check_disks.nfs.patch b/web/attachments/325264-nagios-plugins-1.4.13.check_disks.nfs.patch
new file mode 100644
index 0000000..1e4e0fa
--- /dev/null
+++ b/web/attachments/325264-nagios-plugins-1.4.13.check_disks.nfs.patch
@@ -0,0 +1,98 @@
+diff -Naur nagios-plugins-1.4.13/configure.in nagios-plugins-1.4.13.nfs/configure.in
+--- nagios-plugins-1.4.13/configure.in  2008-09-25 10:15:58.000000000 +0200
++++ nagios-plugins-1.4.13.nfs/configure.in      2009-05-01 11:33:59.000000000 +0200
+@@ -453,6 +453,18 @@
+        with_gnutls="no"
+ fi
+ 
++dnl Check for POSIX thread libraries
++AC_CHECK_HEADERS(pthread.h)
++case $host in
++       *sun* | *solaris*)
++               AC_CHECK_LIB(pthread,pthread_create,THRLIBS="-lpthread -lrt")
++       ;;
++       *)
++               AC_CHECK_LIB(pthread,pthread_create,THRLIBS="-lpthread")
++       ;;
++esac
++AC_SUBST(THRLIBS)
++
+ dnl
+ dnl Checks for header files.
+ dnl
+diff -Naur nagios-plugins-1.4.13/plugins/check_disk.c nagios-plugins-1.4.13.nfs/plugins/check_disk.c
+--- nagios-plugins-1.4.13/plugins/check_disk.c  2008-07-10 12:03:55.000000000 +0200
++++ nagios-plugins-1.4.13.nfs/plugins/check_disk.c      2009-05-01 11:34:18.000000000 +0200
+@@ -55,6 +55,9 @@
+ # include <limits.h>
+ #endif
+ #include "regex.h"
++#if HAVE_PTHREAD_H
++# include <pthread.h>
++#endif
+ 
+ 
+ /* If nonzero, show inode information. */
+@@ -129,6 +132,7 @@
+ void print_usage (void);
+ double calculate_percent(uintmax_t, uintmax_t);
+ void stat_path (struct parameter_list *p);
++void do_stat_path (struct parameter_list *p);
+ 
+ double w_dfp = -1.0;
+ double c_dfp = -1.0;
+@@ -993,6 +997,42 @@
+ void
+ stat_path (struct parameter_list *p)
+ {
++#ifdef HAVE_PTHREAD_H
++  pthread_t stat_thread;
++  int status;
++  int statdone = 0;
++  int timer = timeout_interval;
++  struct timespec req, rem;
++  req.tv_sec = 0;
++  pthread_create(&stat_thread, NULL, do_stat_path, p);
++  while (timer-- > 0) {
++    req.tv_nsec = 10000000;
++    nanosleep(&req, &rem);
++    if (pthread_kill(stat_thread, 0)) {
++      statdone = 1;
++      break;
++    } else {
++      req.tv_nsec = 990000000;
++      nanosleep(&req, &rem);
++    }
++  }
++  if (statdone == 1) {
++    pthread_join(stat_thread, (void *)&status);
++  } else {
++    pthread_detach(stat_thread);
++    if (verbose >= 3)
++      printf("stat did not return within %ds on %s\n", timeout_interval, p->name);
++    printf("DISK %s - ", _("CRITICAL"));
++    die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("hangs"), _("Timeout"));
++  }
++#else
++  do_stat_path(p);
++#endif
++}
++
++void
++do_stat_path (struct parameter_list *p)
++{
+   /* Stat entry to check that dir exists and is accessible */
+   if (verbose >= 3)
+     printf("calling stat on %s\n", p->name);
+diff -Naur nagios-plugins-1.4.13/plugins/Makefile.am nagios-plugins-1.4.13.nfs/plugins/Makefile.am
+--- nagios-plugins-1.4.13/plugins/Makefile.am   2008-07-08 11:31:04.000000000 +0200
++++ nagios-plugins-1.4.13.nfs/plugins/Makefile.am       2009-05-01 11:34:26.000000000 +0200
+@@ -54,7 +54,7 @@
+ check_apt_LDADD = $(BASEOBJS) runcmd.o
+ check_cluster_LDADD = $(BASEOBJS)
+ check_dig_LDADD = $(NETLIBS) runcmd.o 
+-check_disk_LDADD = $(BASEOBJS) popen.o
++check_disk_LDADD = $(BASEOBJS) popen.o $(THRLIBS)
+ check_dns_LDADD = $(NETLIBS) runcmd.o
+ check_dummy_LDADD = $(BASEOBJS)
+ check_fping_LDADD = $(NETLIBS) popen.o
diff --git a/web/attachments/32558-check_dns.c.patch b/web/attachments/32558-check_dns.c.patch
new file mode 100644
index 0000000..3a03290
--- /dev/null
+++ b/web/attachments/32558-check_dns.c.patch
@@ -0,0 +1,104 @@
+Index: plugins/check_dns.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
+retrieving revision 1.2
+diff -u -b -r1.2 check_dns.c
+--- plugins/check_dns.c 19 Jun 2002 05:11:52 -0000      1.2
++++ plugins/check_dns.c 7 Oct 2002 17:33:58 -0000
+@@ -10,8 +10,9 @@
+  *
+  * Notes:
+  *  - Safe popen added by Karl DeBisschop 9-11-99
++ *  - expected-address parameter added by Alex Chaffee - 7 Oct 2002
+  *
+- * Command line: CHECK_DNS <query_address> [dns_server]
++ * Command line: (see print_usage)
+  *
+  * Description:
+  *
+@@ -59,6 +60,8 @@
+ char dns_server[ADDRESS_LENGTH] = "";
+ char ptr_server[ADDRESS_LENGTH] = "";
+ int verbose = FALSE;
++char expected_address[ADDRESS_LENGTH] = "";
++int match_expected_address = FALSE;
+ 
+ int
+ main (int argc, char **argv)
+@@ -165,6 +168,12 @@
+                        output = strscpy (output, "nslookup returned error status");
+        }
+ 
++       /* compare to expected address */
++       if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
++               result = STATE_CRITICAL;
++               output = ssprintf(output, "expected %s but got %s", expected_address, address);
++               }
++       
+        (void) time (&end_time);
+ 
+        if (result == STATE_OK)
+@@ -297,6 +306,7 @@
+                {"hostname", required_argument, 0, 'H'},
+                {"server", required_argument, 0, 's'},
+                {"reverse-server", required_argument, 0, 'r'},
++               {"expected-address", required_argument, 0, 'a'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -304,9 +314,9 @@
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+-               c = getopt_long (argc, argv, "+?hVvt:H:s:r:", long_opts, &opt_index);
++               c = getopt_long (argc, argv, "+?hVvt:H:s:r:a:", long_opts, &opt_index);
+ #else
+-               c = getopt (argc, argv, "+?hVvt:H:s:r:");
++               c = getopt (argc, argv, "+?hVvt:H:s:r:a:");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -318,6 +328,7 @@
+                case 'H':
+                case 's':
+                case 'r':
++               case 'a':
+                        i++;
+                }
+ 
+@@ -368,6 +379,17 @@
+                                terminate (STATE_UNKNOWN, "Input buffer overflow\n");
+                        strcpy (ptr_server, optarg);
+                        break;
++               case 'a': /* expected address */
++                       if (is_host (optarg) == FALSE) {
++                               printf ("Invalid expected address\n\n");
++                               print_usage (my_basename (argv[0]));
++                               exit (STATE_UNKNOWN);
++                       }
++                       if (strlen (optarg) >= ADDRESS_LENGTH)
++                               terminate (STATE_UNKNOWN, "Input buffer overflow\n");
++                       strcpy (expected_address, optarg);
++                       match_expected_address = TRUE;
++                       break;
+                }
+        }
+        return i;
+@@ -385,7 +407,7 @@
+ void
+ print_usage (char *cmd)
+ {
+-       printf ("Usage: %s -H host [-s server] [-t timeout]\n" "       %s --help\n"
++       printf ("Usage: %s -H host [-s server] [-a expected-address] [-t timeout]\n" "       %s --help\n"
+                                        "       %s --version\n", cmd, cmd, cmd);
+ }
+ 
+@@ -401,6 +423,8 @@
+                 "   The name or address you want to query\n"
+                 "-s, --server=HOST\n"
+                 "   Optional DNS server you want to use for the lookup\n"
++                "-a, --expected-address=IP-ADDRESS\n"
++                "   Optional IP address you expect the DNS server to return\n"
+                 "-t, --timeout=INTEGER\n"
+                 "   Seconds before connection times out (default: %d)\n"
+                 "-h, --help\n"
diff --git a/web/attachments/327688-check_procs.c.patch b/web/attachments/327688-check_procs.c.patch
new file mode 100644
index 0000000..2c262f7
--- /dev/null
+++ b/web/attachments/327688-check_procs.c.patch
@@ -0,0 +1,796 @@
+--- check_procs.c       2009-02-21 09:59:24.000000000 +0000
++++ check_procs.c.new   2009-05-19 10:41:14.000000000 +0000
+@@ -27,7 +27,8 @@
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-* 
++*
++* State file stuff originally by: Alain Williams <addw@phcomp.co.uk>
+ * 
+ *****************************************************************************/
+ 
+@@ -42,13 +43,7 @@
+ #include "regex.h"
+ 
+ #include <pwd.h>
+-
+-int process_arguments (int, char **);
+-int validate_arguments (void);
+-int check_thresholds (int);
+-int convert_to_seconds (char *); 
+-void print_help (void);
+-void print_usage (void);
++#include <time.h>
+ 
+ int wmax = -1;
+ int cmax = -1;
+@@ -77,6 +72,7 @@
+        METRIC_ELAPSED
+ };
+ enum metric metric = METRIC_PROCS;
++char   metric_state_name = 'P';        /* Metric name in the state file */
+ 
+ int verbose = 0;
+ int uid;
+@@ -92,9 +88,98 @@
+ char *fmt;
+ char *fails;
+ char tmp[MAX_INPUT_BUFFER];
++time_t now;
++time_t state_limit_start;
+ 
+ FILE *ps_input = NULL;
+ 
++/* Optionally trigger an alert if a process has been in a state for
++ * some time. This time will be measured in minutes, ie much longer than
++ * this program runs for - thus a state file is needed to store this
++ * between runs of this program.
++ * This happens if --state-file is specified.
++ *
++ * The state file records information about processes that exceed some criteria
++ * for a warning or critical notice.
++ * The file will contain one 'V' line.
++ * If the metric is PROCS there will be one N line, else zero or more P lines.
++ * Format of the state file:
++ *     Max line length of 500
++ *     Empty lines and lines starting '#' are ignored
++ *     Lines consist of a type character, a space and optional extra information
++ *     V version_number
++ *     P pid ppid name MS secs
++ *         name is limited to a max 20 characters
++ *         M is the metric:
++ *             V       virtual memory size
++ *             R       resident set memory size
++ *             C       percentage CPU
++ *             E       time elapsed in seconds
++ *         S is the state:
++ *             W       Warning
++ *             C       Critical
++ *     N MS secs
++ *         M will be 'P'
++ *         S is the state as above
++ *    secs is the epoch time the metric was first exceeded - hex number
++ *    The 'MS secs' or 'S secs' may appear twice as it is possible for a process (or the
++ *    max # processes) to exceed both the warning and critical thresholds but for different times.
++ * If something is C then it is implicitly W.
++ *
++ * There might be a trailing space on a N line.
++ *
++ * Eg:
++ *     P 1234 1200 cpu_hog CW 4a05a817 CC 4a05a91f
++ *     N PW 4a05a91f
++ */
++#define        STATE_VERSION   1       /* Change me if the file format changes */
++#define        STATE_MAX_LINE  500     /* Longest line */
++#define        MAX_PROG_NAME   20      /* Longest name of program - search for this if you change it */
++#define        METRIC_CODES    "PVRCE" /* For input validation */
++#define        STATE_CODES     "WC"    /* For input validation */
++#define        STATE2state(x)  ((x) == STATE_WARNING ? 'W' : 'C')      /* Convert STATE_WARNING or STATE_CRITICAL to 'W' or 'C' */
++
++/* A process can exceed various limits. This describes on of them
++ */
++typedef        struct  plimit  {
++       struct  plimit* pl_next;        /* NULL terminated list */
++       time_t          pl_when;        /* When it first exceeded this limit */
++       int             pl_state;       /* STATE_WARNING or STATE_CRITICAL */
++       int             pl_seen;        /* Exceeded this run */
++       char            pl_metric;      /* What is exceeded - as in file */
++} PLimit;
++
++/* Something to describe a process that is exceeding something
++ */
++typedef        struct  exproc  {
++       struct  exproc* ep_next;        /* NULL terminated list */
++       pid_t           ep_pid;         /* Process ID */
++       pid_t           ep_ppid;        /* Parent PID */
++       char*           ep_prog;        /* Program name */
++       PLimit*         ep_limits;      /* Limits exceeded list */
++       int             ep_seen;        /* Updated/noticed this run */
++} ExProc;
++
++char*  state_filename;         /* File that we store this in */
++int    state_time = 5;         /* Trigger time - minutes */
++ExProc*        state_list;             /* Used for process specific metrics - ie metric is *not* PROCS */
++PLimit*        state_nprocs;           /* Info on # procs exceeded - used if metric is PROCS */
++int    state_changed;          /* Ie need to write back to file */
++int    must_rewrite;           /* Set this if there is a syntax error in the file, or
++                                * some other reason which means we must rewrite it */
++
++int process_arguments (int, char **);
++int validate_arguments (void);
++int check_thresholds (int);
++int convert_to_seconds (char *); 
++void print_help (void);
++void print_usage (void);
++void read_state_file(void);
++void write_state_file(char** argv);
++void record_state(pid_t procpid, pid_t procppid, char* procprog, char prog_metric, int state, time_t start_time);
++void record_limit(PLimit** l_ref, int state, char proc_metric, time_t start_time);
++void read_limit_line(const char* in_line, PLimit** ppl, char* state_filename, int line_no);
++int check_limit(PLimit* pl);
+ 
+ int
+ main (int argc, char **argv)
+@@ -129,13 +214,16 @@
+        int result = STATE_UNKNOWN;
+        output chld_out, chld_err;
+ 
++       now = time(NULL);
++
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+        setlocale(LC_NUMERIC, "POSIX");
+ 
+-       input_buffer = malloc (MAX_INPUT_BUFFER);
+-       procprog = malloc (MAX_INPUT_BUFFER);
++       if( ! (input_buffer = malloc (MAX_INPUT_BUFFER)) ||
++           ! (procprog = malloc (MAX_INPUT_BUFFER)))
++               die(STATE_UNKNOWN, _("Out of memory in startup\n"));
+ 
+        asprintf (&metric_name, "PROCS");
+        metric = METRIC_PROCS;
+@@ -168,6 +256,9 @@
+                result = cmd_file_read( input_filename, &chld_out, 0);
+        }
+ 
++       /* What do we remember from last time ? */
++       read_state_file();
++
+        /* flush first line: j starts at 1 */
+        for (j = 1; j < chld_out.lines; j++) {
+                input_line = chld_out.line[j];
+@@ -237,6 +328,10 @@
+                                        procetime, procprog, procargs);
+                        }
+ 
++                       /* This is all made simpler because metric can only talk about
++                        * one metric, ie can't check more than one thing at a time.
++                        * This means that metric_state_name is the char equivalent of metric.
++                        */
+                        if (metric == METRIC_VSZ)
+                                i = check_thresholds (procvsz);
+                        else if (metric == METRIC_RSS)
+@@ -248,15 +343,29 @@
+                                i = check_thresholds (procseconds);
+ 
+                        if (metric != METRIC_PROCS) {
+-                               if (i == STATE_WARNING) {
+-                                       warn++;
+-                                       asprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog);
+-                                       result = max_state (result, i);
+-                               }
+-                               if (i == STATE_CRITICAL) {
+-                                       crit++;
+-                                       asprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog);
+-                                       result = max_state (result, i);
++                               if(state_filename) {
++                                       /* State is being stored - ie don't report immediately.
++                                        * Note what we have found:
++                                        */
++                                       if(i == STATE_WARNING || i == STATE_CRITICAL)
++                                               record_state(procpid, procppid, procprog, metric_state_name, i, now);
++                               } else {
++                                       if (i == STATE_WARNING) {
++                                               char* str = fails;
++                                               warn++;
++                                               asprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog);
++                                               result = max_state (result, i);
++                                               if(str)
++                                                       free(str);
++                                       }
++                                       if (i == STATE_CRITICAL) {
++                                               char* str = fails;
++                                               crit++;
++                                               asprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog);
++                                               result = max_state (result, i);
++                                               if(str)
++                                                       free(str);
++                                       }
+                                }
+                        }
+                } 
+@@ -276,7 +385,59 @@
+ 
+        /* Needed if procs found, but none match filter */
+        if ( metric == METRIC_PROCS ) {
+-               result = max_state (result, check_thresholds (procs) );
++               int     threshold = check_thresholds(procs);
++               int     putative_result = max_state(result,  threshold);
++
++               if(state_filename) {    /* Do not report immediately - note what we found */
++                       /* Only record something if we may need to report it */
++                       if(putative_result == STATE_WARNING || putative_result == STATE_CRITICAL)
++                               record_limit(&state_nprocs, putative_result, 'P', now);
++               } else
++                       result = putative_result;
++       }
++
++       /* If we have a state file, the above has just stored the results away, so have
++        * a look and see if there is anything that we should note.
++        * The slight subtlety is that we could have something recorded as both a warning
++        * & a critical - in this case only report the critical.
++        */
++       if(state_filename) {
++               /* Compute the start time of any state that we must report.
++                * Ie any state younger than this we keep quiet about.
++                */
++               state_limit_start = (time_t)((unsigned long)now - state_time * 60);
++
++               if(verbose >= 3)
++                       printf("Checking metric %c, limit_start %s", metric_state_name, ctime(&state_limit_start));
++
++               if(metric == METRIC_PROCS) {
++                       result = check_limit(state_nprocs);
++               } else {
++                       ExProc* pp;
++
++                       for(pp = state_list; pp; pp = pp->ep_next) {
++                               char* str = fails;
++
++                               /* What is the state of this recorded process ? */
++                               int     res = check_limit(pp->ep_limits);
++
++                               switch(res) {
++                               case STATE_OK:
++                                       continue;       /* Don't do the stuff below */
++                               case STATE_WARNING:
++                                       warn++;
++                                       break;
++                               case STATE_CRITICAL:
++                                       crit++;
++                                       break;
++                               }
++
++                               asprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), pp->ep_prog);
++                               result = max_state(result, res);
++                               if(str)
++                                       free(str);
++                       }
++               }
+        }
+ 
+        if ( result == STATE_OK ) {
+@@ -302,6 +463,9 @@
+                printf (" [%s]", fails);
+ 
+        printf ("\n");
++
++       write_state_file(argv);
++
+        return result;
+ }
+ 
+@@ -336,6 +500,8 @@
+                {"verbose", no_argument, 0, 'v'},
+                {"ereg-argument-array", required_argument, 0, CHAR_MAX+1},
+                {"input-file", required_argument, 0, CHAR_MAX+2},
++               {"state-file", required_argument, 0, 'S'},
++               {"state-time", required_argument, 0, 'T'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -344,7 +510,7 @@
+                        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, "Vvht:c:w:p:s:u:C:a:z:r:m:P:S:T:",
+                        longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+@@ -479,22 +645,27 @@
+                        asprintf (&metric_name, "%s", optarg);
+                        if ( strcmp(optarg, "PROCS") == 0) {
+                                metric = METRIC_PROCS;
++                               metric_state_name = 'P';
+                                break;
+                        } 
+                        else if ( strcmp(optarg, "VSZ") == 0) {
+                                metric = METRIC_VSZ;
++                               metric_state_name = 'V';
+                                break;
+                        } 
+                        else if ( strcmp(optarg, "RSS") == 0 ) {
+                                metric = METRIC_RSS;
++                               metric_state_name = 'R';
+                                break;
+                        }
+                        else if ( strcmp(optarg, "CPU") == 0 ) {
+                                metric = METRIC_CPU;
++                               metric_state_name = 'C';
+                                break;
+                        }
+                        else if ( strcmp(optarg, "ELAPSED") == 0) {
+                                metric = METRIC_ELAPSED;
++                               metric_state_name = 'E';
+                                break;
+                        }
+                                
+@@ -505,6 +676,16 @@
+                case CHAR_MAX+2:
+                        input_filename = optarg;
+                        break;
++               case 'S':                                                                       /* state-file */
++                       state_filename = optarg;
++                       break;
++               case 'T':                                                                       /* state-time */
++                       if (!is_integer (optarg))
++                               usage2 (_("state-time must be a positive integer"), optarg);
++                       else
++                               if((state_time = atoi (optarg)) < 0)    /* Treat -ve time as zero */
++                                       state_time = 0;
++                       break;
+                }
+        }
+ 
+@@ -727,6 +908,12 @@
+   printf (" %s\n", "-C, --command=COMMAND");
+   printf ("   %s\n", _("Only scan for exact matches of COMMAND (without path)."));
+ 
++  printf ("\n");
++  printf ( "%s\n", "State memory (complain if a process exceeds a limit for a long time):");
++  printf ( " %s\n", "-S, --state-file=StateFile");
++  printf ( "  %s\n", _("Store process information in this file"));
++  printf ( " %s\n",  "-T, --state-time=minutes");
++
+        printf(_("\n\
+ RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\
+ specified 'max:min', a warning status will be generated if the\n\
+@@ -755,7 +942,9 @@
+   printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
+   printf ("  %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
+   printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
+-  printf ("  %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
++  printf ("  %s\n\n", _("Alert if CPU of any processes over 10% or 20%"));
++  printf (" %s\n", "check_procs -w 80 -c 90 --metric=CPU --state-time=10 --state-file=/tmp/CPU-state");
++  printf ("  %s\n", _("Alert if CPU of any processes over 80% or 90% for at least 10 minutes, record state in /tmp/CPU-state"));
+ 
+        printf (_(UT_SUPPORT));
+ }
+@@ -766,5 +955,423 @@
+   printf (_("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] [-t timeout] [-v] [-S state_file] [-T state_time_minutes]\n");
++}
++
++/* Read the state file - if there is one.
++ *
++ * This file is not locked. On a horribly over loaded system it might happen that reads & writes
++ * could overlap in the wrong way. Locking could make things worse, you may end up with many
++ * instances of this program waiting on the lock.
++ */
++void
++read_state_file(void)
++{
++       FILE*   sf;
++       char*   errstr;
++       char*   str;
++       char    in_buf[STATE_MAX_LINE]; /* Input buffer */
++       int     line_no = 0;
++       char    prog_name[MAX_PROG_NAME + 1];
++       int     eaten;
++       ExProc* pp;
++
++       if( ! state_filename)   /* No file specified */
++               return;
++
++       if( ! (sf = fopen(state_filename, "r"))) {
++               /* It is OK if it doesn't exist, we just haven't created it yet */
++               if(errno == ENOENT) {
++                       must_rewrite = 1;       /* Force it to be created */
++                       return;
++               }
++
++               /* Anything else - should not happen */
++               errstr = strerror(errno);
++               die(STATE_UNKNOWN, _("Can't open %s for reading as: %s"), state_filename, errstr);
++       }
++
++       /* Read a line at a time */
++       while(fgets(in_buf, STATE_MAX_LINE, sf)) {
++               line_no++;
++               if( ! (str = strchr(in_buf, '\n'))) {
++                       printf(_("State file %s corrupt, line too long, at line %d\n"), state_filename, line_no);
++                       must_rewrite = 1;       /* Force write */
++                       goto read_off;  /* Will be fixed when we rewrite it in a moment */
++               }
++               *str = '\0';
++
++               /* Empty line or comment ? */
++               if(in_buf[0] == '\0' || in_buf[0] == '#')
++                       continue;
++
++               if(in_buf[1] != ' ') {
++                       printf(_("State file %s corrupt, no space at position 1, at line %d\n"), state_filename, line_no);
++                       must_rewrite = 1;       /* Force write */
++                       goto read_off;
++               }
++
++               /* What line type ? */
++               switch(in_buf[0]) {
++               case 'V':       /* In case we are running 1st time after upgrade */
++                       if(atoi(in_buf + 2) != STATE_VERSION) {
++                               printf(_("State file %s is wrong version, expecting %d. File ignored\n"), state_filename, STATE_VERSION);
++                               must_rewrite = 1;       /* Force write */
++                               goto read_off;
++                       }
++                       break;
++               case 'P':       /* Info about a process */
++                       /* P 1234 1200 cpu_hog CW 4a05a817 CC 4a05a92f */
++                       if( ! (pp = calloc(sizeof(ExProc), 1)))
++                               die(STATE_UNKNOWN, _("Out of memory reading %s line %d"), state_filename, line_no);
++
++                       pp->ep_next = state_list;
++                       state_list = pp;
++
++                       /* MAX_PROG_NAME on next line */
++                       if(sscanf(in_buf, "P %d %d %20s%n", &pp->ep_pid, &pp->ep_ppid, prog_name, &eaten) != 3) {
++                               printf(_("State file corrupt, bad process line, file %s line %d\n"), state_filename, line_no);
++                               must_rewrite = 1;       /* Force write */
++                               goto read_off;
++                       }
++
++                       if( ! (pp->ep_prog = strdup(prog_name)))
++                               die(STATE_UNKNOWN, _("Out of memory reading %s line %d\n"), state_filename, line_no);
++
++                       if(verbose >= 3)
++                               printf("Read pid %d ppid %d proc %s\n", pp->ep_pid, pp->ep_ppid, pp->ep_prog);
++
++                       read_limit_line(in_buf + eaten, &pp->ep_limits, state_filename, line_no);
++                       break;
++               case 'N':       /* Number of procs exceeded */
++                       if(verbose >= 3)
++                               printf("Read N:\n");
++                       read_limit_line(in_buf + 1, &state_nprocs, state_filename, line_no);
++                       break;
++               default:
++                       printf(_("State file %s corrupt, unknown line type, at line %d\n"), state_filename, line_no);
++                       must_rewrite = 1;       /* Force write */
++                       goto read_off;
++               }
++       }
++
++       /* Ignore changes so far */
++read_off:
++       state_changed = 0;
++
++       fclose(sf);
++}
++
++/* Read a line (or rest of) a process or global limit line.
++ * Expect the first character of in_line to be NUL or a space.
++ * Args:
++ * in_line     the line to read
++ * ppl         pointer to pointer to linked list where to store what is read
++ * filename    the name of the file being read
++ * line_no     that was read
++ *
++ * Read lines like:
++ *     PW 4a05a91f PC 4a05a817
++ */
++void
++read_limit_line(const char* in_line, PLimit** ppl, char* state_filename, int line_no)
++{
++       PLimit*         pl;
++       unsigned long   when;
++       int             eaten;
++
++       while(*in_line) {
++               if(*in_line == ' ') {   /* Ignore spaces */
++                       in_line++;
++                       continue;
++               }
++
++               /* We have found something, allocate somewhere to put it */
++               if( ! (pl = calloc(sizeof(PLimit), 1)))
++                       die(STATE_UNKNOWN, _("Out of memory reading %s line %d\n"), state_filename, line_no);
++
++               /* Read a metric code */
++               if( ! strchr(METRIC_CODES, *in_line)) {
++                       printf(_("State file %s corrupt, unknown metric code, at line %d\n"), state_filename, line_no);
++                       must_rewrite = 1;
++                       free(pl);
++                       return;
++               }
++               pl->pl_metric = *in_line++;
++
++               /* Read the state code */
++               if(*in_line == '\0' || ! strchr(STATE_CODES, *in_line)) {
++                       printf(_("State file %s corrupt, unknown state code, at line %d\n"), state_filename, line_no);
++                       must_rewrite = 1;
++                       free(pl);
++                       return;
++               }
++               pl->pl_state = *in_line++ == 'W' ? STATE_WARNING : STATE_CRITICAL;
++
++               /* Read the time */
++               if(sscanf(in_line, " %lx%n", &when, &eaten) != 1) {
++                       printf(_("State file %s corrupt, bad time, at line %d\n"), state_filename, line_no);
++                       must_rewrite = 1;
++                       free(pl);
++                       return;
++               }
++               pl->pl_when = (time_t)when;
++               in_line += eaten;
++
++               if(verbose >= 3)
++                       printf(" metric=%c state=%c since %s", pl->pl_metric, STATE2state(pl->pl_state), ctime(&pl->pl_when));
++
++               /* Link it in */
++               pl->pl_next = *ppl;
++               *ppl = pl;
++       }
++
++       if(verbose >= 3)
++               printf("\n");
++}
++
++/* Write back to the state file
++ */
++void
++write_state_file(char** argv)
++{
++       FILE*   sf;
++       char*   errstr;
++       ExProc* pp;
++       PLimit* pl;
++
++       if( ! state_filename)   /* No file specified */
++               return;
++
++       /* Work out if we are going to write back what we read in.
++        * If there is something that has not been seen then it was read in
++        * from the file - need to write back to loose the entry, scan for that.
++        * Otherwise: state_changed will tell us what we want to know and was set
++        * when a change was made.
++        */
++       if(metric == METRIC_PROCS) {
++               for(pl = state_nprocs; pl; pl = pl->pl_next)
++                       if( ! pl->pl_seen)
++                               state_changed = 1;
++       } else {
++               for(pp = state_list; pp; pp = pp->ep_next) {
++                       if( ! pp->ep_seen)
++                               state_changed = 1;
++
++                       for(pl = pp->ep_limits; pl; pl = pl->pl_next)
++                               if( ! pl->pl_seen)
++                                       state_changed = 1;
++               }
++       }
++
++       if(verbose >= 3)
++               printf("Write state, changed=%d\n", state_changed);
++
++       /* No change to the state file ? */
++       if( ! state_changed && ! must_rewrite)
++               return;
++
++       if( ! (sf = fopen(state_filename, "w"))) {
++               errstr = strerror(errno);
++               die(STATE_UNKNOWN, _("Can't open %s for writing as: %s"), state_filename, errstr);
++       }
++
++       fprintf(sf, "# Process state file written by %s - DO NOT HAND EDIT\n", progname);
++       fprintf(sf, "# Args:");
++       for(; *argv; argv++)
++               fprintf(sf, " %s", *argv);
++       fprintf(sf, "\n");
++       fprintf(sf, "V %d\n", STATE_VERSION);
++
++       if(metric != METRIC_PROCS) {
++               /* Traverse the processes that we know about */
++               for(pp = state_list; pp; pp = pp->ep_next) {
++                       if( ! pp->ep_seen)
++                               continue;
++
++                       fprintf(sf, "P %d %d %.*s", pp->ep_pid, pp->ep_ppid, MAX_PROG_NAME, pp->ep_prog);
++                       for(pl = pp->ep_limits; pl; pl = pl->pl_next)
++                               if(pl->pl_seen)
++                                       fprintf(sf, " %c%c %lx", pl->pl_metric, STATE2state(pl->pl_state), (unsigned long)pl->pl_when);
++
++                       fprintf(sf, "\n");
++               }
++       } else {
++               /* Print when the # processes is what is being checked */
++               fprintf(sf, "N");
++               for(pl = state_nprocs; pl; pl = pl->pl_next)
++                       if(pl->pl_seen)
++                               fprintf(sf, " %c%c %lx", pl->pl_metric, STATE2state(pl->pl_state), (unsigned long)pl->pl_when);
++
++               /* Space before \n is important - else get error on read if no limits follow -- which
++                * will happen if all is well.
++                */
++               fprintf(sf, " \n");
++       }
++
++       fclose(sf);
++}
++
++/* Record a state for a program.
++ * Create a new entry if we need to, or update an existing one.
++ * Program must match on the first 3 args to update.
++ * Args:
++ * procpid     Process ID
++ * procppid    Parent process ID
++ * progprog    Program name
++ * prog_metric What we are measuring (METRIC_something but represented as the character in the file)
++ * state       Error or warning (STATE_something)
++ */
++void
++record_state(pid_t procpid, pid_t procppid, char* procprog, char prog_metric, int state, time_t start_time)
++{
++       ExProc* pp;
++
++       /* Look for the process */
++       for(pp = state_list; pp; pp = pp->ep_next) {
++               if(pp->ep_pid != procpid)
++                       continue;
++
++               /* Right process, but if it has mutated - throw it away and start again.
++                * This doesn't detect processes that exec() a lot w/out fork(), but that is rare.
++                */
++               if(pp->ep_ppid != procppid || strcmp(pp->ep_prog, procprog)) {
++                       PLimit* pl;
++                       while(pl = pp->ep_limits) {
++                               pp->ep_limits = pl->pl_next;
++                               free(pl);
++                       }
++                       pp->ep_ppid = procppid;
++                       if(strcmp(pp->ep_prog, procprog)) {
++                               free(pp->ep_prog);
++                               if( ! (pp->ep_prog = strdup(procprog)))
++                                       die(STATE_UNKNOWN, _("Out of memory"));
++                       }
++
++                       state_changed = 1;
++               }
++
++               if(verbose >= 3)
++                       printf("Record found: pid %d %s\n", pp->ep_pid, pp->ep_prog);
++
++               break;
++       }
++
++       /* Didn't find the process, allocate a new entry */
++       if( ! pp) {
++               if( ! (pp = calloc(sizeof(ExProc), 1)))
++                       die(STATE_UNKNOWN, _("Out of memory"));
++               pp->ep_pid = procpid;
++               pp->ep_ppid = procppid;
++               if( ! (pp->ep_prog = strdup(procprog)))
++                       die(STATE_UNKNOWN, _("Out of memory"));
++
++               pp->ep_next = state_list;
++               state_list = pp;
++               state_changed = 1;
++
++               if(verbose >= 3)
++                       printf("Record alloc: pid %d %s\n", pp->ep_pid, pp->ep_prog);
++       }
++
++       pp->ep_seen = 1;        /* Ensure that this gets written out */
++
++       record_limit(&pp->ep_limits, state, prog_metric, start_time);
++}
++
++/* Store a limit
++ * l_ref       address of head of limits chain
++ * prog_metric What we are measuring (METRIC_something but represented as the character in the file)
++ * state       Error or warning (STATE_something)
++ * start_time  The time to record when it started, if we already record this - don't change the time
++ *             unless this is older.
++ *
++ * If something is C then it is implicitly W. This is important: if something goes from
++ * W to C, it might remain at C for less than the state time (which it might do W -> C
++ * & back again several times) - but the time above the W level might be notifiable.
++ */
++void
++record_limit(PLimit** l_ref, int state, char proc_metric, time_t start_time)
++{
++       PLimit* pl;
++       PLimit* pl_found = NULL;
++       int     seen_warning = 0;
++
++       /* Find the individual process limit.
++        * Scan the whole lot since we want to 'seen' a Warning if we have Critical.
++        */
++       for(pl = *l_ref; pl; pl = pl->pl_next)
++               if(pl->pl_metric == proc_metric) {
++                       if(state == STATE_CRITICAL && pl->pl_state == STATE_WARNING) {
++                               pl->pl_seen = 1;        /* Ensure that it is output */
++                               seen_warning = 1;
++                       }
++
++                       if(pl->pl_state == state)
++                               pl_found = pl;          /* We found what we were looking for */
++               }
++
++       pl = pl_found;
++
++       /* Didn't find it, allocate a new one */
++       if( ! pl) {
++               if( ! (pl = calloc(sizeof(PLimit), 1)))
++                       die(STATE_UNKNOWN, _("Out of memory"));
++               pl->pl_next = *l_ref;
++               *l_ref = pl;
++               pl->pl_when = start_time;
++               pl->pl_state = state;
++               pl->pl_metric = proc_metric;
++
++               state_changed = 1;
++       } else  /* It is possible that the time was set earlier when a 'C' generated
++                * an implicit 'W'. Since the 'W' prob started earlier that the 'C'
++                * we may have recorded the later 'C' time rather than the 'W' time.
++                */
++               if(pl->pl_when > start_time)
++                       pl->pl_when = start_time;
++
++       pl->pl_seen = 1;        /* Ensure that it is output */
++
++       if(verbose >= 3)
++               printf("Record limit: metric=%c state=%c since %s", pl->pl_metric, STATE2state(pl->pl_state), ctime(&pl->pl_when));
++
++       /* If this is a critical, but we didn't see the warning - generate the warning */
++       if(state == 'C' && ! seen_warning)
++               record_limit(l_ref, 'W', proc_metric, start_time);
++}
++
++/* Check if limits have been exceeded for at least the state-time
++ * Check only metric_state_name regardless of what is stored.
++ *
++ * Args:
++ * pl          List of limit values
++ *
++ * Return: STATE_OK, STATE_WARNING or STATE_CRITICAL
++ */
++int
++check_limit(PLimit* pl)
++{
++       int     result = STATE_OK;
++
++       for(; pl; pl = pl->pl_next) {
++               if( ! pl->pl_seen)
++                       continue;       /* Of no interest, not updated this run */
++
++               if(pl->pl_metric != metric_state_name)
++                       continue;       /* Not what we are looking for */
++
++               /* Is this something that has been going on for long enough that we
++                * are to report it ?
++                */
++               if(pl->pl_when <= state_limit_start) {
++                       if(result == STATE_OK)
++                               result = pl->pl_state;
++
++                       if(result == STATE_WARNING && pl->pl_state == STATE_CRITICAL)
++                               result = STATE_CRITICAL;
++               }
++       }
++
++       return(result);
+ }
diff --git a/web/attachments/32813-check_oracle.patch b/web/attachments/32813-check_oracle.patch
new file mode 100644
index 0000000..a2bd429
--- /dev/null
+++ b/web/attachments/32813-check_oracle.patch
@@ -0,0 +1,79 @@
+38a39,40
+>   echo "  $PROGNAME --cache <USER> <PASS> <INST> <CRITICAL> <WARNING>"
+>   echo "  $PROGNAME --tablespace <USER> <PASS> <INST> <TABLESPACE> <CRITICAL> <WARNING>"
+55a58,65
+>   echo "--cache"
+>   echo "   Check local database for library and buffer cache hit ratios"
+>   echo "       --->  Requires Oracle user/password and SID  specified."
+>   echo "                      --->  Requires select on v_$sysstat and v_$librarycache"
+>   echo "--tablespace"
+>   echo "   Check local database for tablespace capacity in ORACLE_SID"
+>   echo "       --->  Requires Oracle user/password specified."
+>   echo "                      --->  Requires select on dba_data_fiels and dba_free_Space"
+157a168,233
+>     ;;
+> --cache)
+>     if [ ${5} -gt ${6} ] ; then
+>       echo "UNKNOWN - Warning level is less then Crit"
+>       exit $STATE_UNKNOWN
+>     fi
+>     result=`sqlplus -s ${2}/${3}@${4} << EOF
+>       set pagesize 0
+>      
+> select (1-(pr.value/(dbg.value+cg.value)))*100 \
+> from v\\$sysstat pr, v\\$sysstat dbg, v\\$sysstat cg \
+> where pr.name = 'physical reads'  \
+>         and dbg.name='db block gets' \
+>         and cg.name='consistent gets'; `
+> 
+> 
+>     buf_hr=`echo $result | awk '{print int($1)}'` 
+>     result=`sqlplus -s ${2}/${3}@${4} << EOF
+>       set pagesize 0
+> 
+> select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100 \
+> from v\\$librarycache lc ; `
+>       
+>     lib_hr=`echo $result | awk '{print int($1)}'`
+> 
+>     if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
+>       echo "${3} : ${4} CRITICAL - Cache Hit Rates: $lib_hr % Lib -- $buf_hr % Buff"
+>       exit $STATE_CRITICAL
+>     fi
+>     if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
+>       echo "${3} : ${4} WARNING  - Cache Hit Rates: $lib_hr % Lib -- $buf_hr % Buff"
+>       exit $STATE_WARNING
+>     fi
+>     echo "${3} : ${4} OK - Cache Hit Rates: $lib_hr % Lib -- $buf_hr % Buff"
+> 
+>     exit $STATE_OK
+>     ;;
+> --tablespace)
+>     if [ ${6} -lt ${7} ] ; then
+>       echo "UNKNOWN - Warning level is more then Crit"
+>       exit $STATE_UNKNOWN
+>     fi
+>     result=`sqlplus -s ${2}/${3}@${4} << EOF
+>       set pagesize 0
+>      
+> select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc \
+> from ( \
+> select tablespace_name,sum(bytes)/1024/1024 total \
+> from dba_data_files group by tablespace_name) A, \
+> ( select tablespace_name,sum(bytes)/1024/1024 free \
+> from dba_Free_space group by tablespace_name) B \
+> where a.tablespace_name=b.tablespace_name and a.tablespace_name='${5}';  ` 
+> 
+>     ts_free=`echo $result | awk '{print int($1)}'` 
+>     ts_total=`echo $result | awk '{print int($2)}'` 
+>     ts_pct=`echo $result | awk '{print int($3)}'` 
+>     if [ $ts_pct -ge ${6} ] ; then
+>       echo "${4} : ${5} CRITICAL - $ts_pct% used [ $ts_free / $ts_total MB available ]"
+>       exit $STATE_CRITICAL
+>     fi
+>     if [ $ts_pct -ge ${7} ] ; then
+>       echo "${4} : ${5} WARNING  - $ts_pct% used [ $ts_free / $ts_total MB available ]"
+>       exit $STATE_WARNING
+>     fi
+>     echo "${4} : ${5} OK - $ts_pct% used [ $ts_free / $ts_total MB available ]"
+>     exit $STATE_OK
diff --git a/web/attachments/328741-utils_base.c.patch b/web/attachments/328741-utils_base.c.patch
new file mode 100644
index 0000000..d5207e2
--- /dev/null
+++ b/web/attachments/328741-utils_base.c.patch
@@ -0,0 +1,19 @@
+--- utils_base.c.old    2009-05-27 15:55:13.000000000 +0400
++++ utils_base.c        2009-05-28 11:51:11.000000000 +0400
+@@ -23,7 +23,6 @@
+ * 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: utils_base.c 1938 2008-03-11 00:10:23Z tonvoon $
+ *
+ *****************************************************************************/
+ 
+@@ -104,7 +103,7 @@
+ {
+        thresholds *temp_thresholds = NULL;
+ 
+-       temp_thresholds = malloc(sizeof(temp_thresholds));
++       temp_thresholds = malloc(sizeof(thresholds));
+ 
+        temp_thresholds->warning = NULL;
+        temp_thresholds->critical = NULL;
diff --git a/web/attachments/328860-check_http.patch b/web/attachments/328860-check_http.patch
new file mode 100644
index 0000000..f1e32b6
--- /dev/null
+++ b/web/attachments/328860-check_http.patch
@@ -0,0 +1,14 @@
+Index: check_http.c
+===================================================================
+--- check_http.c        (Revision 449)
++++ check_http.c        (Arbeitskopie)
+@@ -1017,7 +1017,8 @@
+       exit (STATE_OK);
+     }
+     else {
+-      printf (_("HTTP CRITICAL - string not found%s|%s %s\n"),
++      printf (_("HTTP CRITICAL - string '%s' not found%s|%s %s\n"), 
++              string_expect,
+               (display_html ? "</A>" : ""),
+               perfd_time (elapsed_time), perfd_size (pagesize));
+       exit (STATE_CRITICAL);
diff --git a/web/attachments/329105-check_pgsql.c.diff b/web/attachments/329105-check_pgsql.c.diff
new file mode 100644
index 0000000..f6e6eef
--- /dev/null
+++ b/web/attachments/329105-check_pgsql.c.diff
@@ -0,0 +1,13 @@
+Index: check_pgsql.c
+===================================================================
+--- check_pgsql.c       (revision 2203)
++++ check_pgsql.c       (working copy)
+@@ -429,8 +429,6 @@
+ 
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ 
+-       printf (_(UT_VERBOSE));
+-
+   printf ("\n");
+        printf (" %s\n", _("All parameters are optional."));
+   printf (" %s\n", _("This plugin tests a PostgreSQL DBMS to determine whether it is active and"));
diff --git a/web/attachments/329918-checkntp.zip b/web/attachments/329918-checkntp.zip
new file mode 100644
index 0000000..1262d80
--- /dev/null
+++ b/web/attachments/329918-checkntp.zip
diff --git a/web/attachments/329923-snmp_procmon.diff b/web/attachments/329923-snmp_procmon.diff
new file mode 100644
index 0000000..dd02316
--- /dev/null
+++ b/web/attachments/329923-snmp_procmon.diff
@@ -0,0 +1,17 @@
+--- nagios-plugins-1.4.13/contrib/check_snmp_process_monitor.pl 2002-08-22 15:08:46.000000000 -0700
++++ nagios-plugins-1.4.13_mod/contrib/check_snmp_process_monitor.pl     2009-06-01 05:57:37.000000000 -0700
+@@ -293,12 +293,12 @@
+ # warning, critical
+ if ( ($opt_warning->[0] > 0 && $opt_warning->[0]  >  $count)
+   || ($opt_warning->[1] > 0 && $opt_warning->[1]  <= $count) ) {
+-    $message = "WARNING - no processes found resembling '". ($opt_command || $opt_regex);
++    $message = "WARNING - $count processes found resembling '". ($opt_command || $opt_regex);
+     $exit = $ERRORS{WARNING};
+ }
+ if ( ($opt_critical->[0] > 0 && $opt_critical->[0]  >  $count)
+   || ($opt_critical->[1] > 0 && $opt_critical->[1]  <= $count) ) {
+-    $message = "CRITICAL - no processes found resembling '". ($opt_command || $opt_regex);
++    $message = "CRITICAL - $count processes found resembling '". ($opt_command || $opt_regex);
+     $exit = $ERRORS{CRITICAL};
+ }
+ 
diff --git a/web/attachments/329924-snmp_dskmon.diff b/web/attachments/329924-snmp_dskmon.diff
new file mode 100644
index 0000000..f454346
--- /dev/null
+++ b/web/attachments/329924-snmp_dskmon.diff
@@ -0,0 +1,30 @@
+--- nagios-plugins-1.4.13/contrib/check_snmp_disk_monitor.pl    2002-08-22 07:42:43.000000000 -0700
++++ nagios-plugins-1.4.13_mod/contrib/check_snmp_disk_monitor.pl        2009-06-03 06:27:33.000000000 -0700
+@@ -27,7 +27,6 @@
+ %mounts        = ();
+ 
+ sub process_options {
+-    my( $opt_crit, $opt_warn ) = ();
+     Getopt::Long::Configure( 'bundling' );
+     GetOptions(
+         'V'     => \$opt_version,       'version'     => \$opt_version,
+@@ -37,8 +36,8 @@
+         'H:s'   => \$opt_host,          'hostname:s'  => \$opt_host,
+         'p:i'   => \$opt_port,          'port:i'      => \$opt_port,
+         'C:s'   => \$opt_community,     'community:s' => \$opt_community,
+-        'c:i'   => \$opt_crit,          'critical:i'  => \$opt_crit,
+-        'w:i'   => \$opt_warn,          'warning:i'   => \$opt_warn,
++        'c:i'   => \$opt_critical,      'critical:i'  => \$opt_critical,
++        'w:i'   => \$opt_warning,       'warning:i'   => \$opt_warning,
+         't:i'   => \$TIMEOUT,           'timeout:i'   => \$TIMEOUT,    
+         'm:s'   => \$opt_mountpoint,    'mountpoint:s'=> \$opt_mountpoint
+     );
+@@ -56,7 +55,7 @@
+ }
+ 
+ sub print_usage {
+-    print "Usage: $PROGNAME -H <host> -C <snmp_community> [-s] [-w <low>,<high>] [-c <low>,<high>] [-t <timeout>] -m <mountpoint>\n";
++    print "Usage: $PROGNAME -H <host> -C <snmp_community> [-s] [-w <limit>] [-c <limit>] [-t <timeout>] -m <mountpoint>\n";
+ }
+ 
+ sub print_help {
diff --git a/web/attachments/330164-nagios-plugins-1.4.13-no-buggy-locales.diff b/web/attachments/330164-nagios-plugins-1.4.13-no-buggy-locales.diff
new file mode 100644
index 0000000..280708f
--- /dev/null
+++ b/web/attachments/330164-nagios-plugins-1.4.13-no-buggy-locales.diff
@@ -0,0 +1,577 @@
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_by_ssh.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_by_ssh.c
+--- nagios-plugins-1.4.13/plugins/check_by_ssh.c        2008-05-27 23:31:13.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_by_ssh.c       2008-12-15 22:10:55.000000000 +0100
+@@ -72,10 +72,6 @@
+        remotecmd = "";
+        comm = strdup (SSH_COMMAND);
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_cluster.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_cluster.c
+--- nagios-plugins-1.4.13/plugins/check_cluster.c       2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_cluster.c      2008-12-15 22:10:55.000000000 +0100
+@@ -70,10 +70,6 @@
+        int return_code=STATE_OK;
+        thresholds *thresholds = NULL;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts(&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_dig.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_dig.c
+--- nagios-plugins-1.4.13/plugins/check_dig.c   2008-06-09 21:47:36.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_dig.c  2008-12-15 22:10:55.000000000 +0100
+@@ -76,10 +76,6 @@
+   double elapsed_time;
+   int result = STATE_UNKNOWN;
+ 
+-  setlocale (LC_ALL, "");
+-  bindtextdomain (PACKAGE, LOCALEDIR);
+-  textdomain (PACKAGE);
+-
+   /* Set signal handling and alarm */
+   if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
+     usage_va(_("Cannot catch SIGALRM"));
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_disk.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_disk.c
+--- nagios-plugins-1.4.13/plugins/check_disk.c  2008-07-10 12:03:55.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_disk.c 2008-12-15 22:10:56.000000000 +0100
+@@ -186,10 +186,6 @@
+   perf = strdup ("");
+   stat_buf = malloc(sizeof *stat_buf);
+ 
+-  setlocale (LC_ALL, "");
+-  bindtextdomain (PACKAGE, LOCALEDIR);
+-  textdomain (PACKAGE);
+-
+   mount_list = read_file_system_list (0);
+ 
+   /* Parse extra opts if any */
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_dns.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_dns.c
+--- nagios-plugins-1.4.13/plugins/check_dns.c   2008-05-13 11:14:45.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_dns.c  2008-12-15 22:10:56.000000000 +0100
+@@ -90,10 +90,6 @@
+   output chld_out, chld_err;
+   size_t i;
+ 
+-  setlocale (LC_ALL, "");
+-  bindtextdomain (PACKAGE, LOCALEDIR);
+-  textdomain (PACKAGE);
+-
+   /* Set signal handling and alarm */
+   if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+     usage_va(_("Cannot catch SIGALRM"));
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_dummy.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_dummy.c
+--- nagios-plugins-1.4.13/plugins/check_dummy.c 2008-04-27 16:35:26.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_dummy.c        2008-12-15 22:10:56.000000000 +0100
+@@ -48,10 +48,6 @@
+ {
+   int result = STATE_UNKNOWN;
+ 
+-  setlocale (LC_ALL, "");
+-  bindtextdomain (PACKAGE, LOCALEDIR);
+-  textdomain (PACKAGE);
+-
+   if (argc < 2)
+     usage4 (_("Could not parse arguments"));
+   else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_fping.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_fping.c
+--- nagios-plugins-1.4.13/plugins/check_fping.c 2008-08-16 06:47:22.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_fping.c        2008-12-15 22:10:56.000000000 +0100
+@@ -79,10 +79,6 @@
+   char *input_buffer = NULL;
+   input_buffer = malloc (MAX_INPUT_BUFFER);
+ 
+-  setlocale (LC_ALL, "");
+-  bindtextdomain (PACKAGE, LOCALEDIR);
+-  textdomain (PACKAGE);
+-
+   /* Parse extra opts if any */
+   argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_game.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_game.c
+--- nagios-plugins-1.4.13/plugins/check_game.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_game.c 2008-12-15 22:10:57.000000000 +0100
+@@ -75,10 +75,6 @@
+   size_t i = 0;
+   output chld_out;
+ 
+-  setlocale (LC_ALL, "");
+-  bindtextdomain (PACKAGE, LOCALEDIR);
+-  textdomain (PACKAGE);
+-
+   /* Parse extra opts if any */
+   argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_hpjd.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_hpjd.c
+--- nagios-plugins-1.4.13/plugins/check_hpjd.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_hpjd.c 2008-12-15 22:10:57.000000000 +0100
+@@ -96,10 +96,6 @@
+ 
+        errmsg = malloc(MAX_INPUT_BUFFER);
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_http.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_http.c
+--- nagios-plugins-1.4.13/plugins/check_http.c  2008-09-02 13:26:31.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_http.c 2008-12-15 22:10:57.000000000 +0100
+@@ -137,10 +137,6 @@
+ {
+   int result = STATE_UNKNOWN;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+   /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
+   server_url = strdup(HTTP_URL);
+   server_url_length = strlen(server_url);
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ide_smart.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ide_smart.c
+--- nagios-plugins-1.4.13/plugins/check_ide_smart.c     2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ide_smart.c    2008-12-15 22:10:57.000000000 +0100
+@@ -176,10 +176,6 @@
+                {"version", no_argument, 0, 'V'}, {0, 0, 0, 0} 
+        };
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        while (1) {
+                
+                o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex);
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ldap.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ldap.c
+--- nagios-plugins-1.4.13/plugins/check_ldap.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ldap.c 2008-12-15 22:10:57.000000000 +0100
+@@ -97,10 +97,6 @@
+        int tls; 
+        int version=3;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        if (strstr(argv[0],"check_ldaps")) {
+                asprintf (&progname, "check_ldaps");
+        }
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_load.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_load.c
+--- nagios-plugins-1.4.13/plugins/check_load.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_load.c 2008-12-15 22:10:58.000000000 +0100
+@@ -114,11 +114,6 @@
+ # endif
+ #endif
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-       setlocale(LC_NUMERIC, "POSIX");
+-
+        /* Parse extra opts if any */
+        argv = np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_mrtg.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mrtg.c
+--- nagios-plugins-1.4.13/plugins/check_mrtg.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mrtg.c 2008-12-15 22:10:58.000000000 +0100
+@@ -68,10 +68,6 @@
+        unsigned long maximum_value_rate = 0L;
+        unsigned long rate = 0L;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_mrtgtraf.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mrtgtraf.c
+--- nagios-plugins-1.4.13/plugins/check_mrtgtraf.c      2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mrtgtraf.c     2008-12-15 22:10:58.000000000 +0100
+@@ -76,10 +76,6 @@
+        char incoming_speed_rating[8];
+        char outgoing_speed_rating[8];
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_mysql.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mysql.c
+--- nagios-plugins-1.4.13/plugins/check_mysql.c 2008-08-16 06:47:32.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mysql.c        2008-12-15 22:10:58.000000000 +0100
+@@ -78,10 +78,6 @@
+        char *error = NULL;
+        char slaveresult[SLAVERESULTSIZE];
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_mysql_query.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mysql_query.c
+--- nagios-plugins-1.4.13/plugins/check_mysql_query.c   2008-08-16 06:47:32.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_mysql_query.c  2008-12-15 22:10:59.000000000 +0100
+@@ -74,10 +74,6 @@
+        char *error = NULL;
+        int status;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_nagios.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_nagios.c
+--- nagios-plugins-1.4.13/plugins/check_nagios.c        2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_nagios.c       2008-12-15 22:10:59.000000000 +0100
+@@ -84,10 +84,6 @@
+        output chld_out, chld_err;
+        size_t i;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_nt.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_nt.c
+--- nagios-plugins-1.4.13/plugins/check_nt.c    2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_nt.c   2008-12-15 22:10:59.000000000 +0100
+@@ -118,10 +118,6 @@
+        int isPercent = FALSE;
+        int allRight = FALSE;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ntp.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ntp.c
+--- nagios-plugins-1.4.13/plugins/check_ntp.c   2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ntp.c  2008-12-15 22:10:59.000000000 +0100
+@@ -757,10 +757,6 @@
+        double offset=0, jitter=0;
+        char *result_line, *perfdata_line;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        result = offset_result = jitter_result = STATE_OK;
+ 
+        /* Parse extra opts if any */
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ntp_peer.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ntp_peer.c
+--- nagios-plugins-1.4.13/plugins/check_ntp_peer.c      2008-09-02 14:28:04.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ntp_peer.c     2008-12-15 22:10:59.000000000 +0100
+@@ -589,10 +589,6 @@
+        double offset=0, jitter=0;
+        char *result_line, *perfdata_line;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ntp_time.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ntp_time.c
+--- nagios-plugins-1.4.13/plugins/check_ntp_time.c      2008-09-01 16:04:22.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ntp_time.c     2008-12-15 22:10:59.000000000 +0100
+@@ -539,10 +539,6 @@
+        double offset=0;
+        char *result_line, *perfdata_line;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        result = offset_result = STATE_OK;
+ 
+        /* Parse extra opts if any */
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_nwstat.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_nwstat.c
+--- nagios-plugins-1.4.13/plugins/check_nwstat.c        2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_nwstat.c       2008-12-15 22:10:59.000000000 +0100
+@@ -166,10 +166,6 @@
+        unsigned long sap_entries=0;
+        char uptime[MAX_INPUT_BUFFER];
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts(&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_overcr.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_overcr.c
+--- nagios-plugins-1.4.13/plugins/check_overcr.c        2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_overcr.c       2008-12-15 22:10:59.000000000 +0100
+@@ -95,10 +95,6 @@
+        int uptime_hours = 0;
+        int uptime_minutes = 0;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_pgsql.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_pgsql.c
+--- nagios-plugins-1.4.13/plugins/check_pgsql.c 2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_pgsql.c        2008-12-15 22:10:59.000000000 +0100
+@@ -146,10 +146,6 @@
+        pgoptions = NULL;  /* special options to start up the backend server */
+        pgtty = NULL;      /* debugging tty for the backend server */
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ping.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ping.c
+--- nagios-plugins-1.4.13/plugins/check_ping.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ping.c 2008-12-15 22:11:00.000000000 +0100
+@@ -84,11 +84,6 @@
+        int this_result = STATE_UNKNOWN;
+        int i;
+ 
+-       setlocale (LC_ALL, "");
+-       setlocale (LC_NUMERIC, "C");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        addresses = malloc (sizeof(char*) * max_addr);
+        addresses[0] = NULL;
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_procs.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_procs.c
+--- nagios-plugins-1.4.13/plugins/check_procs.c 2008-07-08 11:31:04.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_procs.c        2008-12-15 22:11:00.000000000 +0100
+@@ -133,11 +133,6 @@
+        int result = STATE_UNKNOWN;
+        output chld_out, chld_err;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-       setlocale(LC_NUMERIC, "POSIX");
+-
+        input_buffer = malloc (MAX_INPUT_BUFFER);
+        procprog = malloc (MAX_INPUT_BUFFER);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_radius.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_radius.c
+--- nagios-plugins-1.4.13/plugins/check_radius.c        2008-05-20 09:57:13.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_radius.c       2008-12-15 22:11:00.000000000 +0100
+@@ -145,10 +145,6 @@
+        UINT4 client_id;
+        char *str;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_real.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_real.c
+--- nagios-plugins-1.4.13/plugins/check_real.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_real.c 2008-12-15 22:11:00.000000000 +0100
+@@ -73,10 +73,6 @@
+        char buffer[MAX_INPUT_BUFFER];
+        char *status_line = NULL;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_smtp.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_smtp.c
+--- nagios-plugins-1.4.13/plugins/check_smtp.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_smtp.c 2008-12-15 22:11:00.000000000 +0100
+@@ -133,10 +133,6 @@
+        char *error_msg = "";
+        struct timeval tv;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_snmp.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_snmp.c
+--- nagios-plugins-1.4.13/plugins/check_snmp.c  2008-07-09 23:53:12.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_snmp.c 2008-12-15 22:11:00.000000000 +0100
+@@ -154,10 +154,6 @@
+        char *show = NULL;
+        char type[8] = "";
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        labels = malloc (labels_size);
+        unitv = malloc (unitv_size);
+        for (i = 0; i < MAX_OIDS; i++)
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ssh.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ssh.c
+--- nagios-plugins-1.4.13/plugins/check_ssh.c   2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ssh.c  2008-12-15 22:11:00.000000000 +0100
+@@ -66,10 +66,6 @@
+ {
+        int result = STATE_UNKNOWN;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_swap.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_swap.c
+--- nagios-plugins-1.4.13/plugins/check_swap.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_swap.c 2008-12-15 22:11:00.000000000 +0100
+@@ -101,10 +101,6 @@
+        char str[32];
+        char *status;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        status = strdup ("");
+ 
+        /* Parse extra opts if any */
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_tcp.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_tcp.c
+--- nagios-plugins-1.4.13/plugins/check_tcp.c   2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_tcp.c  2008-12-15 22:11:00.000000000 +0100
+@@ -102,10 +102,6 @@
+        size_t len;
+        int match = -1;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* determine program- and service-name quickly */
+        progname = strrchr(argv[0], '/');
+        if(progname != NULL) progname++;
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_time.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_time.c
+--- nagios-plugins-1.4.13/plugins/check_time.c  2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_time.c 2008-12-15 22:11:00.000000000 +0100
+@@ -71,10 +71,6 @@
+        int result = STATE_UNKNOWN;
+        time_t conntime;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_ups.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ups.c
+--- nagios-plugins-1.4.13/plugins/check_ups.c   2008-07-10 12:03:43.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_ups.c  2008-12-15 22:11:00.000000000 +0100
+@@ -111,10 +111,6 @@
+        double ups_utility_deviation = 0.0;
+        int res;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        ups_status = strdup ("N/A");
+        data = strdup ("");
+        message = strdup ("");
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/check_users.c nagios-plugins-1.4.13-no-buggy-locales/plugins/check_users.c
+--- nagios-plugins-1.4.13/plugins/check_users.c 2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/check_users.c        2008-12-15 22:11:01.000000000 +0100
+@@ -59,10 +59,6 @@
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *perf;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        perf = strdup("");
+ 
+        /* Parse extra opts if any */
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/negate.c nagios-plugins-1.4.13-no-buggy-locales/plugins/negate.c
+--- nagios-plugins-1.4.13/plugins/negate.c      2008-05-02 11:28:15.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/negate.c     2008-12-15 22:11:01.000000000 +0100
+@@ -67,10 +67,6 @@
+        output chld_out, chld_err;
+        int i;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        command_line = (char **) process_arguments (argc, argv);
+ 
+        /* Set signal handling and alarm */
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins/urlize.c nagios-plugins-1.4.13-no-buggy-locales/plugins/urlize.c
+--- nagios-plugins-1.4.13/plugins/urlize.c      2008-01-31 12:27:22.000000000 +0100
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins/urlize.c     2008-12-15 22:11:01.000000000 +0100
+@@ -67,10 +67,6 @@
+                {0, 0, 0, 0}
+        };
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Need at least 2 args */
+        if (argc < 3) {
+                print_help();
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins-root/check_dhcp.c nagios-plugins-1.4.13-no-buggy-locales/plugins-root/check_dhcp.c
+--- nagios-plugins-1.4.13/plugins-root/check_dhcp.c     2008-07-06 14:57:11.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins-root/check_dhcp.c    2008-12-15 22:11:01.000000000 +0100
+@@ -263,10 +263,6 @@
+        int dhcp_socket;
+        int result = STATE_UNKNOWN;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* Parse extra opts if any */
+        argv=np_extra_opts(&argc, argv, progname);
+ 
+diff -Naur --exclude '*.orig' nagios-plugins-1.4.13/plugins-root/check_icmp.c nagios-plugins-1.4.13-no-buggy-locales/plugins-root/check_icmp.c
+--- nagios-plugins-1.4.13/plugins-root/check_icmp.c     2008-08-08 04:08:08.000000000 +0200
++++ nagios-plugins-1.4.13-no-buggy-locales/plugins-root/check_icmp.c    2008-12-15 22:11:01.000000000 +0100
+@@ -377,10 +377,6 @@
+        int result;
+        struct rta_host *host;
+ 
+-       setlocale (LC_ALL, "");
+-       bindtextdomain (PACKAGE, LOCALEDIR);
+-       textdomain (PACKAGE);
+-
+        /* print a helpful error message if geteuid != 0 */
+        np_warn_if_not_root();
+ 
diff --git a/web/attachments/330612-rangesupport.patch b/web/attachments/330612-rangesupport.patch
new file mode 100644
index 0000000..b32527a
--- /dev/null
+++ b/web/attachments/330612-rangesupport.patch
@@ -0,0 +1,326 @@
+diff --git a/plugins/check_nt.c b/plugins/check_nt.c
+index d038efe..e2b8722 100644
+--- a/plugins/check_nt.c
++++ b/plugins/check_nt.c
+@@ -65,8 +65,10 @@ int server_port=PORT;
+ char *value_list=NULL;
+ char *req_password=NULL;
+ unsigned long lvalue_list[MAX_VALUE_LIST];
+-unsigned long warning_value=0L;
+-unsigned long critical_value=0L;
++range *warning_value=NULL;
++range *critical_value=NULL;
++const char *warning_value_string="";
++const char *critical_value_string="";
+ int check_warning_value=FALSE;
+ int check_critical_value=FALSE;
+ enum checkvars vars_to_check = CHECK_NONE;
+@@ -81,6 +83,16 @@ int strtoularray(unsigned long *array, char *string, const char *delim);
+ void print_help(void);
+ void print_usage(void);
+ 
++bool allnumeric(const char* number)
++{
++       int i;
++       for(i=0; number[i]; i++)
++       {
++               if(number[i]<'0'||number[i]>'9'){return false;}
++       }
++       return true;
++}
++
+ int main(int argc, char **argv){
+ 
+ /* should be   int result = STATE_UNKNOWN; */
+@@ -224,8 +236,8 @@ int main(int argc, char **argv){
+ 
+                        if (total_disk_space>0 && free_disk_space>=0) {
+                                percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+-                               warning_used_space = ((float)warning_value / 100) * total_disk_space;
+-                               critical_used_space = ((float)critical_value / 100) * total_disk_space;
++                               warning_used_space = ((float)(warning_value?warning_value->end:0) / 100) * total_disk_space;
++                               critical_used_space = ((float)(critical_value?critical_value->end:0) / 100) * total_disk_space;
+ 
+                                asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
+                                  value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
+@@ -234,12 +246,33 @@ int main(int argc, char **argv){
+                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
+ 
+-                               if(check_critical_value==TRUE && percent_used_space >= critical_value)
+-                                       return_code=STATE_CRITICAL;
+-                               else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+-                                       return_code=STATE_WARNING;
+-                               else
+-                                       return_code=STATE_OK;
++                               if(allnumeric(critical_value_string)&&allnumeric(warning_value_string))
++                               {
++                                       if (critical_value > warning_value)
++                                       {                       /* Normal thresholds */
++                                               if (check_critical_value == TRUE && percent_used_space >= critical_value->end)
++                                                       return_code = STATE_CRITICAL;
++                                               else if (check_warning_value == TRUE && percent_used_space >= warning_value->end)
++                                                       return_code = STATE_WARNING;
++                                               else
++                                                       return_code = STATE_OK;
++                                       }
++                                       else
++                                       {                       /* inverse thresholds */
++                                               return_code = STATE_OK;
++                                               if (check_critical_value == TRUE && percent_used_space <= critical_value->end)
++                                                       return_code = STATE_CRITICAL;
++                                               else if (check_warning_value == TRUE && percent_used_space <= warning_value->end)
++                                                       return_code = STATE_WARNING;
++                                       }
++                               }else{
++                                       if(check_critical_value==TRUE && check_range(percent_used_space, critical_value))
++                                               return_code=STATE_CRITICAL;
++                                       else if (check_warning_value==TRUE && check_range(percent_used_space, warning_value))
++                                               return_code=STATE_WARNING;
++                                       else
++                                               return_code=STATE_OK;
++                               }
+ 
+                                output_message = strdup (temp_string);
+                                perfdata = temp_string_perf;
+@@ -273,8 +306,8 @@ int main(int argc, char **argv){
+                mem_commitLimit=atof(strtok(recv_buffer,"&"));
+                mem_commitByte=atof(strtok(NULL,"&"));
+                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;
++               warning_used_space = ((float)(warning_value?warning_value->end:0) / 100) * mem_commitLimit;
++               critical_used_space = ((float)(warning_value?critical_value->end:0) / 100) * mem_commitLimit;
+ 
+                /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here,
+                which equals RAM + Pagefiles. */
+@@ -284,12 +317,32 @@ int main(int argc, char **argv){
+                asprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567,
+                  warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567);
+ 
+-               return_code=STATE_OK;
+-               if(check_critical_value==TRUE && percent_used_space >= critical_value)
+-                       return_code=STATE_CRITICAL;
+-               else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+-                       return_code=STATE_WARNING;
+-
++               if(allnumeric(critical_value_string)&&allnumeric(warning_value_string))
++               {
++                       if (critical_value > warning_value)
++                       {                       /* Normal thresholds */
++                               if (check_critical_value == TRUE && percent_used_space >= critical_value->end)
++                                       return_code = STATE_CRITICAL;
++                               else if (check_warning_value == TRUE && percent_used_space >= warning_value->end)
++                                       return_code = STATE_WARNING;
++                               else
++                                       return_code = STATE_OK;
++                       }
++                       else
++                       {                       /* inverse thresholds */
++                               return_code = STATE_OK;
++                               if (check_critical_value == TRUE && percent_used_space <= critical_value->end)
++                                       return_code = STATE_CRITICAL;
++                               else if (check_warning_value == TRUE && percent_used_space <= warning_value->end)
++                                       return_code = STATE_WARNING;
++                       }
++               }else{
++                       return_code=STATE_OK;
++                       if(check_critical_value==TRUE && check_range(percent_used_space, critical_value))
++                               return_code=STATE_CRITICAL;
++                       else if (check_warning_value==TRUE && check_range(percent_used_space, warning_value))
++                               return_code=STATE_WARNING;      
++               }
+                break;
+ 
+        case CHECK_COUNTER:
+@@ -373,29 +426,41 @@ int main(int argc, char **argv){
+                                        }
+                                        asprintf (&output_message, "%s |", output_message);
+                                        asprintf (&output_message,"%s %s", output_message,
+-                                               fperfdata (description, counter_value,
+-                                                       counter_unit, 1, warning_value, 1, critical_value,
++                                               fperfdatarange (description, counter_value, 
++                                                       counter_unit, warning_value_string, critical_value_string,
+                                                        (!(isPercent) && (minval != NULL)), fminval,
+                                                        (!(isPercent) && (minval != NULL)), fmaxval));
+                        }
+                }
+ 
+-               if (critical_value > warning_value)
+-               {                       /* Normal thresholds */
+-                       if (check_critical_value == TRUE && counter_value >= critical_value)
+-                               return_code = STATE_CRITICAL;
+-                       else if (check_warning_value == TRUE && counter_value >= warning_value)
+-                               return_code = STATE_WARNING;
++               if(allnumeric(critical_value_string)&&allnumeric(warning_value_string))
++               {
++                       if (critical_value > warning_value)
++                       {                       /* Normal thresholds */
++                               if (check_critical_value == TRUE && counter_value >= critical_value->end)
++                                       return_code = STATE_CRITICAL;
++                               else if (check_warning_value == TRUE && counter_value >= warning_value->end)
++                                       return_code = STATE_WARNING;
++                               else
++                                       return_code = STATE_OK;
++                       }
+                        else
++                       {                       /* inverse thresholds */
+                                return_code = STATE_OK;
+-               }
+-               else
+-               {                       /* inverse thresholds */
+-                       return_code = STATE_OK;
+-                       if (check_critical_value == TRUE && counter_value <= critical_value)
++                               if (check_critical_value == TRUE && counter_value <= critical_value->end)
++                                       return_code = STATE_CRITICAL;
++                               else if (check_warning_value == TRUE && counter_value <= warning_value->end)
++                                       return_code = STATE_WARNING;
++                       }
++               }else{
++                       if(check_critical_value == TRUE && check_range(counter_value, critical_value))
++                       {
+                                return_code = STATE_CRITICAL;
+-                       else if (check_warning_value == TRUE && counter_value <= warning_value)
++                       }else if(check_warning_value == TRUE && check_range(counter_value, warning_value)) {
+                                return_code = STATE_WARNING;
++                       }else{
++                               return_code = STATE_OK;
++                       }
+                }
+        break;
+ 
+@@ -411,21 +476,34 @@ int main(int argc, char **argv){
+                        description = strtok(NULL,"&");
+                        output_message = strdup (description);
+ 
+-                       if (critical_value > warning_value) {        /* Normal thresholds */
+-                               if(check_critical_value==TRUE && age_in_minutes >= critical_value)
+-                                       return_code=STATE_CRITICAL;
+-                               else if (check_warning_value==TRUE && age_in_minutes >= warning_value)
+-                                       return_code=STATE_WARNING;
+-                               else
+-                                       return_code=STATE_OK;
+-                       }
+-                       else {                                       /* inverse thresholds */
+-                               if(check_critical_value==TRUE && age_in_minutes <= critical_value)
+-                                       return_code=STATE_CRITICAL;
+-                               else if (check_warning_value==TRUE && age_in_minutes <= warning_value)
+-                                       return_code=STATE_WARNING;
++                       if(allnumeric(critical_value_string)&&allnumeric(warning_value_string))
++                       {
++                               if (critical_value > warning_value)
++                               {                       /* Normal thresholds */
++                                       if (check_critical_value == TRUE && age_in_minutes >= critical_value->end)
++                                               return_code = STATE_CRITICAL;
++                                       else if (check_warning_value == TRUE && age_in_minutes >= warning_value->end)
++                                               return_code = STATE_WARNING;
++                                       else
++                                               return_code = STATE_OK;
++                               }
+                                else
+-                                       return_code=STATE_OK;
++                               {                       /* inverse thresholds */
++                                       return_code = STATE_OK;
++                                       if (check_critical_value == TRUE && age_in_minutes <= critical_value->end)
++                                               return_code = STATE_CRITICAL;
++                                       else if (check_warning_value == TRUE && age_in_minutes <= warning_value->end)
++                                               return_code = STATE_WARNING;
++                               }
++                       }else{
++                               if(check_critical_value == TRUE && check_range(age_in_minutes, critical_value))
++                               {
++                                       return_code = STATE_CRITICAL;
++                               }else if(check_warning_value == TRUE && check_range(age_in_minutes, warning_value)) {
++                                       return_code = STATE_WARNING;
++                               }else{
++                                       return_code = STATE_OK;
++                               }
+                        }
+                }
+                break;
+@@ -563,11 +641,13 @@ int process_arguments(int argc, char **argv){
+                                value_list = optarg;
+                                break;
+                        case 'w': /* warning threshold */
+-                               warning_value=strtoul(optarg,NULL,10);
++                               warning_value=parse_range_string(optarg);
++                               warning_value_string=optarg;
+                                check_warning_value=TRUE;
+                                break;
+                        case 'c': /* critical threshold */
+-                               critical_value=strtoul(optarg,NULL,10);
++                               critical_value=parse_range_string(optarg);
++                               critical_value_string=optarg;
+                                check_critical_value=TRUE;
+                                break;
+                        case 'd': /* Display select for services */
+diff --git a/plugins/utils.c b/plugins/utils.c
+index 4537390..f4f6433 100644
+--- a/plugins/utils.c
++++ b/plugins/utils.c
+@@ -600,3 +600,44 @@ char *fperfdata (const char *label,
+ 
+        return data;
+ }
++
++char *fperfdatarange (const char *label,
++ double val,
++ const char *uom,
++ const char *warn,
++ const char *crit,
++ int minp,
++ double minv,
++ int maxp,
++ double maxv)
++{
++       char *data = NULL;
++
++       if (strpbrk (label, "'= "))
++               asprintf (&data, "'%s'=", label);
++       else
++               asprintf (&data, "%s=", label);
++
++       asprintf (&data, "%s%f", data, val);
++       asprintf (&data, "%s%s;", data, uom);
++
++       if (warn)
++               asprintf (&data, "%s%s", data, warn);
++
++       asprintf (&data, "%s;", data);
++
++       if (crit)
++               asprintf (&data, "%s%s", data, crit);
++
++       asprintf (&data, "%s;", data);
++
++       if (minp)
++               asprintf (&data, "%s%f", data, minv);
++
++       if (maxp) {
++               asprintf (&data, "%s;", data);
++               asprintf (&data, "%s%f", data, maxv);
++       }
++
++       return data;
++}
+diff --git a/plugins/utils.h b/plugins/utils.h
+index d6e9c8f..bd8fe1d 100644
+--- a/plugins/utils.h
++++ b/plugins/utils.h
+@@ -121,6 +121,16 @@ char *fperfdata (const char *,
+  int,
+  double);
+ 
++char *fperfdatarange (const char *,
++ double,
++ const char *,
++ const char *,
++ const char *,
++ int,
++ double,
++ int,
++ double);
++
+ /* The idea here is that, although not every plugin will use all of these, 
+    most will or should.  Therefore, for consistency, these very common 
+    options should have only these meanings throughout the overall suite */
diff --git a/web/attachments/33077-nag.patch b/web/attachments/33077-nag.patch
new file mode 100644
index 0000000..a9c1305
--- /dev/null
+++ b/web/attachments/33077-nag.patch
@@ -0,0 +1,470 @@
+--- nagiosplug-1.3-beta1/acconfig.h     Sun May 26 19:01:09 2002
++++ nagiosplug-1.3-beta1.new/acconfig.h Mon Oct 14 12:21:57 2002
+@@ -35,6 +35,7 @@
+ #undef SSH_COMMAND
+ #undef SWAP_COMMAND
+ #undef SWAP_FORMAT
++#undef SWAP_LINE
+ #undef USE_PS_VARS
+ #undef VSZ_COMMAND
+ #undef VSZ_FORMAT
+--- nagiosplug-1.3-beta1/configure.in   Wed Jun 12 20:03:07 2002
++++ nagiosplug-1.3-beta1.new/configure.in       Mon Oct 14 11:59:56 2002
+@@ -757,14 +757,18 @@
+        if [swap -l 2>/dev/null | egrep -i "^lswap +path +pri +swaplo +blocks +free +maxswap" >/dev/null]
+        then
+                AC_DEFINE_UNQUOTED(SWAP_FORMAT,[" %*d %*s %*d,%*d %*d %*d %d %d"])
++               AC_DEFINE_UNQUOTED(SWAP_LINE,[""])
+                echo "      using IRIX format"
+        elif [swap -l 2>/dev/null | egrep -i "^swapfile +dev +swaplo +blocks +free" >/dev/null]
+        then
+                AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %*[[0-9,-]] %*d %d %d"])
++               AC_DEFINE_UNQUOTED(SWAP_LINE,[""])
+                echo "      using Solaris format"
+        fi
++
++
+        EXTRAS="$EXTRAS check_swap"
+-elif [swapinfo -k 2>&1 | egrep -i "Device" >/dev/null]
++elif [swapinfo -k 2>&1 | egrep -i "^Device" >/dev/null]
+ then
+        echo "found swapinfo command"
+        AC_DEFINE(HAVE_SWAP)
+@@ -773,8 +777,23 @@
+        if [swapinfo -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
+        then
+                AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"])
++               AC_DEFINE_UNQUOTED(SWAP_LINE,[""])
++dnl            AC_DEFINE_UNQUOTED(SWAP_LINE,["Total"])
++dnl Can't exactly test the above, but thought it would be nice.
+                echo "      using FreeBSD format"
+        fi
++elif [swapinfo 2>&1 | egrep -i "^memory" >/dev/null]
++then
++       echo "found swapinfo command"
++       AC_DEFINE(HAVE_SWAP)
++       AC_PATH_PROG(PATH_TO_SWAP,swapinfo)
++       AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$PATH_TO_SWAP")
++       if [swapinfo 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE +USED" >/dev/null]
++       then
++               AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"])
++               AC_DEFINE_UNQUOTED(SWAP_LINE,["memory"])
++               echo "      using HP-UX format"
++       fi
+        EXTRAS="$EXTRAS check_swap"
+ fi
+ 
+--- nagiosplug-1.3-beta1/plugins/check_swap.c   Wed Feb 27 22:42:59 2002
++++ nagiosplug-1.3-beta1.new/plugins/check_swap.c       Mon Oct 14 12:00:18 2002
+@@ -64,6 +64,7 @@
+        fclose (fp);
+ #else
+ #ifdef HAVE_SWAP
++
+        child_process = spopen (SWAP_COMMAND);
+        if (child_process == NULL) {
+                printf ("Could not open pipe: %s\n", SWAP_COMMAND);
+@@ -92,17 +93,19 @@
+ 
+        status = ssprintf (status, "%s", "Swap used:");
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               sscanf (input_buffer, SWAP_FORMAT, &total_swap, &free_swap);
+-               used_swap = total_swap - free_swap;
+-               percent_used = 100 * ((float) used_swap) / ((float) total_swap);
+-               status = ssprintf
+-                       (status,
+-                        "%s %2d%% (%d bytes out of %d)",
+-                        status, percent_used, used_swap, total_swap);
+-               if (percent_used >= crit_percent || free_swap <= crit_size)
+-                       result = STATE_CRITICAL;
+-               else if (percent_used >= warn_percent || free_swap <= warn_size)
+-                       result = STATE_WARNING;
++               if (strstr (input_buffer, SWAP_LINE)) {
++                       sscanf (input_buffer, SWAP_FORMAT, &total_swap, &free_swap);
++                       used_swap = total_swap - free_swap;
++                       percent_used = 100 * ((float) used_swap) / ((float) total_swap);
++                       status = ssprintf
++                               (status,
++                                "%s %2d%% (%d bytes out of %d)",
++                                status, percent_used, used_swap, total_swap);
++                       if (percent_used >= crit_percent || free_swap <= crit_size)
++                               result = STATE_CRITICAL;
++                       else if (percent_used >= warn_percent || free_swap <= warn_size)
++                               result = STATE_WARNING;
++               }
+        }
+ 
+        /* If we get anything on STDERR, at least set warning */
+--- nagiosplug-1.3-beta1/plugins/config.h.in    Thu Jun 13 07:02:16 2002
++++ nagiosplug-1.3-beta1.new/plugins/config.h.in        Mon Oct 14 12:10:37 2002
+@@ -1,54 +1,4 @@
+-/* plugins/config.h.in.  Generated automatically from configure.in by autoheader.  */
+-
+-/* Define to empty if the keyword does not work.  */
+-#undef const
+-
+-/* Define for DGUX with <sys/dg_sys_info.h>.  */
+-#undef DGUX
+-
+-/* Define if the `getloadavg' function needs to be run setuid or setgid.  */
+-#undef GETLOADAVG_PRIVILEGED
+-
+-/* Define if your system has its own `getloadavg' function.  */
+-#undef HAVE_GETLOADAVG
+-
+-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+-#undef HAVE_SYS_WAIT_H
+-
+-/* Define if your struct nlist has an n_un member.  */
+-#undef NLIST_NAME_UNION
+-
+-/* Define if you have <nlist.h>.  */
+-#undef NLIST_STRUCT
+-
+-/* Define to `int' if <sys/types.h> doesn't define.  */
+-#undef pid_t
+-
+-/* Define as the return type of signal handlers (int or void).  */
+-#undef RETSIGTYPE
+-
+-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+-#undef size_t
+-
+-/* Define if you have the ANSI C header files.  */
+-#undef STDC_HEADERS
+-
+-/* Define on System V Release 4.  */
+-#undef SVR4
+-
+-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+-#undef TIME_WITH_SYS_TIME
+-
+-/* Define if your <sys/time.h> declares struct tm.  */
+-#undef TM_IN_SYS_TIME
+-
+-/* Define for Encore UMAX.  */
+-#undef UMAX
+-
+-/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
+-   instead of <sys/cpustats.h>.  */
+-#undef UMAX4_3
+-
++/* plugins/config.h.in.  Generated from configure.in by autoheader.  */
+ #undef CGIURL
+ #undef DF_COMMAND
+ #undef HAVE_GETOPT_H
+@@ -86,6 +36,7 @@
+ #undef SSH_COMMAND
+ #undef SWAP_COMMAND
+ #undef SWAP_FORMAT
++#undef SWAP_LINE
+ #undef USE_PS_VARS
+ #undef VSZ_COMMAND
+ #undef VSZ_FORMAT
+@@ -93,137 +44,230 @@
+ #undef PACKAGE
+ #undef VERSION
+ 
+-/* Define if you have the getloadavg function.  */
+-#undef HAVE_GETLOADAVG
++/* Define to 1 if using `getloadavg.c'. */
++#undef C_GETLOADAVG
+ 
+-/* Define if you have the getopt_long_only function.  */
+-#undef HAVE_GETOPT_LONG_ONLY
++/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
++#undef DGUX
+ 
+-/* Define if you have the select function.  */
+-#undef HAVE_SELECT
++/* Define to 1 if the `getloadavg' function needs to be run setuid or setgid.
++   */
++#undef GETLOADAVG_PRIVILEGED
+ 
+-/* Define if you have the socket function.  */
+-#undef HAVE_SOCKET
++/* Define to 1 if you have the <crypto.h> header file. */
++#undef HAVE_CRYPTO_H
+ 
+-/* Define if you have the strdup function.  */
+-#undef HAVE_STRDUP
++/* Define to 1 if you have the <errno.h> header file. */
++#undef HAVE_ERRNO_H
+ 
+-/* Define if you have the strstr function.  */
+-#undef HAVE_STRSTR
++/* Define to 1 if you have the <err.h> header file. */
++#undef HAVE_ERR_H
+ 
+-/* Define if you have the strtod function.  */
+-#undef HAVE_STRTOD
++/* Define to 1 if you have the `getloadavg' function. */
++#undef HAVE_GETLOADAVG
+ 
+-/* Define if you have the strtol function.  */
+-#undef HAVE_STRTOL
++/* Define to 1 if you have the `getopt_long_only' function. */
++#undef HAVE_GETOPT_LONG_ONLY
+ 
+-/* Define if you have the strtoul function.  */
+-#undef HAVE_STRTOUL
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
+ 
+-/* Define if you have the <crypto.h> header file.  */
+-#undef HAVE_CRYPTO_H
++/* Define to 1 if you have the `crypt' library (-lcrypt). */
++#undef HAVE_LIBCRYPT
+ 
+-/* Define if you have the <err.h> header file.  */
+-#undef HAVE_ERR_H
++/* Define to 1 if you have the `crypto' library (-lcrypto). */
++#undef HAVE_LIBCRYPTO
+ 
+-/* Define if you have the <errno.h> header file.  */
+-#undef HAVE_ERRNO_H
++/* Define to 1 if you have the `dgc' library (-ldgc). */
++#undef HAVE_LIBDGC
++
++/* Define to 1 if you have the `kstat' library (-lkstat). */
++#undef HAVE_LIBKSTAT
++
++/* Define to 1 if you have the `ldap' library (-lldap). */
++#undef HAVE_LIBLDAP
++
++/* Define to 1 if you have the `pq' library (-lpq). */
++#undef HAVE_LIBPQ
+ 
+-/* Define if you have the <libpq-fe.h> header file.  */
++/* Define to 1 if you have the <libpq-fe.h> header file. */
+ #undef HAVE_LIBPQ_FE_H
+ 
+-/* Define if you have the <mach/mach.h> header file.  */
++/* Define to 1 if you have the `radiusclient' library (-lradiusclient). */
++#undef HAVE_LIBRADIUSCLIENT
++
++/* Define to 1 if you have the <mach/mach.h> header file. */
+ #undef HAVE_MACH_MACH_H
+ 
+-/* Define if you have the <mysql/errmsg.h> header file.  */
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the <mysql/errmsg.h> header file. */
+ #undef HAVE_MYSQL_ERRMSG_H
+ 
+-/* Define if you have the <mysql/mysql.h> header file.  */
++/* Define to 1 if you have the <mysql/mysql.h> header file. */
+ #undef HAVE_MYSQL_MYSQL_H
+ 
+-/* Define if you have the <openssl/crypto.h> header file.  */
++/* Define to 1 if you have the <nlist.h> header file. */
++#undef HAVE_NLIST_H
++
++/* Define to 1 if you have the <openssl/crypto.h> header file. */
+ #undef HAVE_OPENSSL_CRYPTO_H
+ 
+-/* Define if you have the <openssl/err.h> header file.  */
++/* Define to 1 if you have the <openssl/err.h> header file. */
+ #undef HAVE_OPENSSL_ERR_H
+ 
+-/* Define if you have the <openssl/pem.h> header file.  */
++/* Define to 1 if you have the <openssl/pem.h> header file. */
+ #undef HAVE_OPENSSL_PEM_H
+ 
+-/* Define if you have the <openssl/rsa.h> header file.  */
++/* Define to 1 if you have the <openssl/rsa.h> header file. */
+ #undef HAVE_OPENSSL_RSA_H
+ 
+-/* Define if you have the <openssl/ssl.h> header file.  */
++/* Define to 1 if you have the <openssl/ssl.h> header file. */
+ #undef HAVE_OPENSSL_SSL_H
+ 
+-/* Define if you have the <openssl/x509.h> header file.  */
++/* Define to 1 if you have the <openssl/x509.h> header file. */
+ #undef HAVE_OPENSSL_X509_H
+ 
+-/* Define if you have the <pem.h> header file.  */
++/* Define to 1 if you have the <pem.h> header file. */
+ #undef HAVE_PEM_H
+ 
+-/* Define if you have the <pgsql/libpq-fe.h> header file.  */
++/* Define to 1 if you have the <pgsql/libpq-fe.h> header file. */
+ #undef HAVE_PGSQL_LIBPQ_FE_H
+ 
+-/* Define if you have the <postgresql/libpq-fe.h> header file.  */
++/* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
+ #undef HAVE_POSTGRESQL_LIBPQ_FE_H
+ 
+-/* Define if you have the <regex.h> header file.  */
++/* Define to 1 if you have the `pstat_getdynamic' function. */
++#undef HAVE_PSTAT_GETDYNAMIC
++
++/* Define to 1 if you have the <regex.h> header file. */
+ #undef HAVE_REGEX_H
+ 
+-/* Define if you have the <rsa.h> header file.  */
++/* Define to 1 if you have the <rsa.h> header file. */
+ #undef HAVE_RSA_H
+ 
+-/* Define if you have the <signal.h> header file.  */
++/* Define to 1 if you have the `select' function. */
++#undef HAVE_SELECT
++
++/* Define to 1 if you have the `setlocale' function. */
++#undef HAVE_SETLOCALE
++
++/* Define to 1 if you have the <signal.h> header file. */
+ #undef HAVE_SIGNAL_H
+ 
+-/* Define if you have the <ssl.h> header file.  */
++/* Define to 1 if you have the `socket' function. */
++#undef HAVE_SOCKET
++
++/* Define to 1 if you have the <ssl.h> header file. */
+ #undef HAVE_SSL_H
+ 
+-/* Define if you have the <string.h> header file.  */
+-#undef HAVE_STRING_H
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
+ 
+-/* Define if you have the <strings.h> header file.  */
++/* Define to 1 if you have the `strdup' function. */
++#undef HAVE_STRDUP
++
++/* Define to 1 if you have the <strings.h> header file. */
+ #undef HAVE_STRINGS_H
+ 
+-/* Define if you have the <sys/loadavg.h> header file.  */
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the `strstr' function. */
++#undef HAVE_STRSTR
++
++/* Define to 1 if you have the `strtod' function. */
++#undef HAVE_STRTOD
++
++/* Define to 1 if you have the `strtol' function. */
++#undef HAVE_STRTOL
++
++/* Define to 1 if you have the `strtoul' function. */
++#undef HAVE_STRTOUL
++
++/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
++#undef HAVE_STRUCT_NLIST_N_UN_N_NAME
++
++/* Define to 1 if you have the <syslog.h> header file. */
++#undef HAVE_SYSLOG_H
++
++/* Define to 1 if you have the <sys/loadavg.h> header file. */
+ #undef HAVE_SYS_LOADAVG_H
+ 
+-/* Define if you have the <sys/socket.h> header file.  */
++/* Define to 1 if you have the <sys/socket.h> header file. */
+ #undef HAVE_SYS_SOCKET_H
+ 
+-/* Define if you have the <sys/time.h> header file.  */
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/time.h> header file. */
+ #undef HAVE_SYS_TIME_H
+ 
+-/* Define if you have the <sys/types.h> header file.  */
++/* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+ 
+-/* Define if you have the <syslog.h> header file.  */
+-#undef HAVE_SYSLOG_H
++/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
++#undef HAVE_SYS_WAIT_H
+ 
+-/* Define if you have the <uio.h> header file.  */
++/* Define to 1 if you have the <uio.h> header file. */
+ #undef HAVE_UIO_H
+ 
+-/* Define if you have the <unistd.h> header file.  */
++/* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
+-/* Define if you have the <x509.h> header file.  */
++/* Define to 1 if you have the <x509.h> header file. */
+ #undef HAVE_X509_H
+ 
+-/* Define if you have the crypt library (-lcrypt).  */
+-#undef HAVE_LIBCRYPT
++/* Define to 1 if your `struct nlist' has an `n_un' member. Obsolete, depend
++   on `HAVE_STRUCT_NLIST_N_UN_N_NAME */
++#undef NLIST_NAME_UNION
+ 
+-/* Define if you have the crypto library (-lcrypto).  */
+-#undef HAVE_LIBCRYPTO
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
+ 
+-/* Define if you have the dgc library (-ldgc).  */
+-#undef HAVE_LIBDGC
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
+ 
+-/* Define if you have the ldap library (-lldap).  */
+-#undef HAVE_LIBLDAP
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
+ 
+-/* Define if you have the pq library (-lpq).  */
+-#undef HAVE_LIBPQ
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
+ 
+-/* Define if you have the radiusclient library (-lradiusclient).  */
+-#undef HAVE_LIBRADIUSCLIENT
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define as the return type of signal handlers (`int' or `void'). */
++#undef RETSIGTYPE
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Define to 1 on System V Release 4. */
++#undef SVR4
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#undef TIME_WITH_SYS_TIME
++
++/* Define to 1 if your <sys/time.h> declares `struct tm'. */
++#undef TM_IN_SYS_TIME
++
++/* Define to 1 for Encore UMAX. */
++#undef UMAX
++
++/* Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h> instead of
++   <sys/cpustats.h>. */
++#undef UMAX4_3
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
++
++/* Define to `int' if <sys/types.h> does not define. */
++#undef pid_t
++
++/* Define to `unsigned' if <sys/types.h> does not define. */
++#undef size_t
+--- nagiosplug-1.3-beta1/plugins/snprintf.c     Wed Feb 27 22:42:59 2002
++++ nagiosplug-1.3-beta1.new/plugins/snprintf.c Mon Oct 14 12:15:27 2002
+@@ -34,7 +34,7 @@
+ 
+ /* Some changes made by bbraun@synack.net for use with xinetd */
+ 
+-#if !defined(HAVE_SNPRINTF)
++#if defined(HAVE_SNPRINTF)
+ 
+ /* Extracted from sendmail 8.8.5 */
+ #ifndef lint
diff --git a/web/attachments/331884-http_compliance.patch b/web/attachments/331884-http_compliance.patch
new file mode 100644
index 0000000..b2e3e44
--- /dev/null
+++ b/web/attachments/331884-http_compliance.patch
@@ -0,0 +1,19 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 79f6adf..a66ee9a 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -802,11 +802,11 @@ check_http (void)
+ 
+   asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "H
+ 
+-  /* tell HTTP/1.1 servers not to keep the connection alive */
+-  asprintf (&buf, "%sConnection: close\r\n", buf);
+-
+   /* optionally send the host header info */
+   if (host_name) {
++    /* tell HTTP/1.1 servers not to keep the connection alive */
++    asprintf (&buf, "%sConnection: close\r\n", buf);
++
+     /*
+      * Specify the port only if we're using a non-default port (see RFC 2616,
+      * 14.23).  Some server applications/configurations cause trouble if the
diff --git a/web/attachments/332433-check_linux_raid__lenny_md10+_mn.diff b/web/attachments/332433-check_linux_raid__lenny_md10+_mn.diff
new file mode 100644
index 0000000..db7b920
--- /dev/null
+++ b/web/attachments/332433-check_linux_raid__lenny_md10+_mn.diff
@@ -0,0 +1,11 @@
+--- /usr/lib/nagios/plugins/check_linux_raid.org        2009-06-25 19:06:27.000000000 +0200
++++ /usr/lib/nagios/plugins/check_linux_raid    2009-06-25 19:16:45.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ my $nextdev;
+ if(defined $ARGV[0]) { $nextdev = shift; }
+-else { $nextdev = "md[0-9]"; }
++else { $nextdev = "md[0-9]+"; }
+ 
+ my $code = "UNKNOWN";
+ my $msg = "";
diff --git a/web/attachments/332975-check_asterisk.pl.diff b/web/attachments/332975-check_asterisk.pl.diff
new file mode 100644
index 0000000..3bc7584
--- /dev/null
+++ b/web/attachments/332975-check_asterisk.pl.diff
@@ -0,0 +1,44 @@
+--- check_asterisk.orig.pl      2009-06-25 16:58:44.000000000 -0500
++++ check_asterisk.pl   2009-06-25 16:55:44.000000000 -0500
+@@ -16,6 +16,7 @@
+        $runmode,
+        $key,
+        $s,
++       $p,
+ );
+ my $stop = 0;
+ my $mgr_port = 5038;
+@@ -178,6 +179,23 @@
+        undef($s);
+        foreach $key (keys %channels) {
+                $s .= " " . $key . " (" . $channels{$key} . ")";
++
++               # Performance
++               if (defined($p)) {
++                       $p .= " ";
++               }
++               $p .= $key . "=" . $channels{$key};
++               if (defined($warnval{$key})) {
++                       $p .= ";" . $warnval{$key};
++               } else {
++                       $p .= ";";
++               }
++               if (defined($critval{$key})) {
++                       $p .= ";" . $critval{$key};
++               } else {
++                       $p .= ";";
++               }
++               $p .= ";0";
+        }
+ 
+        foreach $key (keys %critval) {
+@@ -214,6 +232,8 @@
+        }
+ 
+        print $cause;
++       print "|";
++       print $p;
+ 
+        print "\n" if ($verbose);
+ 
+
diff --git a/web/attachments/338026-0001-Attempt-at-detecting-64bit-compilation-flags-between.patch b/web/attachments/338026-0001-Attempt-at-detecting-64bit-compilation-flags-between.patch
new file mode 100644
index 0000000..f31f482
--- /dev/null
+++ b/web/attachments/338026-0001-Attempt-at-detecting-64bit-compilation-flags-between.patch
@@ -0,0 +1,91 @@
+From 182964c5f6ca39f42f5225bc76f48a185eda04b8 Mon Sep 17 00:00:00 2001
+From: Thomas Guyot-Sionnest <dermoth@aei.ca>
+Date: Wed, 5 Aug 2009 01:32:02 -0400
+Subject: [PATCH] Attempt at detecting 64bit compilation flags between gcc, old, and new versions of sun cc
+
+Gcc accepts -m64, just as newer version of Suncc.
+Older Suncc required -xarch=v9 (SPARC) or -xarch=amd64 (x86-64) to generate 64bit code.
+---
+ configure.in |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 58 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 68ac0a0..197b88e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -577,14 +577,70 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
+         ac_cv_ps_cols=9
+         AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris])
+        if test `isainfo -b` = 64 ; then
+-               PST3CFLAGS="-m64"
+-               AC_SUBST(PST3CFLAGS)
++               pst3_use_64bit=1
+                AC_MSG_NOTICE([using 64bit pst3])       
+        else
+                AC_MSG_NOTICE([using 32bit pst3])
+        fi
+         EXTRAS_ROOT="$EXTRAS_ROOT pst3"
+ 
++       if test "$pst3_use_64bit" = 1; then
++               dnl Test if we can actually compile code in 64bit
++               old_cflags=$CFLAGS
++               CFLAGS="$CFLAGS -m64"
++               pst3_64bit_working=0
++               AC_RUN_IFELSE(
++                       [AC_LANG_PROGRAM([], [
++return sizeof(void*) == 8 ? 0 : 1;
++                       ])
++               ],[
++                       PST3CFLAGS="-m64"
++                       AC_SUBST(PST3CFLAGS)
++                       pst3_64bit_working=1
++               ],[
++                       pst3_64bit_working=0
++                       AC_MSG_NOTICE([compiler do not like -m64])
++               ])
++               CFLAGS=$old_cflags
++               if test "$pst3_64bit_working" = 0; then
++                       old_cflags=$CFLAGS
++                       CFLAGS="$CFLAGS -xarch=v9"
++                       AC_RUN_IFELSE(
++                               [AC_LANG_PROGRAM([], [
++return sizeof(void*) == 8 ? 0 : 1;
++                               ])
++                       ],[
++                               PST3CFLAGS="-xarch=v9"
++                               AC_SUBST(PST3CFLAGS)
++                               pst3_64bit_working=1
++                       ],[
++                               pst3_64bit_working=0
++                               AC_MSG_NOTICE([compiler do not like -xarch=v9])
++                       ])
++                       CFLAGS=$old_cflags
++               fi
++               if test "$pst3_64bit_working" = 0; then
++                       old_cflags=$CFLAGS
++                       CFLAGS="$CFLAGS -xarch=amd64"
++                       AC_RUN_IFELSE(
++                               [AC_LANG_PROGRAM([], [
++return sizeof(void*) == 8 ? 0 : 1;
++                               ])
++                       ],[
++                               PST3CFLAGS="-xarch=amd64"
++                               AC_SUBST(PST3CFLAGS)
++                               pst3_64bit_working=1
++                       ],[
++                               pst3_64bit_working=0
++                               AC_MSG_NOTICE([compiler do not like -xarch=amd64])
++                       ])
++                       CFLAGS=$old_cflags
++               fi
++               if test "$pst3_64bit_working" = 0; then
++                       AC_MSG_ERROR([Don't know how to build a 64-bit object.])
++               fi
++       fi
++
+ dnl Removing this for the moment - Ton
+ dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation
+ dnl Limitation that command name is not available
+-- 
+1.5.5
+
diff --git a/web/attachments/338743-check_http.revert-SNI.patch b/web/attachments/338743-check_http.revert-SNI.patch
new file mode 100644
index 0000000..d19f2f1
--- /dev/null
+++ b/web/attachments/338743-check_http.revert-SNI.patch
@@ -0,0 +1,63 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 0310203..79f6adf 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -790,7 +790,7 @@ check_http (void)
+     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+ #ifdef HAVE_SSL
+   if (use_ssl == TRUE) {
+-    np_net_ssl_init(sd);
++    np_net_ssl_init_with_hostname(sd, host_name);
+     if (check_cert == TRUE) {
+       result = np_net_ssl_check_cert(days_till_exp);
+       np_net_ssl_cleanup();
+diff --git a/plugins/netutils.h b/plugins/netutils.h
+index b479b74..572a3ae 100644
+--- a/plugins/netutils.h
++++ b/plugins/netutils.h
+@@ -99,6 +99,7 @@ extern int address_family;
+ #ifdef HAVE_SSL
+ /* maybe this could be merged with the above np_net_connect, via some flags */
+ int np_net_ssl_init(int sd);
++int np_net_ssl_init_with_hostname(int sd, char *host_name);
+ void np_net_ssl_cleanup();
+ int np_net_ssl_write(const void *buf, int num);
+ int np_net_ssl_read(void *buf, int num);
+diff --git a/plugins/sslutils.c b/plugins/sslutils.c
+index 1d4ef94..aa571b6 100644
+--- a/plugins/sslutils.c
++++ b/plugins/sslutils.c
+@@ -35,7 +35,11 @@ static SSL_CTX *c=NULL;
+ static SSL *s=NULL;
+ static int initialized=0;
+ 
+-int np_net_ssl_init (int sd){
++int np_net_ssl_init (int sd) {
++    return np_net_ssl_init_with_hostname(sd, NULL);
++}
++
++int np_net_ssl_init_with_hostname (int sd, char *host_name) {
+                if (!initialized) {
+                        /* Initialize SSL context */
+                        SSLeay_add_ssl_algorithms ();
+@@ -48,6 +52,10 @@ int np_net_ssl_init (int sd){
+                                return STATE_CRITICAL;
+                }
+                if ((s = SSL_new (c)) != NULL){
++#ifdef SSL_set_tlsext_host_name
++                               if (host_name != NULL)
++                                       SSL_set_tlsext_host_name(s, host_name);
++#endif
+                                SSL_set_fd (s, sd);
+                                if (SSL_connect(s) == 1){
+                                                return OK;
+@@ -65,6 +73,9 @@ int np_net_ssl_init (int sd){
+ 
+ void np_net_ssl_cleanup (){
+                if(s){
++#ifdef SSL_set_tlsext_host_name
++                               SSL_set_tlsext_host_name(s, NULL);
++#endif
+                                SSL_shutdown (s);
+                                SSL_free (s);
+                                if(c) {
diff --git a/web/attachments/339420-check_procs_openvz.patch b/web/attachments/339420-check_procs_openvz.patch
new file mode 100644
index 0000000..2a2a28c
--- /dev/null
+++ b/web/attachments/339420-check_procs_openvz.patch
@@ -0,0 +1,41 @@
+diff --git a/plugins/check_procs.c b/plugins/check_procs.c
+index 937c0ad..d1d5378 100644
+--- a/plugins/check_procs.c
++++ b/plugins/check_procs.c
+@@ -203,6 +203,9 @@ main (int argc, char **argv)
+ 
+                        /* Ignore self */
+                        if (mypid == procpid) continue;
++                       
++                       /* Ignore child containers if we're on an OpenVZ hardware node */
++                       if (read_openvz_id(1) == 0 && read_openvz_id(procpid) != 0) continue;
+ 
+                        if ((options & STAT) && (strstr (statopts, procstat)))
+                                resultsum |= STAT;
+@@ -666,6 +669,26 @@ convert_to_seconds(char *etime) {
+        return total;
+ }
+ 
++/* Returns the OpenVZ enviroment ID of the specified process, or -1 if we're not on OpenVZ */
++int
++read_openvz_id(int procid) {
++       FILE *file;
++       char *filename = strdup("");
++       char line[64];
++       int result = -1;
++       
++       asprintf(&filename, "/proc/%d/status", procid);
++       
++       if ((file = fopen(filename, "r")) == NULL) return -1;
++       
++       while (fgets(line, sizeof(line), file) != NULL) {
++               sscanf(line, "envID:\t%d", &result);
++       }
++       
++       fclose(file);
++       return result;
++}
++
+ 
+ void
+ print_help (void)
diff --git a/web/attachments/34095-check_http.c.patch b/web/attachments/34095-check_http.c.patch
new file mode 100644
index 0000000..0bf48b6
--- /dev/null
+++ b/web/attachments/34095-check_http.c.patch
@@ -0,0 +1,140 @@
+--- plutins/check_http.c        2002-10-28 18:02:11.000000000 +0100
++++ plugins/check_http.c        2002-10-28 19:42:30.000000000 +0100
+@@ -44,7 +44,7 @@
+ \(-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
+             [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+             [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+-            [-s string] [-r <regex> | -R <case-insensitive regex>]\n\
++            [-s string] [-r <regex> | -R <case-insensitive regex>] [-x]\n\
+             [-P string]"
+ 
+ #define LONGOPTIONS "\
+@@ -71,6 +71,8 @@
+    Seconds before connection times out (default: %d)\n\
+  -a, --authorization=AUTH_PAIR\n\
+    Username:password on sites with basic authentication\n\
++ -x, --reverse\n\
++   Reverse the result of -r|-R|-s (like grep -v)\n\
+  -L, --link=URL\n\
+    Wrap output in HTML link (obsoleted by urlize)\n\
+  -f, --onredirect=<ok|warning|critical|follow>\n\
+@@ -190,6 +192,7 @@
+ int server_expect_yn = 0;
+ char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+ char string_expect[MAX_INPUT_BUFFER] = "";
++int found_reverse = FALSE;     /* grep -v */
+ double warning_time = 0;
+ int check_warning_time = FALSE;
+ double critical_time = 0;
+@@ -287,6 +290,7 @@
+                {"regex", required_argument, 0, 'r'},
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
++               {"reverse", no_argument, 0, 'x'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
+                {0, 0, 0, 0}
+@@ -309,7 +313,7 @@
+                        strcpy (argv[c], "-n");
+        }
+ 
+-#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nLS"
++#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nLSx"
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+@@ -442,6 +446,9 @@
+                        usage ("check_http: call for regex which was not a compiled option\n");
+ #endif
+                        break;
++               case 'x':       /* grep -v */
++                       found_reverse = TRUE;
++                       break;
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
+@@ -849,31 +856,69 @@
+ 
+        if (strlen (string_expect)) {
+                if (strstr (page, string_expect)) {
+-                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
+-                               status_line, elapsed_time,
+-                               timestamp, (display_html ? "</A>" : ""), elapsed_time);
+-                       exit (STATE_OK);
++                       if (found_reverse) { /* grep -v */
++                               printf ("HTTP CRITICAL: string found%s|time=%7.3f\n",
++                                       (display_html ? "</A>" : ""),
++                                       elapsed_time);
++                               exit (STATE_CRITICAL) ;
++                       } else {
++                               printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++                                       status_line, elapsed_time,
++                                       timestamp,
++                                       (display_html ? "</A>" : ""),
++                                       elapsed_time);
++                               exit (STATE_OK);
++                       }
+                }
+-               else {
+-                       printf ("HTTP CRITICAL: string not found%s|time=%7.3f\n",
+-                               (display_html ? "</A>" : ""), elapsed_time);
+-                       exit (STATE_CRITICAL);
++               else {          /* not found */
++                       if (found_reverse) { /* grep -v */ 
++                               printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++                                       status_line, elapsed_time,
++                                       timestamp, 
++                                       (display_html ? "</A>" : ""),
++                                       elapsed_time);
++                               exit (STATE_OK) ;
++                       } else {
++                               printf ("HTTP CRITICAL: string not found%s|time=%7.3f\n",
++                                       (display_html ? "</A>" : ""), elapsed_time);
++                               exit (STATE_CRITICAL);
++                       }
+                }
+        }
+ #ifdef HAVE_REGEX_H
+        if (strlen (regexp)) {
+                errcode = regexec (&preg, page, REGS, pmatch, 0);
+                if (errcode == 0) {
+-                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
+-                               status_line, elapsed_time,
+-                               timestamp, (display_html ? "</A>" : ""), elapsed_time);
+-                       exit (STATE_OK);
++                       if (found_reverse) { /* grep -v */
++                               printf ("HTTP CRITICAL: pattern found%s|time=%7.3f\n",
++                                       (display_html ? "</A>" : ""),
++                                       elapsed_time);
++                               exit (STATE_CRITICAL);
++                       } else {
++                               printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++                                       status_line, elapsed_time,
++                                       timestamp, 
++                                       (display_html ? "</A>" : ""),
++                                       elapsed_time);
++                               exit (STATE_OK);
++                       }
+                }
+                else {
+                        if (errcode == REG_NOMATCH) {
+-                               printf ("HTTP CRITICAL: pattern not found%s|time=%7.3f\n",
+-                                       (display_html ? "</A>" : ""), elapsed_time);
+-                               exit (STATE_CRITICAL);
++                               if (found_reverse) { /* grep -v */
++                                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++                                               status_line, elapsed_time,
++                                               timestamp, 
++                                               (display_html ? "</A>" : ""),
++                                               elapsed_time);
++                                       exit (STATE_OK);
++
++                               } else {
++                                       printf ("HTTP CRITICAL: pattern not found%s|time=%7.3f\n",
++                                               (display_html ? "</A>" : ""),
++                                               elapsed_time);
++                                       exit (STATE_CRITICAL);
++                               }
+                        }
+                        else {
+                                regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
diff --git a/web/attachments/343293-nagios-plugins-ping.patch b/web/attachments/343293-nagios-plugins-ping.patch
new file mode 100644
index 0000000..232d97f
--- /dev/null
+++ b/web/attachments/343293-nagios-plugins-ping.patch
@@ -0,0 +1,33 @@
+--- nagios-plugins-1.4.13/plugins/check_ping.c.org      2009-09-17 08:56:15.043692330 +0200
++++ nagios-plugins-1.4.13/plugins/check_ping.c  2009-09-17 09:04:41.830352692 +0200
+@@ -519,12 +519,13 @@
+ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
+ {
+        if (strstr (buf, "Network is unreachable") ||
+-               strstr (buf, "Destination Net Unreachable")
++               strstr (buf, "Destination Net Unreachable") ||
++               strstr (buf, "No route")
+                )
+                die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)"), addr);
+-       else if (strstr (buf, "Destination Host Unreachable"))
++       else if (strstr (buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable"))
+                die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)"), addr);
+-       else if (strstr (buf, "Destination Port Unreachable"))
++       else if (strstr (buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable"))
+                die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)"), addr);
+        else if (strstr (buf, "Destination Protocol Unreachable"))
+                die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"), addr);
+@@ -532,11 +533,11 @@
+                die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)"), addr);
+        else if (strstr (buf, "Destination Host Prohibited"))
+                die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)"), addr);
+-       else if (strstr (buf, "Packet filtered"))
++       else if (strstr (buf, "Packet filtered") || strstr(buf, "Administratively prohibited"))
+                die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)"), addr);
+        else if (strstr (buf, "unknown host" ))
+                die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
+-       else if (strstr (buf, "Time to live exceeded"))
++       else if (strstr (buf, "Time to live exceeded") || strstr(buf, "Time exceeded"))
+                die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr);
+ 
+        if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
diff --git a/web/attachments/343854-check_http.patch b/web/attachments/343854-check_http.patch
new file mode 100644
index 0000000..d07b5d0
--- /dev/null
+++ b/web/attachments/343854-check_http.patch
@@ -0,0 +1,69 @@
+--- check_http.c.orig   2009-09-21 17:39:44.000000000 -0700
++++ check_http.c        2009-09-21 17:32:14.000000000 -0700
+@@ -105,6 +105,7 @@
+ double critical_time = 0;
+ int check_critical_time = FALSE;
+ char user_auth[MAX_INPUT_BUFFER] = "";
++char proxy_auth[MAX_INPUT_BUFFER] = "";
+ int display_html = FALSE;
+ char **http_opt_headers;
+ int http_opt_headers_count = 0;
+@@ -192,6 +193,7 @@
+     {"url", required_argument, 0, 'u'},
+     {"port", required_argument, 0, 'p'},
+     {"authorization", required_argument, 0, 'a'},
++    {"proxy_authorization", required_argument, 0, 'b'},
+     {"string", required_argument, 0, 's'},
+     {"expect", required_argument, 0, 'e'},
+     {"regex", required_argument, 0, 'r'},
+@@ -229,7 +231,7 @@
+   }
+ 
+   while (1) {
+-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
++    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:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -350,6 +352,10 @@
+       strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
+       user_auth[MAX_INPUT_BUFFER - 1] = 0;
+       break;
++    case 'b': /* proxy-authorization info */
++      strncpy (proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
++      proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
++      break;
+     case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */
+       if (! http_post_data)
+         http_post_data = strdup (optarg);
+@@ -836,6 +842,12 @@
+     asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
+   }
+ 
++  /* optionally send the proxy authentication info */
++  if (strlen(proxy_auth)) {
++    base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth);
++    asprintf (&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth);
++  }
++
+   /* either send http POST data (any data, not only POST)*/
+   if (http_post_data) {
+     if (http_content_type) {
+@@ -1346,6 +1358,8 @@
+ 
+   printf (" %s\n", "-a, --authorization=AUTH_PAIR");
+   printf ("    %s\n", _("Username:password on sites with basic authentication"));
++  printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
++  printf ("    %s\n", _("Username:password on proxy-servers with basic authentication"));
+   printf (" %s\n", "-A, --useragent=STRING");
+   printf ("    %s\n", _("String to be sent in http header as \"User Agent\""));
+   printf (" %s\n", "-k, --header=STRING");
+@@ -1407,7 +1421,7 @@
+   printf (_("Usage:"));
+   printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
+   printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n");
+-  printf ("       [-a auth] [-f <ok | warn | critcal | follow | sticky | stickyport>]\n");
++  printf ("       [-a auth] [-b proxy_auth] [-f <ok | warn | critcal | follow | sticky | stickyport>]\n");
+   printf ("       [-e <expect>] [-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] [-C <age>] [-T <content-type>] [-j method]\n");
diff --git a/web/attachments/344003-0001-Sync-with-the-latest-Gnulib-code-d34f1e7.patch.gz b/web/attachments/344003-0001-Sync-with-the-latest-Gnulib-code-d34f1e7.patch.gz
new file mode 100644
index 0000000..4f5b016
--- /dev/null
+++ b/web/attachments/344003-0001-Sync-with-the-latest-Gnulib-code-d34f1e7.patch.gz
diff --git a/web/attachments/344028-check_ntp_time.c.diff b/web/attachments/344028-check_ntp_time.c.diff
new file mode 100644
index 0000000..bb07962
--- /dev/null
+++ b/web/attachments/344028-check_ntp_time.c.diff
@@ -0,0 +1,65 @@
+Index: check_ntp_time.c
+===================================================================
+--- check_ntp_time.c    (revision 2244)
++++ check_ntp_time.c    (working copy)
+@@ -48,6 +48,7 @@
+ static int quiet=0;
+ static char *owarn="60";
+ static char *ocrit="120";
++static int time_offset=0;
+ 
+ int process_arguments (int, char **);
+ thresholds *offset_thresholds = NULL;
+@@ -394,7 +395,7 @@
+                                gettimeofday(&recv_time, NULL);
+                                DBG(print_ntp_message(&req[i]));
+                                respnum=servers[i].num_responses++;
+-                               servers[i].offset[respnum]=calc_offset(&req[i], &recv_time);
++                               servers[i].offset[respnum]=calc_offset(&req[i], &recv_time)+time_offset;
+                                if(verbose) {
+                                        printf("offset %.10g\n", servers[i].offset[respnum]);
+                                }
+@@ -449,6 +450,7 @@
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"quiet", no_argument, 0, 'q'},
++               {"time-offset", optional_argument, 0, 'o'},
+                {"warning", required_argument, 0, 'w'},
+                {"critical", required_argument, 0, 'c'},
+                {"timeout", required_argument, 0, 't'},
+@@ -462,7 +464,7 @@
+                usage ("\n");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "Vhv46qw:c:t:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "Vhv46qw:c:t:H:p:o:", longopts, &option);
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+ 
+@@ -498,6 +500,9 @@
+                case 't':
+                        socket_timeout=atoi(optarg);
+                        break;
++               case 'o':
++                       time_offset=atoi(optarg);
++                        break;
+                case '4':
+                        address_family = AF_INET;
+                        break;
+@@ -609,6 +614,8 @@
+        printf ("    %s\n", _("Offset to result in warning status (seconds)"));
+        printf (" %s\n", "-c, --critical=THRESHOLD");
+        printf ("    %s\n", _("Offset to result in critical status (seconds)"));
++       printf (" %s\n", "-o, --time_offset=");
++       printf ("    %s\n", _("Offset of the ntp server relative to local server(seconds)"));
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (_(UT_VERBOSE));
+ 
+@@ -639,6 +646,6 @@
+ print_usage(void)
+ {
+        printf (_("Usage:"));
+-       printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
++       printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose] [-o <time offset>]\n", progname);
+ }
+ 
diff --git a/web/attachments/344042-39_check_ircd_fix_epn.dpatch b/web/attachments/344042-39_check_ircd_fix_epn.dpatch
new file mode 100644
index 0000000..7956a4d
--- /dev/null
+++ b/web/attachments/344042-39_check_ircd_fix_epn.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 39_check_ircd_fix_epn.dpatch by Alexander Wirt <formorer@formorer.de>
+##
+## DP: Fixes epn in check_ircd (#545940)
+
+@DPATCH@
+
+--- nagios-plugins-1.4.12~/plugins-scripts/check_ircd.pl        2009-08-23 09:40:38.000000000 +0200
++++ nagios-plugins-1.4.12/plugins-scripts/check_ircd.pl         2009-09-22 23:35:52.000000000 +0200
+@@ -194,19 +194,19 @@
+ 
+        if ($opt_h) {print_help(); exit $ERRORS{'OK'};}
+ 
+-       ($opt_H) || ($opt_H = shift) || usage("Host name/address not specified\n");
++       ($opt_H) || usage("Host name/address not specified\n");
+        my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/);
+        ($remotehost) || usage("Invalid host: $opt_H\n");
+ 
+-       ($opt_w) || ($opt_w = shift) || ($opt_w = 50);
++       ($opt_w) || ($opt_w = 50);
+        my $warn = $1 if ($opt_w =~ /^([0-9]+)$/);
+        ($warn) || usage("Invalid warning threshold: $opt_w\n");
+ 
+-       ($opt_c) || ($opt_c = shift) || ($opt_c = 100);
++       ($opt_c) || ($opt_c = 100);
+        my $crit = $1 if ($opt_c =~ /^([0-9]+)$/);
+        ($crit) || usage("Invalid critical threshold: $opt_c\n");
+ 
+-       ($opt_p) || ($opt_p = shift) || ($opt_p = 6667);
++       ($opt_p) || ($opt_p = 6667);
+        my $remoteport = $1 if ($opt_p =~ /^([0-9]+)$/);
+        ($remoteport) || usage("Invalid port: $opt_p\n");
+
diff --git a/web/attachments/345379-check_mount_opts.patch b/web/attachments/345379-check_mount_opts.patch
new file mode 100644
index 0000000..52ea67f
--- /dev/null
+++ b/web/attachments/345379-check_mount_opts.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-10 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824230" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824230" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824230" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824230" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824230');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2872843&group_id=29880&atid=397597&file_id=345379"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/345594-check_disk.patch b/web/attachments/345594-check_disk.patch
new file mode 100644
index 0000000..8070fb2
--- /dev/null
+++ b/web/attachments/345594-check_disk.patch
@@ -0,0 +1,12 @@
+diff -urpN nagios-plugins-1.4.14.orig/plugins/check_disk.c nagios-plugins-1.4.14/plugins/check_disk.c
+--- nagios-plugins-1.4.14.orig/plugins/check_disk.c     2009-05-07 23:10:02.000000000 +0200
++++ nagios-plugins-1.4.14/plugins/check_disk.c  2009-10-07 09:48:20.000000000 +0200
+@@ -58,7 +58,7 @@ static int inode_format = 1;
+ 
+ /* If nonzero, show even filesystems with zero size or
+    uninteresting types. */
+-static int show_all_fs = 1;
++static int show_all_fs = 0;
+ 
+ /* If nonzero, show only local filesystems.  */
+ static int show_local_fs = 0;
diff --git a/web/attachments/345604-check_mount_opts.patch b/web/attachments/345604-check_mount_opts.patch
new file mode 100644
index 0000000..c2b517c
--- /dev/null
+++ b/web/attachments/345604-check_mount_opts.patch
@@ -0,0 +1,27 @@
+diff -rupN nagios-plugins-1.4.14.orig/gl/mountlist.c nagios-plugins-1.4.14/gl/mountlist.c
+--- nagios-plugins-1.4.14.orig/gl/mountlist.c   2009-05-21 23:11:51.000000000 +0200
++++ nagios-plugins-1.4.14/gl/mountlist.c        2009-10-07 10:57:16.000000000 +0200
+@@ -156,6 +156,11 @@
+      || strcmp (Fs_type, "ignore") == 0)
+ #endif
+ 
++#ifndef ME_DUMMY_OPTS
++# define ME_DUMMY_OPTS(mount_options) \
++(strstr(mount_options, ",bind"))
++#endif
++
+ #ifndef ME_REMOTE
+ /* A file system is `remote' if its Fs_name contains a `:'
+    or if (it is of type (smbfs or cifs) and its Fs_name starts with `//').  */
+@@ -388,7 +393,11 @@ read_file_system_list (bool need_fs_type
+        me->me_mountdir = xstrdup (mnt->mnt_dir);
+        me->me_type = xstrdup (mnt->mnt_type);
+        me->me_type_malloced = 1;
++        #ifndef __linux__
+        me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
++        #else
++       me->me_dummy = ME_DUMMY (me->me_devname, me->me_type) || ME_DUMMY_OPTS(mnt->mnt_opts);
++        #endif
+        me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
+        me->me_dev = dev_from_mount_options (mnt->mnt_opts);
+ 
diff --git a/web/attachments/349111-patch.txt b/web/attachments/349111-patch.txt
new file mode 100644
index 0000000..2eae01d
--- /dev/null
+++ b/web/attachments/349111-patch.txt
@@ -0,0 +1,21 @@
+--- check_asterisk.pl   2009-09-24 03:13:56.000000000 -0700
++++ check_asterisk.pl.changed   2009-11-01 13:10:06.000000000 -0800
+@@ -31,7 +31,8 @@
+ my $iax_timestamp = "00000000"; 
+ my $iax_outbound_seq = "00"; 
+ my $iax_inbound_seq = "00"; 
+-my $iax_type = "06"; #IAX_Control 
++my $iax_type = "06"; #IAX_Control
++my $iax_frame_value = "1e"; #POKE
+ 
+ sub ok {
+        $s = shift;
+@@ -224,7 +225,7 @@
+        socket(PING, PF_INET, SOCK_DGRAM, getprotobyname("udp")); 
+ 
+        $msg = pack "H24", $iax_src_call . $iax_dst_call . $iax_timestamp .
+-               $iax_outbound_seq . $iax_inbound_seq . $iax_type . $iax_type;
++               $iax_outbound_seq . $iax_inbound_seq . $iax_type . $iax_frame_value ;
+ 
+        $ipaddr = inet_aton($host); 
+        $sendto = sockaddr_in($port,$ipaddr); 
diff --git a/web/attachments/34950-diff.txt b/web/attachments/34950-diff.txt
new file mode 100644
index 0000000..4276ba2
--- /dev/null
+++ b/web/attachments/34950-diff.txt
@@ -0,0 +1,50 @@
+Common subdirectories: nagiosplug/CVS and nagiosplug.old/CVS

+diff nagiosplug/acconfig.h nagiosplug.old/acconfig.h

+5d4

+< #undef HAVE_C99_SNPRINTF

+diff nagiosplug/configure.in nagiosplug.old/configure.in

+346,347c346

+< dnl Checks for library functions (deplace).

+< AC_CHECK_FUNCS(memmove select socket strdup strstr strtod strtol strtoul gettimeofday snprintf)

+---

+> AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")

+349,352c348

+< AC_CHECK_FUNC(getopt_long_only,[ nagiosplug_cv_bool_getoptlib="yes" ] ,[ nagiosplug_cv_bool_getoptlib="no" ])

+< 

+< AC_CHECK_FUNC(asprintf,[ nagiosplug_cv_bool_asprintf="yes" ] ,[ nagiosplug_cv_bool_asprintf="no" ])

+< AC_CHECK_FUNC(snprintf,[ nagiosplug_cv_bool_snprintf="yes" ] ,[ nagiosplug_cv_bool_snprintf="no" ])

+---

+> AC_CHECK_FUNC(asprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a")

+353a350,351

+> dnl Checks for library functions.

+> AC_CHECK_FUNCS(memmove select socket strdup strstr strtod strtol strtoul gettimeofday)

+819a818

+>       AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$PATH_TO_SWAP -k",[Path to swap/swapinfo binary, with any args])

+822d820

+<               AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$PATH_TO_SWAP -k",[Path to swap/swapinfo binary, with any args])

+825,829d822

+<       elif [swapinfo -d 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]

+<       then

+<                AC_DEFINE_UNQUOTED(SWAP_COMMAND,"/bin/sh '$PATH_TO_SWAP -d | /bin/tail -l +2'",[Path to swap/swapinfo binary, with any args])

+<                AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"],[Format string for parsing swap output ])

+<                echo "     NEW file format HP-UX  !!"

+864,877d856

+< 

+< if test "$nagiosplug_cv_bool_getoptlib" = "no"; then

+<  LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a"

+< fi

+< 

+< if test "$nagiosplug_cv_bool_asprintf" = "no"; then

+<  LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a"

+< fi

+< 

+< if test "$nagiosplug_cv_bool_snprintf" = "yes"; then

+<   if test `uname -s` = 'HP-UX' ; then

+<        AC_DEFINE(HAVE_C99_SNPRINTF)

+<   fi

+< fi

+Common subdirectories: nagiosplug/contrib and nagiosplug.old/contrib

+Common subdirectories: nagiosplug/doc and nagiosplug.old/doc

+Common subdirectories: nagiosplug/plugins and nagiosplug.old/plugins

+Common subdirectories: nagiosplug/plugins-scripts and nagiosplug.old/plugins-scripts

+Common subdirectories: nagiosplug/tools and nagiosplug.old/tools

diff --git a/web/attachments/350309-check_by_ssh_configfile.patch b/web/attachments/350309-check_by_ssh_configfile.patch
new file mode 100644
index 0000000..b609165
--- /dev/null
+++ b/web/attachments/350309-check_by_ssh_configfile.patch
@@ -0,0 +1,40 @@
+Index: plugins/check_by_ssh.c
+===================================================================
+189a190
+>               {"configfile", optional_argument, 0, 'F'},
+201c202
+<               c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:", longopts,
+---
+>               c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:F:", longopts,
+308a310,313
+>               case 'F':                                                                       /* ssh configfile */
+>                       comm_append("-F");
+>                       comm_append(optarg);
+>                       break;
+422a428,429
+>   printf (" %s\n","-F, --configfile");
+>   printf ("    %s\n", _("Tell ssh to use this configfile[optional]"));
+463c470
+<               "       [-p port] [-o ssh-option]\n",
+---
+>               "       [-p port] [-o ssh-option] [-F configfile]\n",
+Index: plugins/t/check_by_ssh.t
+===================================================================
+19a20,23
+> my $ssh_conf = getTestParameter( "NP_SSH_CONFIGFILE",
+>     "A config file with ssh settings",
+>     "~/.ssh/config");
+> 
+22c26
+< plan tests => 40;
+---
+> plan tests => 42;
+87a92,97
+> $result = NPTest->testCmd(
+>       "./check_by_ssh -i $ssh_key -H $ssh_service -F $ssh_conf -C 'exit 0'"
+>       );
+> cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+> is($result->output, 'OK - check_by_ssh: Remote command \'exit 0\' returned status 0', "Status text if command returned none (OK)");
+> 
+146d155
+< 
diff --git a/web/attachments/351231-check_nwstat.diff b/web/attachments/351231-check_nwstat.diff
new file mode 100644
index 0000000..810eb9f
--- /dev/null
+++ b/web/attachments/351231-check_nwstat.diff
@@ -0,0 +1,59 @@
+48a49
+>       VPU,        /* check % used space on volume */
+148a150,151
+>       unsigned long used_disk_space=0L;
+>   unsigned long percent_used_disk_space=0L;
+454a458,484
+>               /* check % used space on volume */
+>       } else if (vars_to_check==VPU) {
+>               close(sd);
+>               my_tcp_connect (server_address, server_port, &sd);
+> 
+>               asprintf (&send_buffer,"VMU%s\r\n",volume_name);
+>               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+>               if (result!=STATE_OK)
+>                       return result;
+> 
+>               if (!strcmp(recv_buffer,"-1\n")) {
+> 
+>                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
+>                       result=STATE_CRITICAL;
+> 
+>               } else {
+>                       used_disk_space=strtoul(recv_buffer,NULL,10);
+>                       close(sd);
+>                       my_tcp_connect (server_address, server_port, &sd);
+>       /* get total volume in MB */
+>                       asprintf (&send_buffer,"VMS%s\r\n",volume_name);
+>                       result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+>                       if (result!=STATE_OK)
+>                               return result;
+>                       total_disk_space=strtoul(recv_buffer,NULL,10);
+>       /* calculate percent used on volume */
+>                       percent_used_disk_space=(unsigned long)(((double)used_disk_space/(double)total_disk_space)*100.0);
+455a486,501
+>                       if (check_critical_value==TRUE && percent_used_disk_space >= critical_value)
+>                               result=STATE_CRITICAL;
+>                       else if (check_warning_value==TRUE && percent_used_disk_space >= warning_value)
+>                               result=STATE_WARNING;
+>                       
+>                       asprintf (&output_message,_("%lu MB (%lu%%) used on volume %s - total %lu MB|Used space in percent on %s=%lu;%lu;%lu;0;100"),
+>                               used_disk_space,
+>                               percent_used_disk_space,
+>                               volume_name,
+>                               total_disk_space,
+>                               volume_name,
+>         percent_used_disk_space,
+>         warning_value,
+>         critical_value
+>         );
+>               }
+1452a1499,1504
+>                               else if (strncmp(optarg,"VPU",3)==0) {
+>                                       vars_to_check=VPU;
+>                                       volume_name = strdup (optarg+3);
+>                                       if (!strcmp(volume_name,""))
+>                                               volume_name = strdup ("SYS");
+>                               }
+1628a1681
+>   printf ("    %s\n", _("    VPU<vol>  = percent used space on Volume <vol>"));
diff --git a/web/attachments/352097-0001-move-nagios_die-out-of-N-P-Thresholds.patch b/web/attachments/352097-0001-move-nagios_die-out-of-N-P-Thresholds.patch
new file mode 100644
index 0000000..449cdd9
--- /dev/null
+++ b/web/attachments/352097-0001-move-nagios_die-out-of-N-P-Thresholds.patch
@@ -0,0 +1,69 @@
+From c1f379dbeb62b56530a25319690977385ce6766f Mon Sep 17 00:00:00 2001
+From: Danijel Tasov <dt@korn.shell.la>
+Date: Sun, 22 Nov 2009 14:25:33 +0100
+Subject: [PATCH] move nagios_die out of N::P::Thresholds.
+
+N::P::Thresholds uses nagios_die. This is suboptimal for using
+that Class in other Projects. Though one can set
+N::P::F::_use_die, but then $@ contains get_shortname and a
+STATUS_TEXT, which feels odd.
+
+Signed-off-by: Danijel Tasov <dt@korn.shell.la>
+---
+ lib/Nagios/Plugin.pm           |    7 ++++++-
+ lib/Nagios/Plugin/Threshold.pm |    7 ++++---
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Nagios/Plugin.pm b/lib/Nagios/Plugin.pm
+index 697005a..958d617 100644
+--- a/lib/Nagios/Plugin.pm
++++ b/lib/Nagios/Plugin.pm
+@@ -83,7 +83,12 @@ sub all_perfoutput {
+ sub set_thresholds { 
+     my $self = shift; 
+     require Nagios::Plugin::Threshold;
+-    return $self->threshold( Nagios::Plugin::Threshold->set_thresholds(@_)); 
++    eval {
++      $self->threshold( Nagios::Plugin::Threshold->set_thresholds(@_));
++    }; if($@) {
++      $self->nagios_die($@);
++    }
++    return $self->threshold;
+ }
+ 
+ # NP::Functions wrappers
+diff --git a/lib/Nagios/Plugin/Threshold.pm b/lib/Nagios/Plugin/Threshold.pm
+index 73fce53..e481cd4 100644
+--- a/lib/Nagios/Plugin/Threshold.pm
++++ b/lib/Nagios/Plugin/Threshold.pm
+@@ -9,7 +9,8 @@ use base qw(Class::Accessor::Fast);
+ __PACKAGE__->mk_accessors(qw(warning critical));
+ 
+ use Nagios::Plugin::Range;
+-use Nagios::Plugin::Functions qw(:codes nagios_die);
++use Nagios::Plugin::Functions qw(:codes);
++use Carp;
+ our ($VERSION) = $Nagios::Plugin::Functions::VERSION;
+ 
+ sub get_status 
+@@ -34,7 +35,7 @@ sub _inflate
+ 
+     # For refs, check isa N::P::Range
+     if (ref $value) {
+-        nagios_die("Invalid $key object: type " . ref $value)
++        croak("Invalid $key object: type " . ref $value)
+             unless $value->isa("Nagios::Plugin::Range");
+         return $value;
+     }
+@@ -44,7 +45,7 @@ sub _inflate
+ 
+     # Otherwise parse $value
+     my $range = Nagios::Plugin::Range->parse_range_string($value);
+-    nagios_die("Cannot parse $key range: '$value'") unless(defined($range));
++    croak("Cannot parse $key range: '$value'") unless(defined($range));
+     return $range;
+ }
+ 
+-- 
+1.6.5.2.10.g754571
+
diff --git a/web/attachments/353739-bignumbers.patch b/web/attachments/353739-bignumbers.patch
new file mode 100644
index 0000000..e873053
--- /dev/null
+++ b/web/attachments/353739-bignumbers.patch
@@ -0,0 +1,81 @@
+diff --git a/plugins/utils.c b/plugins/utils.c
+index fee06cf..df8c979 100644
+--- a/plugins/utils.c
++++ b/plugins/utils.c
+@@ -535,39 +535,39 @@ strpcat (char *dest, const char *src, const char *str)
+  ******************************************************************************/
+ 
+ char *perfdata (const char *label,
+- long int val,
++ long long int val,
+  const char *uom,
+  int warnp,
+- long int warn,
++ long long int warn,
+  int critp,
+- long int crit,
++ long long int crit,
+  int minp,
+- long int minv,
++ long long int minv,
+  int maxp,
+- long int maxv)
++ long long int maxv)
+ {
+        char *data = NULL;
+ 
+        if (strpbrk (label, "'= "))
+-               asprintf (&data, "'%s'=%ld%s;", label, val, uom);
++               asprintf (&data, "'%s'=%lli%s;", label, val, uom);
+        else
+-               asprintf (&data, "%s=%ld%s;", label, val, uom);
++               asprintf (&data, "%s=%lli%s;", label, val, uom);
+ 
+        if (warnp)
+-               asprintf (&data, "%s%ld;", data, warn);
++               asprintf (&data, "%s%lli;", data, warn);
+        else
+                asprintf (&data, "%s;", data);
+ 
+        if (critp)
+-               asprintf (&data, "%s%ld;", data, crit);
++               asprintf (&data, "%s%lli;", data, crit);
+        else
+                asprintf (&data, "%s;", data);
+ 
+        if (minp)
+-               asprintf (&data, "%s%ld", data, minv);
++               asprintf (&data, "%s%lli", data, minv);
+ 
+        if (maxp)
+-               asprintf (&data, "%s;%ld", data, maxv);
++               asprintf (&data, "%s;%lli", data, maxv);
+ 
+        return data;
+ }
+diff --git a/plugins/utils.h b/plugins/utils.h
+index 116f6c8..8a067fd 100644
+--- a/plugins/utils.h
++++ b/plugins/utils.h
+@@ -99,16 +99,16 @@ const char *state_text (int);
+ #define min(a,b) (((a)<(b))?(a):(b))
+ 
+ char *perfdata (const char *,
+- long int,
++ long long int,
+  const char *,
+  int,
+- long int,
++ long long int,
+  int,
+- long int,
++ long long int,
+  int,
+- long int,
++ long long int,
+  int,
+- long int);
++ long long int);
+ 
+ char *fperfdata (const char *,
+  double,
diff --git a/web/attachments/35381-check_nagios.c.patch b/web/attachments/35381-check_nagios.c.patch
new file mode 100644
index 0000000..1b96e5d
--- /dev/null
+++ b/web/attachments/35381-check_nagios.c.patch
@@ -0,0 +1,9 @@
+--- check_nagios.c      Wed Jun 19 07:11:52 2002
++++ check_nagios.c.gyufi        Thu Nov 14 08:39:19 2002
+@@ -263,5 +263,5 @@
+                 "-V, --version\n"
+                 "   Print version information\n\n"
+                 "Example:\n"
+-                "   ./check_nagios -H /usr/local/nagios/var/status.log -e 5 -C /usr/local/nagios/bin/nagios\n");
++                "   ./check_nagios -F /usr/local/nagios/var/status.log -e 5 -C /usr/local/nagios/bin/nagios\n");
+ }
diff --git a/web/attachments/353909-0001-Detect-arguments-passed-via-with-ping-6-command-2908.patch b/web/attachments/353909-0001-Detect-arguments-passed-via-with-ping-6-command-2908.patch
new file mode 100644
index 0000000..6dac847
--- /dev/null
+++ b/web/attachments/353909-0001-Detect-arguments-passed-via-with-ping-6-command-2908.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-4 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824522" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824522" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824522" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824522" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824522');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2896201&group_id=29880&atid=397597&file_id=353909"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/353970-0001-Detect-arguments-passed-via-with-ping-6-command-2908.patch b/web/attachments/353970-0001-Detect-arguments-passed-via-with-ping-6-command-2908.patch
new file mode 100644
index 0000000..60bda5c
--- /dev/null
+++ b/web/attachments/353970-0001-Detect-arguments-passed-via-with-ping-6-command-2908.patch
@@ -0,0 +1,65 @@
+From 96a23a4c117a9c2665ca09e5964eacf028dbcdcf Mon Sep 17 00:00:00 2001
+From: Thomas Guyot-Sionnest <dermoth@aei.ca>
+Date: Fri, 4 Dec 2009 15:24:15 -0500
+Subject: [PATCH] Detect arguments passed via --with-ping[6]-command (#2908236)
+
+---
+ NEWS         |    1 +
+ configure.in |   19 +++++++++++++++++--
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index f5be201..667e1f0 100644
+--- a/NEWS
++++ b/NEWS
+@@ -7,6 +7,7 @@ This file documents the major additions and syntax changes between releases.
+        Add proxy-authorization option to check_http (Marcel Kuiper - #1323230, Bryan Irvine - #2863925)
+        check_icmp now increment the sequence counter in each packet
+        Fix usage of repeated -o options in check_snmp
++       Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236)
+        WARNINGS
+        Updated developer documentation to say that performance labels should not have an equals sign or
+        single quote in the label
+diff --git a/configure.in b/configure.in
+index f354734..d02d7f8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -877,10 +877,17 @@ ac_cv_ping_has_timeout=no
+ if test -n "$with_ping_command"
+ then
+        AC_MSG_RESULT([(command-line) $with_ping_command])
+-       if test -n "$ac_cv_ping_packets_first"
++       if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
+        then
+                ac_cv_ping_packets_first=yes
+                ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
++       then
++               ac_cv_ping_packets_first=yes
+        fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+@@ -981,7 +988,15 @@ ac_cv_ping6_packets_first=no
+ if test -n "$with_ping6_command"
+ then
+        AC_MSG_RESULT([(command-line) $with_ping6_command])
+-       if test -n "$ac_cv_ping6_packets_first"
++       if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
++       then
++               ac_cv_ping6_packets_first=yes
++       elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
++               true
++       elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
+        then
+                ac_cv_ping6_packets_first=yes
+        fi
+-- 
+1.6.5.1
+
diff --git a/web/attachments/354010-41_check_ping_detect_args.dpatch b/web/attachments/354010-41_check_ping_detect_args.dpatch
new file mode 100644
index 0000000..98e1d36
--- /dev/null
+++ b/web/attachments/354010-41_check_ping_detect_args.dpatch
@@ -0,0 +1,78 @@
+diff -uNr nagios-plugins-1.4.14-58-g96f2/configure nagios-plugins-1.4.14-59-g96a2/configure
+--- nagios-plugins-1.4.14-58-g96f2/configure    2009-12-04 21:00:51.000000000 +0000
++++ nagios-plugins-1.4.14-59-g96a2/configure    2009-12-05 20:02:24.000000000 +0000
+@@ -26914,10 +26914,17 @@
+ then
+        { echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5
+ echo "${ECHO_T}(command-line) $with_ping_command" >&6; }
+-       if test -n "$ac_cv_ping_packets_first"
++       if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
+        then
+                ac_cv_ping_packets_first=yes
+                ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
++       then
++               ac_cv_ping_packets_first=yes
+        fi
+ 
+ elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
+@@ -27042,7 +27049,15 @@
+ then
+        { echo "$as_me:$LINENO: result: (command-line) $with_ping6_command" >&5
+ echo "${ECHO_T}(command-line) $with_ping6_command" >&6; }
+-       if test -n "$ac_cv_ping6_packets_first"
++       if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
++       then
++               ac_cv_ping6_packets_first=yes
++       elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
++               true
++       elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
+        then
+                ac_cv_ping6_packets_first=yes
+        fi
+diff -uNr nagios-plugins-1.4.14-58-g96f2/configure.in nagios-plugins-1.4.14-59-g96a2/configure.in
+--- nagios-plugins-1.4.14-58-g96f2/configure.in 2009-12-04 21:00:08.000000000 +0000
++++ nagios-plugins-1.4.14-59-g96a2/configure.in 2009-12-05 20:01:44.000000000 +0000
+@@ -877,10 +877,17 @@
+ if test -n "$with_ping_command"
+ then
+        AC_MSG_RESULT([(command-line) $with_ping_command])
+-       if test -n "$ac_cv_ping_packets_first"
++       if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
+        then
+                ac_cv_ping_packets_first=yes
+                ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
++       then
++               ac_cv_ping_packets_first=yes
+        fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+@@ -981,7 +988,15 @@
+ if test -n "$with_ping6_command"
+ then
+        AC_MSG_RESULT([(command-line) $with_ping6_command])
+-       if test -n "$ac_cv_ping6_packets_first"
++       if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
++       then
++               ac_cv_ping6_packets_first=yes
++       elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
++               true
++       elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
+        then
+                ac_cv_ping6_packets_first=yes
+        fi
diff --git a/web/attachments/354011-41_check_ping_detect_args_2.dpatch b/web/attachments/354011-41_check_ping_detect_args_2.dpatch
new file mode 100644
index 0000000..351b506
--- /dev/null
+++ b/web/attachments/354011-41_check_ping_detect_args_2.dpatch
@@ -0,0 +1,293 @@
+diff -uNr nagios-plugins-1.4.14-56-g4b226/configure nagios-plugins-1.4.14-59-g96a2/configure
+--- nagios-plugins-1.4.14-56-g4b226/configure   2009-11-23 13:00:57.000000000 +0000
++++ nagios-plugins-1.4.14-59-g96a2/configure    2009-12-05 20:02:24.000000000 +0000
+@@ -26914,17 +26914,24 @@
+ then
+        { echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5
+ echo "${ECHO_T}(command-line) $with_ping_command" >&6; }
+-       if test -n "$ac_cv_ping_packets_first"
++       if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
+        then
+                ac_cv_ping_packets_first=yes
+                ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
++       then
++               ac_cv_ping_packets_first=yes
+        fi
+ 
+ elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
+        $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+-        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
++       with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        { echo "$as_me:$LINENO: result: $with_ping_command" >&5
+ echo "${ECHO_T}$with_ping_command" >&6; }
+@@ -26932,7 +26939,7 @@
+ elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+-        with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
++       with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+        ac_cv_ping_packets_first=yes
+   ac_cv_ping_has_timeout=yes
+        { echo "$as_me:$LINENO: result: $with_ping_command" >&5
+@@ -26941,7 +26948,7 @@
+ elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+-        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
++       with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        { echo "$as_me:$LINENO: result: $with_ping_command" >&5
+ echo "${ECHO_T}$with_ping_command" >&6; }
+@@ -27042,7 +27049,15 @@
+ then
+        { echo "$as_me:$LINENO: result: (command-line) $with_ping6_command" >&5
+ echo "${ECHO_T}(command-line) $with_ping6_command" >&6; }
+-       if test -n "$ac_cv_ping6_packets_first"
++       if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
++       then
++               ac_cv_ping6_packets_first=yes
++       elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
++               true
++       elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
+        then
+                ac_cv_ping6_packets_first=yes
+        fi
+@@ -27052,7 +27067,7 @@
+                $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
+ echo "${ECHO_T}$with_ping6_command" >&6; }
+@@ -27069,7 +27084,7 @@
+        elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
+ echo "${ECHO_T}$with_ping6_command" >&6; }
+@@ -27133,7 +27148,7 @@
+                $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
+ echo "${ECHO_T}$with_ping6_command" >&6; }
+@@ -27141,7 +27156,7 @@
+        elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
+ echo "${ECHO_T}$with_ping6_command" >&6; }
+@@ -28500,7 +28515,7 @@
+ 
+                #include <unistd.h>
+                #include <sys/types.h>
+-              #include <sys/param.h>
++               #include <sys/param.h>
+                #include <sys/stat.h>
+                #include <sys/swap.h>
+ 
+@@ -28574,7 +28589,7 @@
+ /* end confdefs.h.  */
+ 
+                #include <sys/types.h>
+-              #include <sys/param.h>
++               #include <sys/param.h>
+                #include <sys/stat.h>
+                #include <sys/swap.h>
+ 
+@@ -28641,7 +28656,7 @@
+ /* end confdefs.h.  */
+ 
+                #include <sys/types.h>
+-              #include <sys/param.h>
++               #include <sys/param.h>
+                #include <sys/stat.h>
+                #include <sys/swap.h>
+ 
+@@ -28708,11 +28723,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-               #include <unistd.h>
+-               #include <sys/types.h>
+-              #include <sys/param.h>
+-               #include <sys/stat.h>
+-               #include <sys/swap.h>
++                 #include <unistd.h>
++                 #include <sys/types.h>
++                 #include <sys/param.h>
++                 #include <sys/stat.h>
++                 #include <sys/swap.h>
+ 
+ 
+ int
+@@ -28754,11 +28769,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-               #include <unistd.h>
+-               #include <sys/types.h>
+-              #include <sys/param.h>
+-               #include <sys/stat.h>
+-               #include <sys/swap.h>
++                 #include <unistd.h>
++                 #include <sys/types.h>
++                 #include <sys/param.h>
++                 #include <sys/stat.h>
++                 #include <sys/swap.h>
+ 
+ 
+ int
+diff -uNr nagios-plugins-1.4.14-56-g4b226/configure.in nagios-plugins-1.4.14-59-g96a2/configure.in
+--- nagios-plugins-1.4.14-56-g4b226/configure.in        2009-11-23 12:00:03.000000000 +0000
++++ nagios-plugins-1.4.14-59-g96a2/configure.in 2009-12-05 20:01:44.000000000 +0000
+@@ -877,24 +877,31 @@
+ if test -n "$with_ping_command"
+ then
+        AC_MSG_RESULT([(command-line) $with_ping_command])
+-       if test -n "$ac_cv_ping_packets_first"
++       if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
+        then
+                ac_cv_ping_packets_first=yes
+                ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               ac_cv_ping_has_timeout=yes
++       elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
++       then
++               ac_cv_ping_packets_first=yes
+        fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+        $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+-        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
++       with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+ elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+-        with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
++       with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+        ac_cv_ping_packets_first=yes
+   ac_cv_ping_has_timeout=yes
+        AC_MSG_RESULT([$with_ping_command])
+@@ -902,7 +909,7 @@
+ elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+-        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
++       with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+@@ -981,7 +988,15 @@
+ if test -n "$with_ping6_command"
+ then
+        AC_MSG_RESULT([(command-line) $with_ping6_command])
+-       if test -n "$ac_cv_ping6_packets_first"
++       if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
++       then
++               ac_cv_ping6_packets_first=yes
++       elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
++            echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
++       then
++               # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
++               true
++       elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
+        then
+                ac_cv_ping6_packets_first=yes
+        fi
+@@ -991,7 +1006,7 @@
+                $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                AC_MSG_RESULT([$with_ping6_command])
+ 
+@@ -1006,7 +1021,7 @@
+        elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                AC_MSG_RESULT([$with_ping6_command])
+ 
+@@ -1062,14 +1077,14 @@
+                $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                AC_MSG_RESULT([$with_ping6_command])
+ 
+        elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
+                egrep -i "^round-trip|^rtt" >/dev/null
+        then
+-               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
++               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+                ac_cv_ping6_packets_first=yes
+                AC_MSG_RESULT([$with_ping6_command])
+ 
+@@ -1411,23 +1426,23 @@
+ AC_CHECK_DECLS([swapctl],,,[
+                #include <unistd.h>
+                #include <sys/types.h>
+-              #include <sys/param.h>
++               #include <sys/param.h>
+                #include <sys/stat.h>
+                #include <sys/swap.h>
+                ])
+ AC_CHECK_TYPES([swaptbl_t, swapent_t],,,[
+                #include <sys/types.h>
+-              #include <sys/param.h>
++               #include <sys/param.h>
+                #include <sys/stat.h>
+                #include <sys/swap.h>
+                ])
+ AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[
+-               #include <unistd.h>
+-               #include <sys/types.h>
+-              #include <sys/param.h>
+-               #include <sys/stat.h>
+-               #include <sys/swap.h>
+-               ])
++                 #include <unistd.h>
++                 #include <sys/types.h>
++                 #include <sys/param.h>
++                 #include <sys/stat.h>
++                 #include <sys/swap.h>
++                 ])
+ 
+ if test "$ac_cv_have_decl_swapctl" = "yes";
+ then
diff --git a/web/attachments/35427-check_mrtgtraf.c.patch b/web/attachments/35427-check_mrtgtraf.c.patch
new file mode 100644
index 0000000..3fb92b9
--- /dev/null
+++ b/web/attachments/35427-check_mrtgtraf.c.patch
@@ -0,0 +1,41 @@
+--- check_mrtgtraf.c    Thu Nov 14 15:48:42 2002
++++ check_mrtgtraf.c.orig       Thu Nov 14 16:06:15 2002
+@@ -197,26 +197,27 @@
+        if (incoming_rate > incoming_critical_threshold
+                        || outgoing_rate > outgoing_critical_threshold) {
+                result = STATE_CRITICAL;
+-               asprintf (&error_message, "Traffic CRITICAL %s. In = %0.1f %s, %s. Out = %0.1f %s",
+-                                                (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
+-                                                incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
++               asprintf (&error_message, "%s. In = %0.1f %s, %s. Out = %0.1f %s",
++                                                (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate,
++                                                incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max",
+                                                 adjusted_outgoing_rate, outgoing_speed_rating);
+        }
+        else if (incoming_rate > incoming_warning_threshold
+                                         || outgoing_rate > outgoing_warning_threshold) {
+                result = STATE_WARNING;
+-               asprintf (&error_message, "Traffic WARNING %s. In = %0.1f %s, %s. Out = %0.1f %s",
+-                                                (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
+-                                                incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
++               asprintf (&error_message, "%s. In = %0.1f %s, %s. Out = %0.1f %s",
++                                                (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate,
++                                                incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max",
+                                                 adjusted_outgoing_rate, outgoing_speed_rating);
+        }
+-       else if (result == STATE_OK)
+-               printf ("Traffic OK - %s. In = %0.1f %s, %s. Out = %0.1f %s\n",
+-                                               (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
+-                                               incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
++
++       if (result == STATE_OK)
++               printf ("Traffic ok - %s. In = %0.1f %s, %s. Out = %0.1f %s\n",
++                                               (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate,
++                                               incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max",
+                                                adjusted_outgoing_rate, outgoing_speed_rating);
+        else
+-               printf ("UNKNOWN %s\n", error_message);
++               printf ("%s\n", error_message);
+ 
+        return result;
+ }
diff --git a/web/attachments/354598-patch-check_radius.c.txt b/web/attachments/354598-patch-check_radius.c.txt
new file mode 100644
index 0000000..4a57128
--- /dev/null
+++ b/web/attachments/354598-patch-check_radius.c.txt
@@ -0,0 +1,21 @@
+--- plugins/check_radius.c.virgin       2009-12-09 18:04:27.000000000 -0800
++++ plugins/check_radius.c      2009-12-09 18:27:42.000000000 -0800
+@@ -191,13 +191,16 @@
+                die (STATE_CRITICAL, _("Timeout"));
+        if (result == ERROR_RC)
+                die (STATE_CRITICAL, _("Auth Error"));
+-       if (result == BADRESP_RC)
++       if (result == REJECT_RC)
+                die (STATE_WARNING, _("Auth Failed"));
++       if (result == BADRESP_RC)
++               die (STATE_WARNING, _("Bad Response"));
+        if (expect && !strstr (msg, expect))
+                die (STATE_WARNING, "%s", msg);
+        if (result == OK_RC)
+                die (STATE_OK, _("Auth OK"));
+-       return (0);
++       (void)snprintf(msg, sizeof(msg), "unexpected result code %d", result);
++       die (STATE_UNKNOWN, _(msg));
+ }
+ 
+ 
diff --git a/web/attachments/35463-check_ldap.c.patch b/web/attachments/35463-check_ldap.c.patch
new file mode 100644
index 0000000..aca1f34
--- /dev/null
+++ b/web/attachments/35463-check_ldap.c.patch
@@ -0,0 +1,302 @@
+--- check_ldap.c.orig   Thu Nov 14 18:47:22 2002
++++ check_ldap.c        Fri Nov 15 13:54:00 2002
+@@ -7,7 +7,10 @@
+  * 
+  * Last Modified: $Date: 2002/02/28 06:42:57 $
+  *
+- * Command line: check_ldap -h <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
++ * Command line: check_ldap -H <host> -b <base_dn> -p <port> [-f <attr>] 
++ *       [-a <attr>] [-e <expect>] [-W <Warn_attr>] [-C <Crit_attr>] [-r]
++ *       [-D <binddn>] [-P <password>]
++ *       [-w <warn_time>] [-c <crit_time>] [-t timeout] [-v]
+  *
+  * Description:
+  *
+@@ -17,6 +20,8 @@
+  *
+  * 08-25-1999 Ethan Galstad (nagios@nagios.org)
+  *            Modified to use common plugin include file
++ * 11-15-2002 Gyula Szabo (gyufi@sztaki.hu)
++ *            Modified check_ldap.c
+  *
+  *****************************************************************************/
+ 
+@@ -41,6 +46,12 @@
+ 
+ char ld_defattr[] = "(objectclass=*)";
+ char *ld_attr = ld_defattr;
++char *attr = "";
++char *expect = "";
++int verbose = 0;
++int reverse = 0;
++char *attr_warn = "", *attr_crit = "";
++long attr_warn_long, attr_crit_long;
+ char *ld_host = NULL, *ld_base = NULL, *ld_passwd = NULL, *ld_binddn = NULL;
+ unsigned int ld_port = 389;
+ int warn_time = UNKNOWN, crit_time = UNKNOWN;
+@@ -50,14 +61,26 @@
+ {
+ 
+        LDAP *ld;
+-       LDAPMessage *result;
++       LDAPMessage *result, *e;
+ 
+-       int t_diff;
++       int t_diff, i;
+        time_t time0, time1;
++       BerElement *ber;
++       char *a, *dn; 
++       char **vals;
++       char * pEnd;
++       char res[50] = "";
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage ("check_ldap: could not parse arguments\n");
+ 
++       if (validate_arguments () == ERROR)
++               usage ("check_ldap: not valid arguments\n");
++
++       /* convert strings to long integers */
++       attr_warn_long = strtol (attr_warn,&pEnd,0);
++       attr_crit_long = strtol (attr_crit,&pEnd,0);
++
+        /* initialize alarm signal handling */
+        signal (SIGALRM, socket_timeout_alarm_handler);
+ 
+@@ -70,7 +93,7 @@
+        /* initialize ldap */
+        if (!(ld = ldap_open (ld_host, ld_port))) {
+                /*ldap_perror(ld, "ldap_open"); */
+-               printf ("Could not connect to the server at port %i\n", ld_port);
++               printf ("LDAP critical - Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
+ 
+@@ -78,7 +101,7 @@
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+                        LDAP_SUCCESS) {
+                /*ldap_perror(ld, "ldap_bind"); */
+-               printf ("Could not bind to the ldap-server\n");
++               printf ("LDAP critical - Could not bind to the ldap-server\n");
+                return STATE_CRITICAL;
+        }
+ 
+@@ -86,10 +109,68 @@
+        if (ldap_search_s (ld, ld_base, LDAP_SCOPE_BASE, ld_attr, NULL, 0, &result)
+                        != LDAP_SUCCESS) {
+                /*ldap_perror(ld, "ldap_search"); */
+-               printf ("Could not search/find objectclasses in %s\n", ld_base);
++               printf ("LDAP critical - Could not search/find objectclasses in %s\n", ld_base);
+                return STATE_CRITICAL;
+        }
+ 
++
++       /* For each matching entry, print the entry name and its attributes. */
++       for ( e = ldap_first_entry( ld, result ); e != NULL;
++                e = ldap_next_entry( ld, e ) ) {
++          if ( ( dn = ldap_get_dn( ld, e ) ) != NULL ) {
++             if (verbose) {printf( "dn: %s\n", dn );}
++             ldap_memfree( dn );
++          }
++          for ( a = ldap_first_attribute( ld, e, &ber ); a != NULL;
++                a = ldap_next_attribute( ld, e, ber ) ) {
++             if ( ( vals = ldap_get_values( ld, e, a ) ) != NULL ) {
++                for ( i = 0; vals[i] != NULL; i++ ) {
++                   if (verbose) {printf( "%s: %s\n", a, vals[i] );}
++                   if ( strcmp (a,attr) == 0 ) {
++                       strcpy(res,a);
++                       strcat(res,": ");
++                       strncat(res,vals[i],30);
++
++                       if (strcmp(vals[i],expect) != 0 && strcmp("",expect) != 0 ) {
++                               printf ("LDAP critical - %s: %s \n", a, vals[i]);
++                               return STATE_CRITICAL;
++                       }
++                       if(reverse){
++                               if (attr_crit_long && strtol(vals[i],&pEnd,0)<=attr_crit_long) {
++                                       printf ("LDAP critical - %s: %s\n", a, vals[i]);
++                                       return STATE_CRITICAL;
++                               }
++                               if (attr_warn_long && strtol(vals[i],&pEnd,0)<=attr_warn_long) {
++                                       printf ("LDAP warning - %s: %s\n", a, vals[i]);
++                                       return STATE_WARNING;
++                               }
++                       }
++                       else {
++                               if (attr_crit_long && strtol(vals[i],&pEnd,0)>=attr_crit_long) {
++                                       printf ("LDAP critical - %s: %s\n", a, vals[i]);
++                                       return STATE_CRITICAL;
++                               }
++                               if (attr_warn_long && strtol(vals[i],&pEnd,0)>=attr_warn_long) {
++                                       printf ("LDAP warning - %s: %s\n", a, vals[i]);
++                                       return STATE_WARNING;
++                               }
++                       }
++                   }
++                       
++                }
++                ldap_value_free( vals );
++             }
++             ldap_memfree( a );
++          }
++          if ( ber != NULL ) {
++             ber_free( ber, 0 );
++          }
++          printf( "\n" );
++       }
++       ldap_msgfree( result );
++
++
++
+        /* unbind from the ldap server */
+        ldap_unbind (ld);
+ 
+@@ -113,7 +194,8 @@
+        }
+ 
+        /* print out the result */
+-       printf ("LDAP ok - %i seconds response time\n", t_diff);
++       if (strcmp(res,"") != 0) {printf ("LDAP ok - %i seconds response time, %s\n", t_diff, res);}
++       else {printf ("LDAP ok - %i seconds response time\n", t_diff);}
+ 
+        return STATE_OK;
+ }
+@@ -158,12 +240,15 @@
+                {"timeout", required_argument, 0, 't'},
+                {"host", required_argument, 0, 'H'},
+                {"base", required_argument, 0, 'b'},
++               {"filter", required_argument, 0, 'f'},
+                {"attr", required_argument, 0, 'a'},
++               {"expect", required_argument, 0, 'e'},
+                {"bind", required_argument, 0, 'D'},
+                {"pass", required_argument, 0, 'P'},
+                {"port", required_argument, 0, 'p'},
+                {"warn", required_argument, 0, 'w'},
+                {"crit", required_argument, 0, 'c'},
++               {"verbose", required_argument, 0, 'v'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -175,10 +260,10 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "+hVt:c:w:H:b:p:a:D:P:", long_options,
++                       getopt_long (argc, argv, "+hVt:c:w:H:b:p:f:a:e:W:C:D:P:vr", long_options,
+                                                                         &option_index);
+ #else
+-               c = getopt (argc, argv, "+?hVt:c:w:H:b:p:a:D:P:");
++               c = getopt (argc, argv, "+?hVt:c:w:H:b:p:f:a:e:W:C:D:P:vr");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -192,9 +277,14 @@
+                case 'H':
+                case 'b':
+                case 'p':
++               case 'f':
+                case 'a':
++               case 'e':
++               case 'W':
++               case 'C':
+                case 'D':
+                case 'P':
++               case 'v':
+                        i++;
+                }
+ 
+@@ -219,9 +309,28 @@
+                case 'p':
+                        ld_port = atoi (optarg);
+                        break;
+-               case 'a':
++               case 'f':
+                        ld_attr = optarg;
+                        break;
++               case 'a':
++                       attr = optarg;
++                       break;
++               case 'e':
++                       expect = optarg;
++                       break;
++               case 'W':
++                       if (!is_intnonneg (optarg))
++                               usage2 ("Warning value must be an integer", optarg);
++                       attr_warn = optarg;
++                       break;
++               case 'C':
++                       if (!is_intnonneg (optarg))
++                               usage2 ("Critical value must be an integer", optarg);
++                       attr_crit = optarg;
++                       break;
++               case 'r':
++                       reverse = 1;
++                       break;
+                case 'D':
+                        ld_binddn = optarg;
+                        break;
+@@ -234,6 +343,9 @@
+                case 'c':
+                        crit_time = atoi (optarg);
+                        break;
++               case 'v':
++                       verbose = 1;
++                       break;
+                default:
+                        usage ("check_ldap: could not parse arguments\n");
+                        break;
+@@ -247,7 +359,18 @@
+ {
+        if (ld_host[0] == 0 ||
+                        ld_base[0] == 0 ||
+-                       ld_port == UNKNOWN || warn_time == UNKNOWN || crit_time == UNKNOWN) {
++                       ld_port == UNKNOWN || warn_time == UNKNOWN || crit_time == UNKNOWN ||
++                       (
++                               (attr != "" && expect == "") && 
++                               (attr != "" && (attr_warn == "" || attr_crit == ""))
++                       ) ||
++                       (
++                               (attr_warn != "" || attr_crit != "" || expect != "") && (attr == "")
++                       ) ||
++                       (
++                               ((attr_warn != "" || attr_crit != "") && expect != "")
++                       )
++                       ) {
+                return ERROR;
+        }
+        else {
+@@ -270,13 +393,19 @@
+                ("\n"
+                 "Options:\n"
+                 "\t-H [--host] ... host\n"
+-                "\t-a [--attr] ... ldap attribute to search (default: \"(objectclass=*)\"\n"
++                "\t-f [--filter] ... ldap attribute to search (default: \"(objectclass=*)\"\n"
++                "\t-a [--attr] ... ldap attribute to compare \n"
++                "\t-e [--expect] ... expect string to match attribute - if not equal the STATE_CRITICAL will be returned\n"
++                "\t-W [--Warn] ... Attribute value. - if the exceeds <Warn> the STATE_WARNING will be returned\n"
++                "\t-C [--Crit] ... Attribute value. - if the exceeds <Crit> the STATE_CRITICAL will be returned\n"
++                "\t-r [--reverse] ... Comparing attribute value is reverse (lower attribute value is abnormal)\n"
+                 "\t-b [--base] ... ldap base (eg. ou=my unit, o=my org, c=at)\n"
+                 "\t-D [--bind] ... ldap bind DN (if required)\n"
+                 "\t-P [--pass] ... ldap password (if required)\n"
+                 "\t-p [--port] ... ldap port (normaly 389)\n"
+                 "\t-w [--warn] ... time in secs. - if the exceeds <warn> the STATE_WARNING will be returned\n"
+                 "\t-c [--crit] ... time in secs. - if the exceeds <crit> the STATE_CRITICAL will be returned\n"
++                "\t-v [--verbose] ... Verbose output, print all attributes\n"
+                 "\n");
+ }
+ 
+@@ -285,7 +414,10 @@
+ print_usage ()
+ {
+        printf
+-               ("Usage: %s -H <host> -b <base_dn> -p <port> [-a <attr>] [-D <binddn>]\n"
+-                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
+-                "(Note: all times are in seconds.)\n", PROGNAME);
++               ("Usage: %s -H <host> -b <base_dn> -p <port> [-f <attr>] \n"
++                "         [-a <attr>] [-e <expect>] [-W <Warn_attr>] [-C <Crit_attr>] [-r]\n"
++                "         [-D <binddn>] [-P <password>]\n"
++                "         [-w <warn_time>] [-c <crit_time>] [-t timeout] [-v]\n"
++                "(Note: all times are in seconds,\n"
++                "       if you use -a then you\'ve to use -W and -C or -e alone.)\n", PROGNAME);
+ }
diff --git a/web/attachments/355990-check_procs.c.patch b/web/attachments/355990-check_procs.c.patch
new file mode 100644
index 0000000..f8806de
--- /dev/null
+++ b/web/attachments/355990-check_procs.c.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-10 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378825292" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378825292" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378825292" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378825292" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378825292');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2918676&group_id=29880&atid=397599&file_id=355990"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/355994-check_procs.c.patch b/web/attachments/355994-check_procs.c.patch
new file mode 100644
index 0000000..3aa9724
--- /dev/null
+++ b/web/attachments/355994-check_procs.c.patch
@@ -0,0 +1,46 @@
+*** plugins/check_procs.org.c   Mon Dec 21 15:11:31 2009
+--- plugins/check_procs.c       Mon Dec 21 15:12:17 2009
+***************
+*** 280,293 ****
+        }
+  
+        if ( result == STATE_OK ) {
+!               printf ("%s %s: ", metric_name, _("OK"));
+        } else if (result == STATE_WARNING) {
+!               printf ("%s %s: ", metric_name, _("WARNING"));
+                if ( metric != METRIC_PROCS ) {
+                        printf (_("%d warn out of "), warn);
+                }
+        } else if (result == STATE_CRITICAL) {
+!               printf ("%s %s: ", metric_name, _("CRITICAL"));
+                if (metric != METRIC_PROCS) {
+                        printf (_("%d crit, %d warn out of "), crit, warn);
+                }
+--- 280,293 ----
+        }
+  
+        if ( result == STATE_OK ) {
+!               printf ("%s %s - ", metric_name, _("OK"));
+        } else if (result == STATE_WARNING) {
+!               printf ("%s %s - ", metric_name, _("WARNING"));
+                if ( metric != METRIC_PROCS ) {
+                        printf (_("%d warn out of "), warn);
+                }
+        } else if (result == STATE_CRITICAL) {
+!               printf ("%s %s - ", metric_name, _("CRITICAL"));
+                if (metric != METRIC_PROCS) {
+                        printf (_("%d crit, %d warn out of "), crit, warn);
+                }
+***************
+*** 301,306 ****
+--- 301,310 ----
+        if ( verbose >= 1 && strcmp(fails,"") )
+                printf (" [%s]", fails);
+  
++     // Print performance statistics for drawing graphs etc. tayfunsen
++     // Not sure what 0 in the end of the line is for.
++     printf (" | processes=%d;%d;%d;0", procs, warn, crit);
++ 
+        printf ("\n");
+        return result;
+  }
diff --git a/web/attachments/356001-compile.log b/web/attachments/356001-compile.log
new file mode 100644
index 0000000..453394c
--- /dev/null
+++ b/web/attachments/356001-compile.log
@@ -0,0 +1,1097 @@
+Script command is started on Mon Dec 21 14:27:11 2009.
+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# ./configure

+checking for a BSD-compatible install... build-aux/install-sh -c

+checking whether build environment is sane... yes

+checking for a thread-safe mkdir -p... build-aux/install-sh -c -d

+checking for gawk... no

+checking for mawk... no

+checking for nawk... nawk

+checking whether make sets $(MAKE)... yes

+checking build system type... powerpc-ibm-aix5.3.0.0

+checking host system type... powerpc-ibm-aix5.3.0.0

+checking for gcc... gcc

+checking for C compiler default output file name... a.out

+checking whether the C compiler works... yes

+checking whether we are cross compiling... no

+checking for suffix of executables... 

+checking for suffix of object files... o

+checking whether we are using the GNU C compiler... yes

+checking whether gcc accepts -g... yes

+checking for gcc option to accept ISO C89... none needed

+checking for style of include used by make... GNU

+checking dependency style of gcc... gcc3

+checking for ranlib... ranlib

+checking how to run the C preprocessor... gcc -E

+checking for grep that handles long lines and -e... /bin/grep

+checking for egrep... /bin/grep -E

+checking for ANSI C header files... yes

+checking for sys/types.h... yes

+checking for sys/stat.h... yes

+checking for stdlib.h... yes

+checking for string.h... yes

+checking for memory.h... yes

+checking for strings.h... yes

+checking for inttypes.h... yes

+checking for stdint.h... yes

+checking for unistd.h... yes

+checking minix/config.h usability... no

+checking minix/config.h presence... no

+checking for minix/config.h... no

+checking whether it is safe to define __EXTENSIONS__... yes

+checking whether gcc needs -traditional... no

+checking for a sed that does not truncate output... /bin/sed

+checking for ld used by gcc... /usr/bin/ld

+checking if the linker (/usr/bin/ld) is GNU ld... no

+checking for /usr/bin/ld option to reload object files... -r

+checking for BSD-compatible nm... /bin/nm -B

+checking whether ln -s works... yes

+checking how to recognize dependent libraries... pass_all

+checking dlfcn.h usability... yes

+checking dlfcn.h presence... yes

+checking for dlfcn.h... yes

+checking for g++... g++

+checking whether we are using the GNU C++ compiler... yes

+checking whether g++ accepts -g... yes

+checking dependency style of g++... gcc3

+checking how to run the C++ preprocessor... g++ -E

+checking for g77... no

+checking for xlf... no

+checking for f77... no

+checking for frt... no

+checking for pgf77... no

+checking for cf77... no

+checking for fort77... no

+checking for fl32... no

+checking for af77... no

+checking for xlf90... no

+checking for f90... no

+checking for pgf90... no

+checking for pghpf... no

+checking for epcf90... no

+checking for gfortran... no

+checking for g95... no

+checking for xlf95... no

+checking for f95... no

+checking for fort... no

+checking for ifort... no

+checking for ifc... no

+checking for efc... no

+checking for pgf95... no

+checking for lf95... no

+checking for ftn... no

+checking whether we are using the GNU Fortran 77 compiler... no

+checking whether  accepts -g... no

+checking the maximum length of command line arguments... 786432

+checking command to parse /bin/nm -B output from gcc object... ok

+checking for objdir... .libs

+checking for ar... ar

+checking for ranlib... (cached) ranlib

+checking for strip... strip

+checking if gcc supports -fno-rtti -fno-exceptions... no

+checking for gcc option to produce PIC... 

+checking if gcc static flag -static works... no

+checking if gcc supports -c -o file.o... yes

+checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes

+checking dynamic linker characteristics... aix5.3.0.0 ld.so

+checking how to hardcode library paths into programs... immediate

+checking whether stripping libraries is possible... no

+checking if libtool supports shared libraries... yes

+checking whether to build shared libraries... yes

+checking whether to build static libraries... no

+configure: creating libtool

+appending configuration tag "CXX" to libtool

+checking for ld used by g++... /usr/bin/ld

+checking if the linker (/usr/bin/ld) is GNU ld... no

+checking whether the g++ linker (/usr/bin/ld) supports shared libraries... yes

+checking for g++ option to produce PIC... 

+checking if g++ static flag -static works... no

+checking if g++ supports -c -o file.o... yes

+checking whether the g++ linker (/usr/bin/ld) supports shared libraries... yes

+checking dynamic linker characteristics... aix5.3.0.0 ld.so

+(cached) (cached) checking how to hardcode library paths into programs... immediate

+appending configuration tag "F77" to libtool

+checking whether gcc and cc understand -c and -o together... yes

+checking for error_at_line... no

+checking for special C compiler options needed for large files... no

+checking for _FILE_OFFSET_BITS value needed for large files... unknown

+checking for _LARGE_FILES value needed for large files... 1

+checking for working strtod... yes

+checking for python... /bin/python

+checking for sh... /bin/sh

+checking for perl... /bin/perl

+checking for libgnutls-config... no

+checking for hostname... /bin/hostname

+checking for basename... /bin/basename

+checking for main in -ldce... no

+checking for main in -lnsl... yes

+checking for socket in -lsocket... no

+checking for main in -lresolv... no

+checking math.h usability... yes

+checking math.h presence... yes

+checking for math.h... yes

+checking for floor in -lm... yes

+checking for plan_tests in -ltap... no

+checking for main in -lcrypt... yes

+checking for PQsetdbLogin in -lpq... no

+configure: WARNING: Skipping PostgreSQL plugin (check_pgsql)

+configure: WARNING: LIBS="-lcrypt " CPPFLAGS=""

+configure: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS).

+checking for rc_read_config in -lradiusclient... no

+checking for rc_read_config in -lradiusclient-ng... no

+configure: WARNING: Skipping radius plugin

+configure: WARNING: install radius libs to compile this plugin (see REQUIREMENTS).

+checking for main in -lldap... yes

+checking for ldap_set_option... yes

+checking for ldap_init... yes

+checking for ldap_set_option... (cached) yes

+checking for ldap_get_option... yes

+checking for ldap_start_tls_s... yes

+checking linux/hdreg.h usability... no

+checking linux/hdreg.h presence... no

+checking for linux/hdreg.h... no

+configure: WARNING: Skipping check_ide_smart plugin.

+configure: WARNING: check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.

+checking for mysql_config... no

+configure: WARNING: Skipping mysql plugin

+configure: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS).

+checking for IPv6 support... yes

+checking krb5.h usability... no

+checking krb5.h presence... no

+checking for krb5.h... no

+checking krb5.h usability... no

+checking krb5.h presence... no

+checking for krb5.h... no

+checking for dlopen in -ldl... yes

+checking for shl_load in -ldl... no

+checking openssl/ssl.h usability... yes

+checking openssl/ssl.h presence... yes

+checking for openssl/ssl.h... yes

+checking openssl/x509.h usability... yes

+checking openssl/x509.h presence... yes

+checking for openssl/x509.h... yes

+checking openssl/rsa.h usability... yes

+checking openssl/rsa.h presence... yes

+checking for openssl/rsa.h... yes

+checking openssl/pem.h usability... yes

+checking openssl/pem.h presence... yes

+checking for openssl/pem.h... yes

+checking openssl/crypto.h usability... yes

+checking openssl/crypto.h presence... yes

+checking for openssl/crypto.h... yes

+checking openssl/err.h usability... yes

+checking openssl/err.h presence... yes

+checking for openssl/err.h... yes

+checking for CRYPTO_lock in -lcrypto... yes

+checking for main in -lssl... yes

+checking whether time.h and sys/time.h may both be included... yes

+checking for sys/wait.h that is POSIX.1 compatible... yes

+checking signal.h usability... yes

+checking signal.h presence... yes

+checking for signal.h... yes

+checking syslog.h usability... yes

+checking syslog.h presence... yes

+checking for syslog.h... yes

+checking uio.h usability... no

+checking uio.h presence... no

+checking for uio.h... no

+checking errno.h usability... yes

+checking errno.h presence... yes

+checking for errno.h... yes

+checking sys/time.h usability... yes

+checking sys/time.h presence... yes

+checking for sys/time.h... yes

+checking sys/socket.h usability... yes

+checking sys/socket.h presence... yes

+checking for sys/socket.h... yes

+checking sys/un.h usability... yes

+checking sys/un.h presence... yes

+checking for sys/un.h... yes

+checking sys/poll.h usability... yes

+checking sys/poll.h presence... yes

+checking for sys/poll.h... yes

+checking features.h usability... no

+checking features.h presence... no

+checking for features.h... no

+checking stdarg.h usability... yes

+checking stdarg.h presence... yes

+checking for stdarg.h... yes

+checking sys/unistd.h usability... no

+checking sys/unistd.h presence... no

+checking for sys/unistd.h... no

+checking ctype.h usability... yes

+checking ctype.h presence... yes

+checking for ctype.h... yes

+checking for an ANSI C-conforming const... yes

+checking whether struct tm is in sys/time.h or time.h... time.h

+checking for pid_t... yes

+checking for size_t... yes

+checking return type of signal handlers... void

+checking for va_copy... yes

+checking for memmove... yes

+checking for select... yes

+checking for socket... yes

+checking for strdup... yes

+checking for strstr... yes

+checking for strtol... yes

+checking for strtoul... yes

+checking for floor... no

+checking for poll... yes

+checking return type of socket size... int

+checking for ps... /bin/ps

+checking for ps syntax... /bin/ps -eo 'stat uid pid ppid vsz pcpu comm args' - with no RSS

+checking for ping... /etc/ping

+checking for ping6... no

+checking for ICMP ping syntax... /etc/ping -n -c %d %s

+checking for ICMPv6 ping syntax... none

+checking for nslookup... /bin/nslookup

+checking for nslookup syntax... /bin/nslookup

+checking for number of cpus... sysconf(_SC_NPROCESSORS_CONF)

+checking for uptime... /bin/uptime

+checking for rpcinfo... /bin/rpcinfo

+checking for lmstat... no

+configure: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses

+checking for smbclient... no

+configure: WARNING: Get smbclient from Samba.org to monitor SMB shares

+checking for who... /bin/who

+checking for snmpget... no

+configure: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins

+checking for snmpgetnext... no

+configure: WARNING: Tried /bin/perl - install Net::SNMP perl module if you want to use the perl snmp plugins

+checking for quakestat... no

+checking for qstat... no

+configure: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin

+checking for fping... no

+configure: WARNING: Get fping from http://www.fping.com in order to make check_fping plugin

+checking for ssh... /bin/ssh

+checking for mailq... no

+configure: WARNING: Could not find mailq or eqivalent

+checking for qmail-qstat... no

+configure: WARNING: Could not find qmail-qstat or eqivalent

+checking for swap... no

+checking for swapinfo... no

+checking for lsps... no

+checking for sys/stat.h... (cached) yes

+checking sys/param.h usability... yes

+checking sys/param.h presence... yes

+checking for sys/param.h... yes

+checking for sys/swap.h... no

+checking whether swapctl is declared... no

+checking for swaptbl_t... no

+checking for swapent_t... no

+checking for struct swapent.se_nblks... no

+checking for /proc/meminfo... no

+checking for dig... /bin/dig

+checking for apt-get... no

+checking sys/sockio.h usability... no

+checking sys/sockio.h presence... no

+checking for sys/sockio.h... no

+checking whether NLS is requested... yes

+checking for msgfmt... /bin/msgfmt

+checking for gmsgfmt... /bin/msgfmt

+checking for xgettext... no

+checking for msgmerge... no

+checking for ld used by GCC... /usr/bin/ld

+checking if the linker (/usr/bin/ld) is GNU ld... no

+checking for shared library run path origin... done

+checking for CFPreferencesCopyAppValue... no

+checking for CFLocaleCopyCurrent... no

+checking for GNU gettext in libc... no

+checking for iconv... yes

+checking for working iconv... no

+checking for GNU gettext in libintl... yes

+checking whether to use NLS... yes

+checking where the gettext function comes from... external libintl

+checking how to link with libintl... /lib/libintl.a

+checking for main in -lpthread... yes

+checking for working alloca.h... yes

+checking for alloca... yes

+checking arpa/inet.h usability... yes

+checking arpa/inet.h presence... yes

+checking for arpa/inet.h... yes

+checking for errno.h... (cached) yes

+checking fcntl.h usability... yes

+checking fcntl.h presence... yes

+checking for fcntl.h... yes

+checking float.h usability... yes

+checking float.h presence... yes

+checking for float.h... yes

+checking for sys/param.h... (cached) yes

+checking sys/vfs.h usability... yes

+checking sys/vfs.h presence... yes

+checking for sys/vfs.h... yes

+checking sys/fs_types.h usability... no

+checking sys/fs_types.h presence... no

+checking for sys/fs_types.h... no

+checking for sys/socket.h... (cached) yes

+checking netdb.h usability... yes

+checking netdb.h presence... yes

+checking for netdb.h... yes

+checking netinet/in.h usability... yes

+checking netinet/in.h presence... yes

+checking for netinet/in.h... yes

+checking for math.h... (cached) yes

+checking for unistd.h... (cached) yes

+checking sys/statvfs.h usability... yes

+checking sys/statvfs.h presence... yes

+checking for sys/statvfs.h... yes

+checking locale.h usability... yes

+checking locale.h presence... yes

+checking for locale.h... yes

+checking for stdint.h... (cached) yes

+checking wchar.h usability... yes

+checking wchar.h presence... yes

+checking for wchar.h... yes

+checking stdio.h usability... yes

+checking stdio.h presence... yes

+checking for stdio.h... yes

+checking for stdlib.h... (cached) yes

+checking for string.h... (cached) yes

+checking time.h usability... yes

+checking time.h presence... yes

+checking for time.h... yes

+checking for sys/time.h... (cached) yes

+checking wctype.h usability... yes

+checking wctype.h presence... yes

+checking for wctype.h... yes

+checking whether the preprocessor supports include_next... yes

+checking for inline... inline

+checking for C/C++ restrict keyword... __restrict

+checking for btowc... yes

+checking for mbsinit... yes

+checking for mbrtowc... yes

+checking for alarm... yes

+checking for isblank... yes

+checking for iswctype... yes

+checking for wcscoll... yes

+checking for pipe... yes

+checking for vasnprintf... no

+checking for wcrtomb... yes

+checking for iswcntrl... yes

+checking for nl_langinfo and CODESET... yes

+checking for a traditional french locale... none

+checking whether system is Windows or MSDOS... no

+checking whether // is distinct from /... no

+checking for complete errno.h... yes

+checking whether strerror_r is declared... yes

+checking for strerror_r... yes

+checking whether strerror_r returns char *... no

+checking whether <sys/socket.h> is self-contained... yes

+checking for shutdown... yes

+checking whether <sys/socket.h> defines the SHUT_* macros... yes

+checking for struct sockaddr_storage... yes

+checking for library containing gethostbyname... none required

+checking for gethostbyname... yes

+checking for library containing getservbyname... none required

+checking for getservbyname... yes

+checking for IPv4 sockets... yes

+checking for IPv6 sockets... yes

+checking getopt.h usability... no

+checking getopt.h presence... no

+checking for getopt.h... no

+checking whether getenv is declared... yes

+checking whether getc_unlocked is declared... yes

+checking whether we are using the GNU C Library 2.1 or newer... no

+checking whether malloc, realloc, calloc are POSIX compliant... yes

+checking for mbstate_t... yes

+checking for a traditional japanese locale... none

+checking for a transitional chinese locale... none

+checking for a french Unicode locale... none

+checking for ssize_t... yes

+checking whether snprintf is declared... yes

+checking for stdbool.h that conforms to C99... yes

+checking for _Bool... yes

+checking for long long int... yes

+checking for unsigned long long int... yes

+checking whether strdup is declared... yes

+checking for working strerror function... yes

+checking whether strndup is declared... yes

+checking whether strnlen is declared... yes

+checking for struct timespec in <time.h>... yes

+checking for wchar_t... yes

+checking for wint_t... yes

+checking for inttypes.h... yes

+checking for stdint.h... yes

+checking for intmax_t... yes

+checking for snprintf... yes

+checking for strnlen... yes

+checking for wcslen... yes

+checking for wcsnlen... yes

+checking for mbrtowc... (cached) yes

+checking for wcrtomb... (cached) yes

+checking whether _snprintf is declared... no

+checking whether vsnprintf is declared... yes

+checking for alloca as a compiler built-in... yes

+checking for a thread-safe mkdir -p... build-aux/install-sh -c -d

+checking whether btowc(EOF) is correct... guessing yes

+checking whether // is distinct from /... (cached) no

+checking for error_at_line... (cached) no

+checking for working fcntl.h... no (bad O_NOATIME, O_NOFOLLOW)

+checking whether floorf is declared... yes

+checking for sys/mount.h... no

+configure: checking how to get file system space usage

+checking for statvfs function (SVR4)... yes

+checking dustat.h usability... no

+checking dustat.h presence... no

+checking for dustat.h... no

+checking sys/fs/s5param.h usability... no

+checking sys/fs/s5param.h presence... no

+checking for sys/fs/s5param.h... no

+checking sys/filsys.h usability... yes

+checking sys/filsys.h presence... yes

+checking for sys/filsys.h... yes

+checking sys/statfs.h usability... yes

+checking sys/statfs.h presence... yes

+checking for sys/statfs.h... yes

+checking for statfs that truncates block counts... no

+configure: checking how to do getaddrinfo, freeaddrinfo and getnameinfo

+checking for library containing getaddrinfo... none required

+checking for getaddrinfo... yes

+checking for gai_strerror (possibly via ws2tcpip.h)... yes

+checking for struct sockaddr.sa_len... yes

+checking whether getaddrinfo is declared... yes

+checking whether freeaddrinfo is declared... yes

+checking whether gai_strerror is declared... yes

+checking whether getnameinfo is declared... yes

+checking for struct addrinfo... yes

+checking for gethostname... yes

+checking for getloadavg... no

+checking for pstat_getdynamic... no

+checking for kstat_open in -lkstat... no

+checking for perfstat_cpu_total in -lperfstat... yes

+checking for getloadavg... no

+checking sys/dg_sys_info.h usability... no

+checking sys/dg_sys_info.h presence... no

+checking for sys/dg_sys_info.h... no

+checking inq_stats/cpustats.h usability... no

+checking inq_stats/cpustats.h presence... no

+checking for inq_stats/cpustats.h... no

+checking sys/cpustats.h usability... no

+checking sys/cpustats.h presence... no

+checking for sys/cpustats.h... no

+checking mach/mach.h usability... no

+checking mach/mach.h presence... no

+checking for mach/mach.h... no

+checking nlist.h usability... yes

+checking nlist.h presence... yes

+checking for nlist.h... yes

+checking for struct nlist.n_un.n_name... no

+checking whether getloadavg requires setgid... no

+checking sys/loadavg.h usability... no

+checking sys/loadavg.h presence... no

+checking for sys/loadavg.h... no

+checking whether getloadavg is declared... no

+checking for library containing gethostbyname... (cached) none required

+checking for gethostbyname... (cached) yes

+checking for library containing inet_ntop... none required

+checking whether inet_ntop is declared... yes

+checking whether the compiler generally respects inline... yes

+checking for stdlib.h... (cached) yes

+checking for GNU libc compatible malloc... no

+checking whether NAN macro works... yes

+checking whether HUGE_VAL works... yes

+checking whether mbrtowc handles incomplete characters... guessing yes

+checking whether mbrtowc works as well as mbtowc... guessing yes

+checking whether mbrtowc handles a NULL string argument... guessing yes

+checking whether mbrtowc has a correct return value... guessing yes

+checking whether mbrtowc returns 0 when parsing a NUL character... guessing yes

+checking whether mbrtowc handles incomplete characters... (cached) guessing yes

+checking whether mbrtowc works as well as mbtowc... (cached) guessing yes

+checking for working mktime... no

+checking for listmntent... no

+checking for getmntinfo... no

+checking for sys/ucred.h... no

+checking for sys/mount.h... (cached) no

+checking mntent.h usability... yes

+checking mntent.h presence... yes

+checking for mntent.h... yes

+checking for sys/fs_types.h... (cached) no

+checking for struct fsstat.f_fstypename... no

+checking for library containing getmntent... none required

+checking for getmntent... yes

+checking for listmntent of Cray/Unicos-9... no

+checking for mntctl function and struct vmount... yes

+checking sys/mntent.h usability... no

+checking sys/mntent.h presence... no

+checking for sys/mntent.h... no

+checking for struct statfs.f_fstypename... no

+checking whether <netinet/in.h> is self-contained... yes

+checking for a thread-safe mkdir -p... build-aux/install-sh -c -d

+checking whether open recognizes a trailing slash... no

+checking for working re_compile_pattern... no

+checking libintl.h usability... yes

+checking libintl.h presence... yes

+checking for libintl.h... yes

+checking whether isblank is declared... yes

+checking for library containing getservbyname... (cached) none required

+checking for getservbyname... (cached) yes

+checking for stdint.h... (cached) yes

+checking for SIZE_MAX... yes

+checking for snprintf... (cached) yes

+checking whether snprintf respects a size of 1... yes

+checking for socklen_t... yes

+checking for ssize_t... (cached) yes

+checking whether stdint.h conforms to C99... no

+checking sys/inttypes.h usability... yes

+checking sys/inttypes.h presence... yes

+checking for sys/inttypes.h... yes

+checking sys/bitypes.h usability... no

+checking sys/bitypes.h presence... no

+checking for sys/bitypes.h... no

+checking for bit size of ptrdiff_t... 32

+checking for bit size of size_t... 32

+checking for bit size of sig_atomic_t... 32

+checking for bit size of wchar_t... 16

+checking for bit size of wint_t... 32

+checking whether sig_atomic_t is signed... yes

+checking whether wchar_t is signed... no

+checking whether wint_t is signed... yes

+checking for ptrdiff_t integer literal suffix... l

+checking for size_t integer literal suffix... ul

+checking for sig_atomic_t integer literal suffix... 

+checking for wchar_t integer literal suffix... no

+checking for wint_t integer literal suffix... 

+checking for random.h... no

+checking for struct random_data... no

+checking for strdup... (cached) yes

+checking for working strndup... yes

+checking for working strnlen... yes

+checking whether <sys/socket.h> is self-contained... (cached) yes

+checking for shutdown... (cached) yes

+checking whether <sys/socket.h> defines the SHUT_* macros... (cached) yes

+checking for struct sockaddr_storage... (cached) yes

+checking for a thread-safe mkdir -p... build-aux/install-sh -c -d

+checking whether localtime_r is compatible with its POSIX signature... yes

+checking for ptrdiff_t... yes

+checking for vasprintf... no

+checking for vsnprintf... yes

+checking whether snprintf respects a size of 1... (cached) yes

+checking whether <wchar.h> is standalone... yes

+checking whether mbrtowc handles incomplete characters... (cached) guessing yes

+checking whether mbrtowc works as well as mbtowc... (cached) guessing yes

+checking whether wcrtomb return value is correct... guessing yes

+checking whether iswcntrl works... yes

+checking for stdint.h... (cached) yes

+configure: creating ./config.status

+config.status: creating gl/Makefile

+config.status: creating Makefile

+config.status: creating tap/Makefile

+config.status: creating lib/Makefile

+config.status: creating plugins/Makefile

+config.status: creating lib/tests/Makefile

+config.status: creating plugins-root/Makefile

+config.status: creating plugins-scripts/Makefile

+config.status: creating plugins-scripts/subst

+config.status: creating plugins-scripts/utils.pm

+config.status: creating plugins-scripts/utils.sh

+config.status: creating perlmods/Makefile

+config.status: creating command.cfg

+config.status: creating test.pl

+config.status: creating pkg/solaris/pkginfo

+config.status: creating po/Makefile.in

+config.status: creating config.h

+config.status: config.h is unchanged

+config.status: executing depfiles commands

+config.status: executing po-directories commands

+config.status: creating po/POTFILES

+config.status: creating po/Makefile

+            --with-apt-get-command: 

+              --with-ping6-command: 

+               --with-ping-command: /etc/ping -n -c %d %s

+                       --with-ipv6: yes

+                      --with-mysql: no

+                    --with-openssl: yes

+                     --with-gnutls: no

+               --enable-extra-opts: no

+                       --with-perl: /bin/perl

+             --enable-perl-modules: no

+                     --with-cgiurl: /nagios/cgi-bin

+               --with-trusted-path: /bin:/sbin:/usr/bin:/usr/sbin

+                   --enable-libtap: no

+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# make

+        make  all-recursive

+Making all in gl

+        rm -f configmake.h-t

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  echo '#define PREFIX "/usr/local/nagios"';  echo '#define EXEC_PREFIX "/usr/local/nagios"';  echo '#define BINDIR "/usr/local/nagios/bin"';  echo '#define SBINDIR "/usr/local/nagios/sbin"';  echo '#define LIBEXECDIR "/usr/local/nagios/libexec"';  echo '#define DATAROOTDIR "/usr/local/nagios/share"';  echo '#define DATADIR "/usr/local/nagios/share"';  echo '#define SYSCONFDIR "/usr/local/nagios/etc"';  echo '#define SHAREDSTATEDIR "/usr/local/nagios/com"';  echo '#define LOCALSTATEDIR "/usr/local/nagios/var"';  echo '#define INCLUDEDIR "/usr/local/nagios/include"';  echo '#define OLDINCLUDEDIR "/usr/include"';  echo '#define DOCDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define INFODIR "/usr/local/nagios/share/info"';  echo '#define HTMLDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define DVIDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define PDFDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define PSDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define LIBDIR "/usr/local/nagios/lib"';  echo '#define LISPDIR ""';  echo '#define LOCALEDIR "/usr/local/nagios/share/locale"';  echo '#define MANDIR "/usr/local/nagios/share/man"';  echo '#define MANEXT ""';  echo '#define PKGDATADIR "/usr/local/nagios/share/nagios-plugins"';  echo '#define PKGINCLUDEDIR "/usr/local/nagios/include/nagios-plugins"';  echo '#define PKGLIBDIR "/usr/local/nagios/lib/nagios-plugins"';  echo '#define PKGLIBEXECDIR ""';  } | sed '/""/d' > configmake.h-t

+        if test -f configmake.h && cmp configmake.h-t configmake.h > /dev/null; then  rm -f configmake.h-t;  else  rm -f configmake.h; mv configmake.h-t configmake.h;  fi

+        make  all-recursive

+        rm -f configmake.h-t

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  echo '#define PREFIX "/usr/local/nagios"';  echo '#define EXEC_PREFIX "/usr/local/nagios"';  echo '#define BINDIR "/usr/local/nagios/bin"';  echo '#define SBINDIR "/usr/local/nagios/sbin"';  echo '#define LIBEXECDIR "/usr/local/nagios/libexec"';  echo '#define DATAROOTDIR "/usr/local/nagios/share"';  echo '#define DATADIR "/usr/local/nagios/share"';  echo '#define SYSCONFDIR "/usr/local/nagios/etc"';  echo '#define SHAREDSTATEDIR "/usr/local/nagios/com"';  echo '#define LOCALSTATEDIR "/usr/local/nagios/var"';  echo '#define INCLUDEDIR "/usr/local/nagios/include"';  echo '#define OLDINCLUDEDIR "/usr/include"';  echo '#define DOCDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define INFODIR "/usr/local/nagios/share/info"';  echo '#define HTMLDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define DVIDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define PDFDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define PSDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define LIBDIR "/usr/local/nagios/lib"';  echo '#define LISPDIR ""';  echo '#define LOCALEDIR "/usr/local/nagios/share/locale"';  echo '#define MANDIR "/usr/local/nagios/share/man"';  echo '#define MANEXT ""';  echo '#define PKGDATADIR "/usr/local/nagios/share/nagios-plugins"';  echo '#define PKGINCLUDEDIR "/usr/local/nagios/include/nagios-plugins"';  echo '#define PKGLIBDIR "/usr/local/nagios/lib/nagios-plugins"';  echo '#define PKGLIBEXECDIR ""';  } | sed '/""/d' > configmake.h-t

+        if test -f configmake.h && cmp configmake.h-t configmake.h > /dev/null; then  rm -f configmake.h-t;  else  rm -f configmake.h; mv configmake.h-t configmake.h;  fi

+Target "all-am" is up to date.

+Making all in tap

+Target "all" is up to date.

+Making all in lib

+Making all in .

+Target "all-am" is up to date.

+Making all in tests

+Target "all" is up to date.

+Target "all" is up to date.

+Making all in plugins

+Target "all" is up to date.

+Making all in plugins-scripts

+Target "all" is up to date.

+Making all in plugins-root

+Target "all" is up to date.

+Making all in po

+Target "all" is up to date.

+Target "all-am" is up to date.

+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# make clean

+Making clean in po

+        rm -f remove-potcdate.sed

+        rm -f stamp-poT

+        rm -f core core.* nagios-plugins.po nagios-plugins.1po nagios-plugins.2po *.new.po

+        rm -fr *.o

+Target "clean" is up to date.

+Making clean in plugins-root

+        rm -rf .libs _libs

+        rm -f NP-VERSION-FILE

+ rm -f check_dhcp check_dhcp

+ rm -f check_icmp check_icmp

+        rm -f *.o

+        rm -f *.lo

+Target "clean" is up to date.

+Making clean in plugins-scripts

+        test -z "check_breeze check_disk_smb check_flexlm check_ircd  check_log check_oracle check_rpc check_sensors check_wave  check_ifstatus check_ifoperstatus check_mailq check_file_age  utils.sh utils.pm" || rm -f check_breeze check_disk_smb check_flexlm check_ircd  check_log check_oracle check_rpc check_sensors check_wave  check_ifstatus check_ifoperstatus check_mailq check_file_age  utils.sh utils.pm

+        rm -rf .libs _libs

+        rm -f NP-VERSION-FILE

+        rm -f *.lo

+Target "clean" is up to date.

+Making clean in plugins

+ rm -f check_apt check_apt

+ rm -f check_cluster check_cluster

+ rm -f check_disk check_disk

+ rm -f check_dummy check_dummy

+ rm -f check_http check_http

+ rm -f check_load check_load

+ rm -f check_mrtg check_mrtg

+ rm -f check_mrtgtraf check_mrtgtraf

+ rm -f check_ntp check_ntp

+ rm -f check_ntp_peer check_ntp_peer

+ rm -f check_nwstat check_nwstat

+ rm -f check_overcr check_overcr

+ rm -f check_ping check_ping

+ rm -f check_real check_real

+ rm -f check_smtp check_smtp

+ rm -f check_ssh check_ssh

+ rm -f check_tcp check_tcp

+ rm -f check_time check_time

+ rm -f check_ntp_time check_ntp_time

+ rm -f check_ups check_ups

+ rm -f check_users check_users

+ rm -f negate negate

+ rm -f urlize urlize

+ rm -f check_ldap check_ldap

+ rm -f check_procs check_procs

+ rm -f check_nagios check_nagios

+ rm -f check_dns check_dns

+ rm -f check_by_ssh check_by_ssh

+ rm -f check_dig check_dig

+ rm -f check_nt check_nt

+        rm -rf .libs _libs

+        rm -f check_ftp check_imap check_nntp check_pop  check_udp check_clamd check_simap check_spop check_jabber check_nntps check_ssmtp

+        rm -f NP-VERSION-FILE

+        rm -f *.o

+        rm -f *.lo

+Target "clean" is up to date.

+Making clean in lib

+Making clean in tests

+        rm -rf .libs _libs

+        rm -f *.o

+        rm -f *.lo

+Target "clean" is up to date.

+Making clean in .

+        rm -rf .libs _libs

+        test -z "libnagiosplug.a" || rm -f libnagiosplug.a

+        rm -f *.o

+        rm -f *.lo

+Target "clean-am" is up to date.

+Target "clean" is up to date.

+Making clean in tap

+        rm -rf .libs _libs

+        test -z "" || rm -f 

+        rm -f *.o

+        rm -f *.lo

+Target "clean" is up to date.

+Making clean in gl

+Making clean in .

+        test -z "configmake.h configmake.h-t charset.alias ref-add.sed  ref-del.sed" || rm -f configmake.h configmake.h-t charset.alias ref-add.sed  ref-del.sed

+        rm -rf .libs _libs

+        test -z "libgnu.a" || rm -f libgnu.a

+        test -z "" || rm -f 

+        rm -f *.o

+        test -z "core *.stackdump alloca.h alloca.h-t arpa/inet.h  arpa/inet.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h  float.h-t getopt.h getopt.h-t math.h math.h-t netdb.h  netdb.h-t netinet/in.h netinet/in.h-t stdbool.h stdbool.h-t  stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t  string.h string.h-t sys/socket.h sys/socket.h-t time.h  time.h-t unistd.h unistd.h-t wchar.h wchar.h-t wctype.h  wctype.h-t" || rm -f core *.stackdump alloca.h alloca.h-t arpa/inet.h  arpa/inet.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h  float.h-t getopt.h getopt.h-t math.h math.h-t netdb.h  netdb.h-t netinet/in.h netinet/in.h-t stdbool.h stdbool.h-t  stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t  string.h string.h-t sys/socket.h sys/socket.h-t time.h  time.h-t unistd.h unistd.h-t wchar.h wchar.h-t wctype.h  wctype.h-t

+        rm -f *.lo

+rmdir arpa

+Target "clean-am" is up to date.

+Target "clean" is up to date.

+Making clean in .

+        rm -rf .libs _libs

+        rm -f *.lo

+Target "clean-am" is up to date.

+Target "clean" is up to date.

+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# make

+        make  all-recursive

+Making all in gl

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  cat ./alloca.in.h;  } > alloca.h-t

+        mv -f alloca.h-t alloca.h

+        ../build-aux/install-sh -c -d arpa

+        rm -f arpa/inet.h-t arpa/inet.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_ARPA_INET_H''@|<arpa/inet.h>|g'  -e 's|@''HAVE_ARPA_INET_H''@|1|g'  -e 's|@''GNULIB_INET_NTOP''@|1|g'  -e 's|@''GNULIB_INET_PTON''@|0|g'  -e 's|@''HAVE_DECL_INET_NTOP''@|1|g'  -e 's|@''HAVE_DECL_INET_PTON''@|1|g'  -e '/definition of GL_LINK_WARNING/r ../build-aux/link-warning.h'  < ./arpa_inet.in.h;  } > arpa/inet.h-t

+        mv arpa/inet.h-t arpa/inet.h

+        rm -f configmake.h-t

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  echo '#define PREFIX "/usr/local/nagios"';  echo '#define EXEC_PREFIX "/usr/local/nagios"';  echo '#define BINDIR "/usr/local/nagios/bin"';  echo '#define SBINDIR "/usr/local/nagios/sbin"';  echo '#define LIBEXECDIR "/usr/local/nagios/libexec"';  echo '#define DATAROOTDIR "/usr/local/nagios/share"';  echo '#define DATADIR "/usr/local/nagios/share"';  echo '#define SYSCONFDIR "/usr/local/nagios/etc"';  echo '#define SHAREDSTATEDIR "/usr/local/nagios/com"';  echo '#define LOCALSTATEDIR "/usr/local/nagios/var"';  echo '#define INCLUDEDIR "/usr/local/nagios/include"';  echo '#define OLDINCLUDEDIR "/usr/include"';  echo '#define DOCDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define INFODIR "/usr/local/nagios/share/info"';  echo '#define HTMLDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define DVIDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define PDFDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define PSDIR "/usr/local/nagios/share/doc/nagios-plugins"';  echo '#define LIBDIR "/usr/local/nagios/lib"';  echo '#define LISPDIR ""';  echo '#define LOCALEDIR "/usr/local/nagios/share/locale"';  echo '#define MANDIR "/usr/local/nagios/share/man"';  echo '#define MANEXT ""';  echo '#define PKGDATADIR "/usr/local/nagios/share/nagios-plugins"';  echo '#define PKGINCLUDEDIR "/usr/local/nagios/include/nagios-plugins"';  echo '#define PKGLIBDIR "/usr/local/nagios/lib/nagios-plugins"';  echo '#define PKGLIBEXECDIR ""';  } | sed '/""/d' > configmake.h-t

+        if test -f configmake.h && cmp configmake.h-t configmake.h > /dev/null; then  rm -f configmake.h-t;  else  rm -f configmake.h; mv configmake.h-t configmake.h;  fi

+        rm -f fcntl.h-t fcntl.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_FCNTL_H''@|<fcntl.h>|g'  -e 's|@''GNULIB_OPEN''@|1|g'  -e 's|@''REPLACE_OPEN''@|1|g'  < ./fcntl.in.h;  } > fcntl.h-t

+        mv fcntl.h-t fcntl.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  cat ./getopt.in.h;  } > getopt.h-t

+        mv -f getopt.h-t getopt.h

+        rm -f math.h-t math.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' &&  sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_MATH_H''@|<math.h>|g'  -e 's|@''GNULIB_CEILF''@|0|g'  -e 's|@''GNULIB_CEILL''@|0|g'  -e 's|@''GNULIB_FLOORF''@|1|g'  -e 's|@''GNULIB_FLOORL''@|0|g'  -e 's|@''GNULIB_FREXP''@|0|g'  -e 's|@''GNULIB_FREXPL''@|0|g'  -e 's|@''GNULIB_ISFINITE''@|0|g'  -e 's|@''GNULIB_ISINF''@|0|g'  -e 's|@''GNULIB_ISNAN''@|0|g'  -e 's|@''GNULIB_ISNANF''@|0|g'  -e 's|@''GNULIB_ISNAND''@|0|g'  -e 's|@''GNULIB_ISNANL''@|0|g'  -e 's|@''GNULIB_LDEXPL''@|0|g'  -e 's|@''GNULIB_MATHL''@|0|g'  -e 's|@''GNULIB_ROUND''@|0|g'  -e 's|@''GNULIB_ROUNDF''@|0|g'  -e 's|@''GNULIB_ROUNDL''@|0|g'  -e 's|@''GNULIB_SIGNBIT''@|0|g'  -e 's|@''GNULIB_TRUNC''@|0|g'  -e 's|@''GNULIB_TRUNCF''@|0|g'  -e 's|@''GNULIB_TRUNCL''@|0|g'  -e 's|@''HAVE_ISNANF''@|1|g'  -e 's|@''HAVE_ISNAND''@|1|g'  -e 's|@''HAVE_ISNANL''@|1|g'  -e 's|@''HAVE_DECL_ACOSL''@|1|g'  -e 's|@''HAVE_DECL_ASINL''@|1|g'  -e 's|@''HAVE_DECL_ATANL''@|1|g'  -e 's|@''HAVE_DECL_COSL''@|1|g'  -e 's|@''HAVE_DECL_EXPL''@|1|g'  -e 's|@''HAVE_DECL_FREXPL''@|1|g'  -e 's|@''HAVE_DECL_LDEXPL''@|1|g'  -e 's|@''HAVE_DECL_LOGL''@|1|g'  -e 's|@''HAVE_DECL_SINL''@|1|g'  -e 's|@''HAVE_DECL_SQRTL''@|1|g'  -e 's|@''HAVE_DECL_TANL''@|1|g'  -e 's|@''HAVE_DECL_TRUNC''@|1|g'  -e 's|@''HAVE_DECL_TRUNCF''@|1|g'  -e 's|@''REPLACE_CEILF''@|0|g'  -e 's|@''REPLACE_CEILL''@|0|g'  -e 's|@''REPLACE_FLOORF''@|0|g'  -e 's|@''REPLACE_FLOORL''@|0|g'  -e 's|@''REPLACE_FREXP''@|0|g'  -e 's|@''REPLACE_FREXPL''@|0|g'  -e 's|@''REPLACE_HUGE_VAL''@|0|g'  -e 's|@''REPLACE_ISFINITE''@|0|g'  -e 's|@''REPLACE_ISINF''@|0|g'  -e 's|@''REPLACE_ISNAN''@|0|g'  -e 's|@''REPLACE_LDEXPL''@|0|g'  -e 's|@''REPLACE_NAN''@|0|g'  -e 's|@''REPLACE_ROUND''@|0|g'  -e 's|@''REPLACE_ROUNDF''@|0|g'  -e 's|@''REPLACE_ROUNDL''@|0|g'  -e 's|@''REPLACE_SIGNBIT''@|0|g'  -e 's|@''REPLACE_SIGNBIT_USING_GCC''@|0|g'  -e 's|@''REPLACE_TRUNCL''@|0|g'  -e '/definition of GL_LINK_WARNING/r ../build-aux/link-warning.h'  < ./math.in.h;  } > math.h-t

+        mv math.h-t math.h

+        rm -f netdb.h-t netdb.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_NETDB_H''@|<netdb.h>|g'  -e 's|@''HAVE_NETDB_H''@|1|g'  -e 's|@''GNULIB_GETADDRINFO''@|1|g'  -e 's|@''HAVE_STRUCT_ADDRINFO''@|1|g'  -e 's|@''HAVE_DECL_FREEADDRINFO''@|1|g'  -e 's|@''HAVE_DECL_GAI_STRERROR''@|1|g'  -e 's|@''HAVE_DECL_GETADDRINFO''@|1|g'  -e 's|@''HAVE_DECL_GETNAMEINFO''@|1|g'  < ./netdb.in.h;  } > netdb.h-t

+        mv netdb.h-t netdb.h

+        rm -f stdint.h-t stdint.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  sed -e 's/@''HAVE_STDINT_H''@/1/g'  -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_STDINT_H''@|<stdint.h>|g'  -e 's/@''HAVE_SYS_TYPES_H''@/1/g'  -e 's/@''HAVE_INTTYPES_H''@/1/g'  -e 's/@''HAVE_SYS_INTTYPES_H''@/1/g'  -e 's/@''HAVE_SYS_BITYPES_H''@/0/g'  -e 's/@''HAVE_LONG_LONG_INT''@/1/g'  -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/1/g'  -e 's/@''APPLE_UNIVERSAL_BUILD''@/0/g'  -e 's/@''BITSIZEOF_PTRDIFF_T''@/32/g'  -e 's/@''PTRDIFF_T_SUFFIX''@/l/g'  -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/32/g'  -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/1/g'  -e 's/@''SIG_ATOMIC_T_SUFFIX''@//g'  -e 's/@''BITSIZEOF_SIZE_T''@/32/g'  -e 's/@''SIZE_T_SUFFIX''@/ul/g'  -e 's/@''BITSIZEOF_WCHAR_T''@/16/g'  -e 's/@''HAVE_SIGNED_WCHAR_T''@/0/g'  -e 's/@''WCHAR_T_SUFFIX''@//g'  -e 's/@''BITSIZEOF_WINT_T''@/32/g'  -e 's/@''HAVE_SIGNED_WINT_T''@/1/g'  -e 's/@''WINT_T_SUFFIX''@//g'  < ./stdint.in.h;  } > stdint.h-t

+        mv stdint.h-t stdint.h

+        rm -f stdio.h-t stdio.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' &&  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_STDIO_H''@|<stdio.h>|g'  -e 's|@''GNULIB_FPRINTF''@|1|g'  -e 's|@''GNULIB_FPRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_PRINTF''@|1|g'  -e 's|@''GNULIB_PRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_SNPRINTF''@|1|g'  -e 's|@''GNULIB_SPRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_VFPRINTF''@|1|g'  -e 's|@''GNULIB_VFPRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_VPRINTF''@|1|g'  -e 's|@''GNULIB_VPRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_VSNPRINTF''@|1|g'  -e 's|@''GNULIB_VSPRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_DPRINTF''@|0|g'  -e 's|@''GNULIB_VDPRINTF''@|0|g'  -e 's|@''GNULIB_VASPRINTF''@|1|g'  -e 's|@''GNULIB_OBSTACK_PRINTF''@|0|g'  -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|0|g'  -e 's|@''GNULIB_FOPEN''@|0|g'  -e 's|@''GNULIB_FREOPEN''@|0|g'  -e 's|@''GNULIB_FSEEK''@|0|g'  -e 's|@''GNULIB_FSEEKO''@|0|g'  -e 's|@''GNULIB_FTELL''@|0|g'  -e 's|@''GNULIB_FTELLO''@|0|g'  -e 's|@''GNULIB_FFLUSH''@|0|g'  -e 's|@''GNULIB_FCLOSE''@|0|g'  -e 's|@''GNULIB_FPUTC''@|1|g'  -e 's|@''GNULIB_PUTC''@|1|g'  -e 's|@''GNULIB_PUTCHAR''@|1|g'  -e 's|@''GNULIB_FPUTS''@|1|g'  -e 's|@''GNULIB_PUTS''@|1|g'  -e 's|@''GNULIB_FWRITE''@|1|g'  -e 's|@''GNULIB_GETDELIM''@|0|g'  -e 's|@''GNULIB_GETLINE''@|0|g'  -e 's|@''GNULIB_PERROR''@|0|g'  -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|0|g'  -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g'  -e 's|@''REPLACE_FPRINTF''@|0|g'  -e 's|@''REPLACE_VFPRINTF''@|0|g'  -e 's|@''REPLACE_PRINTF''@|0|g'  -e 's|@''REPLACE_VPRINTF''@|0|g'  -e 's|@''REPLACE_SNPRINTF''@|0|g'  -e 's|@''HAVE_DECL_SNPRINTF''@|1|g'  -e 's|@''REPLACE_VSNPRINTF''@|0|g'  -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g'  -e 's|@''REPLACE_SPRINTF''@|0|g'  -e 's|@''REPLACE_VSPRINTF''@|0|g'  -e 's|@''HAVE_DPRINTF''@|1|g'  -e 's|@''REPLACE_DPRINTF''@|0|g'  -e 's|@''HAVE_VDPRINTF''@|1|g'  -e 's|@''REPLACE_VDPRINTF''@|0|g'  -e 's|@''HAVE_VASPRINTF''@|0|g'  -e 's|@''REPLACE_VASPRINTF''@|0|g'  -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g'  -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g'  -e 's|@''REPLACE_FOPEN''@|0|g'  -e 's|@''REPLACE_FREOPEN''@|0|g'  -e 's|@''REPLACE_FSEEKO''@|0|g'  -e 's|@''REPLACE_FSEEK''@|0|g'  -e 's|@''REPLACE_FTELLO''@|0|g'  -e 's|@''REPLACE_FTELL''@|0|g'  -e 's|@''REPLACE_FFLUSH''@|0|g'  -e 's|@''REPLACE_FCLOSE''@|0|g'  -e 's|@''HAVE_DECL_GETDELIM''@|1|g'  -e 's|@''HAVE_DECL_GETLINE''@|1|g'  -e 's|@''REPLACE_GETLINE''@|0|g'  -e 's|@''REPLACE_PERROR''@|0|g'  -e '/definition of GL_LINK_WARNING/r ../build-aux/link-warning.h'  < ./stdio.in.h;  } > stdio.h-t

+        mv stdio.h-t stdio.h

+        rm -f stdlib.h-t stdlib.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' &&  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_STDLIB_H''@|<stdlib.h>|g'  -e 's|@''HAVE_RANDOM_H''@|0|g'  -e 's|@''GNULIB_MALLOC_POSIX''@|1|g'  -e 's|@''GNULIB_REALLOC_POSIX''@|0|g'  -e 's|@''GNULIB_CALLOC_POSIX''@|0|g'  -e 's|@''GNULIB_ATOLL''@|0|g'  -e 's|@''GNULIB_GETLOADAVG''@|1|g'  -e 's|@''GNULIB_GETSUBOPT''@|0|g'  -e 's|@''GNULIB_MKDTEMP''@|0|g'  -e 's|@''GNULIB_MKSTEMP''@|0|g'  -e 's|@''GNULIB_PUTENV''@|0|g'  -e 's|@''GNULIB_RANDOM_R''@|0|g'  -e 's|@''GNULIB_RPMATCH''@|0|g'  -e 's|@''GNULIB_SETENV''@|0|g'  -e 's|@''GNULIB_STRTOD''@|0|g'  -e 's|@''GNULIB_STRTOLL''@|0|g'  -e 's|@''GNULIB_STRTOULL''@|0|g'  -e 's|@''GNULIB_UNSETENV''@|0|g'  -e 's|@''HAVE_ATOLL''@|1|g'  -e 's|@''HAVE_CALLOC_POSIX''@|1|g'  -e 's|@''HAVE_GETSUBOPT''@|1|g'  -e 's|@''HAVE_MALLOC_POSIX''@|1|g'  -e 's|@''HAVE_MKDTEMP''@|1|g'  -e 's|@''HAVE_REALLOC_POSIX''@|1|g'  -e 's|@''HAVE_RANDOM_R''@|1|g'  -e 's|@''HAVE_RPMATCH''@|1|g'  -e 's|@''HAVE_SETENV''@|1|g'  -e 's|@''HAVE_STRTOD''@|1|g'  -e 's|@''HAVE_STRTOLL''@|1|g'  -e 's|@''HAVE_STRTOULL''@|1|g'  -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|0|g'  -e 's|@''HAVE_SYS_LOADAVG_H''@|0|g'  -e 's|@''HAVE_UNSETENV''@|1|g'  -e 's|@''HAVE_DECL_GETLOADAVG''@|0|g'  -e 's|@''REPLACE_MKSTEMP''@|0|g'  -e 's|@''REPLACE_PUTENV''@|0|g'  -e 's|@''REPLACE_STRTOD''@|0|g'  -e 's|@''VOID_UNSETENV''@|0|g'  -e '/definition of GL_LINK_WARNING/r ../build-aux/link-warning.h'  < ./stdlib.in.h;  } > stdlib.h-t

+        mv stdlib.h-t stdlib.h

+        rm -f string.h-t string.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' &&  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_STRING_H''@|<string.h>|g'  -e 's|@''GNULIB_MBSLEN''@|0|g'  -e 's|@''GNULIB_MBSNLEN''@|0|g'  -e 's|@''GNULIB_MBSCHR''@|0|g'  -e 's|@''GNULIB_MBSRCHR''@|0|g'  -e 's|@''GNULIB_MBSSTR''@|0|g'  -e 's|@''GNULIB_MBSCASECMP''@|0|g'  -e 's|@''GNULIB_MBSNCASECMP''@|0|g'  -e 's|@''GNULIB_MBSPCASECMP''@|0|g'  -e 's|@''GNULIB_MBSCASESTR''@|0|g'  -e 's|@''GNULIB_MBSCSPN''@|0|g'  -e 's|@''GNULIB_MBSPBRK''@|0|g'  -e 's|@''GNULIB_MBSSPN''@|0|g'  -e 's|@''GNULIB_MBSSEP''@|0|g'  -e 's|@''GNULIB_MBSTOK_R''@|0|g'  -e 's|@''GNULIB_MEMMEM''@|0|g'  -e 's|@''GNULIB_MEMPCPY''@|0|g'  -e 's|@''GNULIB_MEMRCHR''@|0|g'  -e 's|@''GNULIB_RAWMEMCHR''@|0|g'  -e 's|@''GNULIB_STPCPY''@|0|g'  -e 's|@''GNULIB_STPNCPY''@|0|g'  -e 's|@''GNULIB_STRCHRNUL''@|0|g'  -e 's|@''GNULIB_STRDUP''@|1|g'  -e 's|@''GNULIB_STRNDUP''@|1|g'  -e 's|@''GNULIB_STRNLEN''@|1|g'  -e 's|@''GNULIB_STRPBRK''@|0|g'  -e 's|@''GNULIB_STRSEP''@|0|g'  -e 's|@''GNULIB_STRSTR''@|0|g'  -e 's|@''GNULIB_STRCASESTR''@|0|g'  -e 's|@''GNULIB_STRTOK_R''@|0|g'  -e 's|@''GNULIB_STRERROR''@|1|g'  -e 's|@''GNULIB_STRSIGNAL''@|0|g'  -e 's|@''GNULIB_STRVERSCMP''@|0|g'  -e 's|@''HAVE_DECL_MEMMEM''@|1|g'  -e 's|@''HAVE_MEMPCPY''@|1|g'  -e 's|@''HAVE_DECL_MEMRCHR''@|1|g'  -e 's|@''HAVE_RAWMEMCHR''@|1|g'  -e 's|@''HAVE_STPCPY''@|1|g'  -e 's|@''HAVE_STPNCPY''@|1|g'  -e 's|@''HAVE_STRCHRNUL''@|1|g'  -e 's|@''HAVE_DECL_STRDUP''@|1|g'  -e 's|@''HAVE_STRNDUP''@|1|g'  -e 's|@''HAVE_DECL_STRNDUP''@|1|g'  -e 's|@''HAVE_DECL_STRNLEN''@|1|g'  -e 's|@''HAVE_STRPBRK''@|1|g'  -e 's|@''HAVE_STRSEP''@|1|g'  -e 's|@''HAVE_STRCASESTR''@|1|g'  -e 's|@''HAVE_DECL_STRTOK_R''@|1|g'  -e 's|@''HAVE_DECL_STRERROR''@|1|g'  -e 's|@''HAVE_DECL_STRSIGNAL''@|1|g'  -e 's|@''HAVE_STRVERSCMP''@|1|g'  -e 's|@''REPLACE_MEMMEM''@|0|g'  -e 's|@''REPLACE_STRCASESTR''@|0|g'  -e 's|@''REPLACE_STRDUP''@|0|g'  -e 's|@''REPLACE_STRSTR''@|0|g'  -e 's|@''REPLACE_STRERROR''@|0|g'  -e 's|@''REPLACE_STRSIGNAL''@|0|g'  -e '/definition of GL_LINK_WARNING/r ../build-aux/link-warning.h'  < ./string.in.h;  } > string.h-t

+        mv string.h-t string.h

+        rm -f time.h-t time.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' &&  sed -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@NEXT_TIME_H''@|<time.h>|g'  -e 's|@REPLACE_LOCALTIME_R''@|0|g'  -e 's|@REPLACE_NANOSLEEP''@|GNULIB_PORTCHECK|g'  -e 's|@REPLACE_STRPTIME''@|GNULIB_PORTCHECK|g'  -e 's|@REPLACE_TIMEGM''@|1|g'  -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|0|g'  -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|1|g'  < ./time.in.h;  } > time.h-t

+        mv time.h-t time.h

+        rm -f unistd.h-t unistd.h

+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */';  sed -e 's|@''HAVE_UNISTD_H''@|1|g'  -e 's|@''INCLUDE_NEXT''@|include_next|g'  -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g'  -e 's|@''NEXT_UNISTD_H''@|<unistd.h>|g'  -e 's|@''GNULIB_CHOWN''@|0|g'  -e 's|@''GNULIB_CLOSE''@|0|g'  -e 's|@''GNULIB_DUP2''@|0|g'  -e 's|@''GNULIB_ENVIRON''@|0|g'  -e 's|@''GNULIB_EUIDACCESS''@|0|g'  -e 's|@''GNULIB_FCHDIR''@|0|g'  -e 's|@''GNULIB_FSYNC''@|0|g'  -e 's|@''GNULIB_FTRUNCATE''@|0|g'  -e 's|@''GNULIB_GETCWD''@|0|g'  -e 's|@''GNULIB_GETDOMAINNAME''@|0|g'  -e 's|@''GNULIB_GETDTABLESIZE''@|0|g'  -e 's|@''GNULIB_GETHOSTNAME''@|1|g'  -e 's|@''GNULIB_GETLOGIN_R''@|0|g'  -e 's|@''GNULIB_GETPAGESIZE''@|0|g'  -e 's|@''GNULIB_GETUSERSHELL''@|0|g'  -e 's|@''GNULIB_LCHOWN''@|0|g'  -e 's|@''GNULIB_LINK''@|0|g'  -e 's|@''GNULIB_LSEEK''@|0|g'  -e 's|@''GNULIB_READLINK''@|0|g'  -e 's|@''GNULIB_SLEEP''@|0|g'  -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|0|g'  -e 's|@''GNULIB_WRITE''@|1|g'  -e 's|@''HAVE_DUP2''@|1|g'  -e 's|@''HAVE_EUIDACCESS''@|1|g'  -e 's|@''HAVE_FSYNC''@|1|g'  -e 's|@''HAVE_FTRUNCATE''@|1|g'  -e 's|@''HAVE_GETDOMAINNAME''@|1|g'  -e 's|@''HAVE_GETDTABLESIZE''@|1|g'  -e 's|@''HAVE_GETHOSTNAME''@|1|g'  -e 's|@''HAVE_GETPAGESIZE''@|1|g'  -e 's|@''HAVE_GETUSERSHELL''@|1|g'  -e 's|@''HAVE_LINK''@|1|g'  -e 's|@''HAVE_READLINK''@|1|g'  -e 's|@''HAVE_SLEEP''@|1|g'  -e 's|@''HAVE_DECL_ENVIRON''@|1|g'  -e 's|@''HAVE_DECL_GETLOGIN_R''@|1|g'  -e 's|@''HAVE_OS_H''@|0|g'  -e 's|@''HAVE_SYS_PARAM_H''@|0|g'  -e 's|@''REPLACE_CHOWN''@|0|g'  -e 's|@''REPLACE_CLOSE''@|0|g'  -e 's|@''REPLACE_FCHDIR''@|0|g'  -e 's|@''REPLACE_GETCWD''@|0|g'  -e 's|@''REPLACE_GETPAGESIZE''@|0|g'  -e 's|@''REPLACE_LCHOWN''@|0|g'  -e 's|@''REPLACE_LSEEK''@|0|g'  -e 's|@''REPLACE_WRITE''@|0|g'  -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|0|g'  -e '/definition of GL_LINK_WARNING/r ../build-aux/link-warning.h'  < ./unistd.in.h;  } > unistd.h-t

+        mv unistd.h-t unistd.h

+        make  all-recursive

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT base64.o -MD -MP -MF .deps/base64.Tpo -c -o base64.o base64.c

+        mv -f .deps/base64.Tpo .deps/base64.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT full-read.o -MD -MP -MF .deps/full-read.Tpo -c -o full-read.o full-read.c

+        mv -f .deps/full-read.Tpo .deps/full-read.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT full-write.o -MD -MP -MF .deps/full-write.Tpo -c -o full-write.o full-write.c

+        mv -f .deps/full-write.Tpo .deps/full-write.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT localcharset.o -MD -MP -MF .deps/localcharset.Tpo -c -o localcharset.o localcharset.c

+        mv -f .deps/localcharset.Tpo .deps/localcharset.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT xalloc-die.o -MD -MP -MF .deps/xalloc-die.Tpo -c -o xalloc-die.o xalloc-die.c

+        mv -f .deps/xalloc-die.Tpo .deps/xalloc-die.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT xstrndup.o -MD -MP -MF .deps/xstrndup.Tpo -c -o xstrndup.o xstrndup.c

+        mv -f .deps/xstrndup.Tpo .deps/xstrndup.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT asnprintf.o -MD -MP -MF .deps/asnprintf.Tpo -c -o asnprintf.o asnprintf.c

+        mv -f .deps/asnprintf.Tpo .deps/asnprintf.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT asprintf.o -MD -MP -MF .deps/asprintf.Tpo -c -o asprintf.o asprintf.c

+        mv -f .deps/asprintf.Tpo .deps/asprintf.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT basename.o -MD -MP -MF .deps/basename.Tpo -c -o basename.o basename.c

+        mv -f .deps/basename.Tpo .deps/basename.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT c-strtod.o -MD -MP -MF .deps/c-strtod.Tpo -c -o c-strtod.o c-strtod.c

+        mv -f .deps/c-strtod.Tpo .deps/c-strtod.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT cloexec.o -MD -MP -MF .deps/cloexec.Tpo -c -o cloexec.o cloexec.c

+        mv -f .deps/cloexec.Tpo .deps/cloexec.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT creat-safer.o -MD -MP -MF .deps/creat-safer.Tpo -c -o creat-safer.o creat-safer.c

+        mv -f .deps/creat-safer.Tpo .deps/creat-safer.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT dirname.o -MD -MP -MF .deps/dirname.Tpo -c -o dirname.o dirname.c

+        mv -f .deps/dirname.Tpo .deps/dirname.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT dup-safer.o -MD -MP -MF .deps/dup-safer.Tpo -c -o dup-safer.o dup-safer.c

+        mv -f .deps/dup-safer.Tpo .deps/dup-safer.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT error.o -MD -MP -MF .deps/error.Tpo -c -o error.o error.c

+        mv -f .deps/error.Tpo .deps/error.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT exitfail.o -MD -MP -MF .deps/exitfail.Tpo -c -o exitfail.o exitfail.c

+        mv -f .deps/exitfail.Tpo .deps/exitfail.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT fd-safer.o -MD -MP -MF .deps/fd-safer.Tpo -c -o fd-safer.o fd-safer.c

+        mv -f .deps/fd-safer.Tpo .deps/fd-safer.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT fsusage.o -MD -MP -MF .deps/fsusage.Tpo -c -o fsusage.o fsusage.c

+        mv -f .deps/fsusage.Tpo .deps/fsusage.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT getloadavg.o -MD -MP -MF .deps/getloadavg.Tpo -c -o getloadavg.o getloadavg.c

+        mv -f .deps/getloadavg.Tpo .deps/getloadavg.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT getopt.o -MD -MP -MF .deps/getopt.Tpo -c -o getopt.o getopt.c

+        mv -f .deps/getopt.Tpo .deps/getopt.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT getopt1.o -MD -MP -MF .deps/getopt1.Tpo -c -o getopt1.o getopt1.c

+        mv -f .deps/getopt1.Tpo .deps/getopt1.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT malloc.o -MD -MP -MF .deps/malloc.Tpo -c -o malloc.o malloc.c

+        mv -f .deps/malloc.Tpo .deps/malloc.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT mktime.o -MD -MP -MF .deps/mktime.Tpo -c -o mktime.o mktime.c

+        mv -f .deps/mktime.Tpo .deps/mktime.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT mountlist.o -MD -MP -MF .deps/mountlist.Tpo -c -o mountlist.o mountlist.c

+mountlist.c: In function 'read_file_system_list':

+mountlist.c:797: warning: passing argument 3 of 'mntctl' from incompatible pointer type

+mountlist.c:802: warning: passing argument 3 of 'mntctl' from incompatible pointer type

+        mv -f .deps/mountlist.Tpo .deps/mountlist.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT open.o -MD -MP -MF .deps/open.Tpo -c -o open.o open.c

+        mv -f .deps/open.Tpo .deps/open.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT open-safer.o -MD -MP -MF .deps/open-safer.Tpo -c -o open-safer.o open-safer.c

+        mv -f .deps/open-safer.Tpo .deps/open-safer.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT pipe-safer.o -MD -MP -MF .deps/pipe-safer.Tpo -c -o pipe-safer.o pipe-safer.c

+        mv -f .deps/pipe-safer.Tpo .deps/pipe-safer.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT printf-args.o -MD -MP -MF .deps/printf-args.Tpo -c -o printf-args.o printf-args.c

+        mv -f .deps/printf-args.Tpo .deps/printf-args.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT printf-parse.o -MD -MP -MF .deps/printf-parse.Tpo -c -o printf-parse.o printf-parse.c

+        mv -f .deps/printf-parse.Tpo .deps/printf-parse.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT regex.o -MD -MP -MF .deps/regex.Tpo -c -o regex.o regex.c

+        mv -f .deps/regex.Tpo .deps/regex.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT safe-read.o -MD -MP -MF .deps/safe-read.Tpo -c -o safe-read.o safe-read.c

+        mv -f .deps/safe-read.Tpo .deps/safe-read.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT safe-write.o -MD -MP -MF .deps/safe-write.Tpo -c -o safe-write.o safe-write.c

+        mv -f .deps/safe-write.Tpo .deps/safe-write.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT stripslash.o -MD -MP -MF .deps/stripslash.Tpo -c -o stripslash.o stripslash.c

+        mv -f .deps/stripslash.Tpo .deps/stripslash.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT timegm.o -MD -MP -MF .deps/timegm.Tpo -c -o timegm.o timegm.c

+        mv -f .deps/timegm.Tpo .deps/timegm.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT vasnprintf.o -MD -MP -MF .deps/vasnprintf.Tpo -c -o vasnprintf.o vasnprintf.c

+        mv -f .deps/vasnprintf.Tpo .deps/vasnprintf.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT vasprintf.o -MD -MP -MF .deps/vasprintf.Tpo -c -o vasprintf.o vasprintf.c

+        mv -f .deps/vasprintf.Tpo .deps/vasprintf.Po

+        gcc -DHAVE_CONFIG_H -I. -I..  -I../intl  -I/include  -g -O2 -MT xmalloc.o -MD -MP -MF .deps/xmalloc.Tpo -c -o xmalloc.o xmalloc.c

+        mv -f .deps/xmalloc.Tpo .deps/xmalloc.Po

+        rm -f libgnu.a

+        ar cru libgnu.a base64.o full-read.o  full-write.o localcharset.o  xalloc-die.o xstrndup.o asnprintf.o asprintf.o basename.o c-strtod.o cloexec.o creat-safer.o dirname.o dup-safer.o error.o exitfail.o fd-safer.o fsusage.o getloadavg.o getopt.o getopt1.o malloc.o mktime.o mountlist.o open.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o stripslash.o timegm.o vasnprintf.o vasprintf.o xmalloc.o 

+        ranlib libgnu.a

+        rm -f t-charset.alias charset.alias

+        /bin/sh ./config.charset 'powerpc-ibm-aix5.3.0.0' > t-charset.alias

+        mv t-charset.alias charset.alias

+        rm -f t-ref-add.sed ref-add.sed

+        sed -e '/^#/d' -e 's/@''PACKAGE''@/nagios-plugins/g' ref-add.sin > t-ref-add.sed

+        mv t-ref-add.sed ref-add.sed

+        rm -f t-ref-del.sed ref-del.sed

+        sed -e '/^#/d' -e 's/@''PACKAGE''@/nagios-plugins/g' ref-del.sin > t-ref-del.sed

+        mv t-ref-del.sed ref-del.sed

+Target "all-am" is up to date.

+Making all in tap

+Target "all" is up to date.

+Making all in lib

+Making all in .

+        gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../gl -I../intl -I../plugins   -I/include  -g -O2 -MT utils_base.o -MD -MP -MF .deps/utils_base.Tpo -c -o utils_base.o utils_base.c

+        mv -f .deps/utils_base.Tpo .deps/utils_base.Po

+        gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../gl -I../intl -I../plugins   -I/include  -g -O2 -MT utils_disk.o -MD -MP -MF .deps/utils_disk.Tpo -c -o utils_disk.o utils_disk.c

+        mv -f .deps/utils_disk.Tpo .deps/utils_disk.Po

+        gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../gl -I../intl -I../plugins   -I/include  -g -O2 -MT utils_tcp.o -MD -MP -MF .deps/utils_tcp.Tpo -c -o utils_tcp.o utils_tcp.c

+        mv -f .deps/utils_tcp.Tpo .deps/utils_tcp.Po

+        gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../gl -I../intl -I../plugins   -I/include  -g -O2 -MT utils_cmd.o -MD -MP -MF .deps/utils_cmd.Tpo -c -o utils_cmd.o utils_cmd.c

+        mv -f .deps/utils_cmd.Tpo .deps/utils_cmd.Po

+        rm -f libnagiosplug.a

+        ar cru libnagiosplug.a utils_base.o utils_disk.o  utils_tcp.o utils_cmd.o  

+        ranlib libnagiosplug.a

+Target "all-am" is up to date.

+Making all in tests

+Target "all" is up to date.

+Target "all" is up to date.

+Making all in plugins

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_apt.o -MD -MP -MF .deps/check_apt.Tpo -c -o check_apt.o check_apt.c

+        mv -f .deps/check_apt.Tpo .deps/check_apt.Po

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT utils.o -MD -MP -MF .deps/utils.Tpo -c -o utils.o utils.c

+        mv -f .deps/utils.Tpo .deps/utils.Po

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT runcmd.o -MD -MP -MF .deps/runcmd.Tpo -c -o runcmd.o runcmd.c

+        mv -f .deps/runcmd.Tpo .deps/runcmd.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_apt check_apt.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a runcmd.o -L/lib -lintl -lpthread -ldl 

+mkdir .libs

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_apt check_apt.o utils.o runcmd.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_cluster.o -MD -MP -MF .deps/check_cluster.Tpo -c -o check_cluster.o check_cluster.c

+        mv -f .deps/check_cluster.Tpo .deps/check_cluster.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_cluster check_cluster.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_cluster check_cluster.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_disk.o -MD -MP -MF .deps/check_disk.Tpo -c -o check_disk.o check_disk.c

+        mv -f .deps/check_disk.Tpo .deps/check_disk.Po

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT popen.o -MD -MP -MF .deps/popen.Tpo -c -o popen.o popen.c

+        mv -f .deps/popen.Tpo .deps/popen.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_disk check_disk.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a popen.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_disk check_disk.o utils.o popen.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_dummy.o -MD -MP -MF .deps/check_dummy.Tpo -c -o check_dummy.o check_dummy.c

+        mv -f .deps/check_dummy.Tpo .deps/check_dummy.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_dummy check_dummy.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_dummy check_dummy.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_http.o -MD -MP -MF .deps/check_http.Tpo -c -o check_http.o check_http.c

+        mv -f .deps/check_http.Tpo .deps/check_http.Po

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT sslutils.o -MD -MP -MF .deps/sslutils.Tpo -c -o sslutils.o sslutils.c

+        mv -f .deps/sslutils.Tpo .deps/sslutils.Po

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT netutils.o -MD -MP -MF .deps/netutils.Tpo -c -o netutils.o netutils.c

+        mv -f .deps/netutils.Tpo .deps/netutils.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_http check_http.o sslutils.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lssl -lcrypto -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_http check_http.o sslutils.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lssl -lcrypto -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_load.o -MD -MP -MF .deps/check_load.Tpo -c -o check_load.o check_load.c

+        mv -f .deps/check_load.Tpo .deps/check_load.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_load check_load.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a popen.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_load check_load.o utils.o popen.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_mrtg.o -MD -MP -MF .deps/check_mrtg.Tpo -c -o check_mrtg.o check_mrtg.c

+        mv -f .deps/check_mrtg.Tpo .deps/check_mrtg.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_mrtg check_mrtg.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_mrtg check_mrtg.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_mrtgtraf.o -MD -MP -MF .deps/check_mrtgtraf.Tpo -c -o check_mrtgtraf.o check_mrtgtraf.c

+        mv -f .deps/check_mrtgtraf.Tpo .deps/check_mrtgtraf.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_mrtgtraf check_mrtgtraf.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_mrtgtraf check_mrtgtraf.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ntp.o -MD -MP -MF .deps/check_ntp.Tpo -c -o check_ntp.o check_ntp.c

+        mv -f .deps/check_ntp.Tpo .deps/check_ntp.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ntp check_ntp.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lm -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ntp check_ntp.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lm -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ntp_peer.o -MD -MP -MF .deps/check_ntp_peer.Tpo -c -o check_ntp_peer.o check_ntp_peer.c

+        mv -f .deps/check_ntp_peer.Tpo .deps/check_ntp_peer.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ntp_peer check_ntp_peer.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lm -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ntp_peer check_ntp_peer.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lm -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_nwstat.o -MD -MP -MF .deps/check_nwstat.Tpo -c -o check_nwstat.o check_nwstat.c

+        mv -f .deps/check_nwstat.Tpo .deps/check_nwstat.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_nwstat check_nwstat.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_nwstat check_nwstat.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_overcr.o -MD -MP -MF .deps/check_overcr.Tpo -c -o check_overcr.o check_overcr.c

+        mv -f .deps/check_overcr.Tpo .deps/check_overcr.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_overcr check_overcr.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_overcr check_overcr.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ping.o -MD -MP -MF .deps/check_ping.Tpo -c -o check_ping.o check_ping.c

+        mv -f .deps/check_ping.Tpo .deps/check_ping.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ping check_ping.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl popen.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ping check_ping.o netutils.o utils.o popen.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_real.o -MD -MP -MF .deps/check_real.Tpo -c -o check_real.o check_real.c

+        mv -f .deps/check_real.Tpo .deps/check_real.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_real check_real.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_real check_real.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_smtp.o -MD -MP -MF .deps/check_smtp.Tpo -c -o check_smtp.o check_smtp.c

+        mv -f .deps/check_smtp.Tpo .deps/check_smtp.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_smtp check_smtp.o sslutils.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lssl -lcrypto -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_smtp check_smtp.o sslutils.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lssl -lcrypto -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ssh.o -MD -MP -MF .deps/check_ssh.Tpo -c -o check_ssh.o check_ssh.c

+        mv -f .deps/check_ssh.Tpo .deps/check_ssh.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ssh check_ssh.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ssh check_ssh.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_tcp.o -MD -MP -MF .deps/check_tcp.Tpo -c -o check_tcp.o check_tcp.c

+        mv -f .deps/check_tcp.Tpo .deps/check_tcp.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_tcp check_tcp.o sslutils.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lssl -lcrypto -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_tcp check_tcp.o sslutils.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lssl -lcrypto -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_time.o -MD -MP -MF .deps/check_time.Tpo -c -o check_time.o check_time.c

+        mv -f .deps/check_time.Tpo .deps/check_time.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_time check_time.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_time check_time.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ntp_time.o -MD -MP -MF .deps/check_ntp_time.Tpo -c -o check_ntp_time.o check_ntp_time.c

+        mv -f .deps/check_ntp_time.Tpo .deps/check_ntp_time.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ntp_time check_ntp_time.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lm -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ntp_time check_ntp_time.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lm -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ups.o -MD -MP -MF .deps/check_ups.Tpo -c -o check_ups.o check_ups.c

+        mv -f .deps/check_ups.Tpo .deps/check_ups.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ups check_ups.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ups check_ups.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_users.o -MD -MP -MF .deps/check_users.Tpo -c -o check_users.o check_users.c

+        mv -f .deps/check_users.Tpo .deps/check_users.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_users check_users.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a popen.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_users check_users.o utils.o popen.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT negate.o -MD -MP -MF .deps/negate.Tpo -c -o negate.o negate.c

+        mv -f .deps/negate.Tpo .deps/negate.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o negate negate.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o negate negate.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT urlize.o -MD -MP -MF .deps/urlize.Tpo -c -o urlize.o urlize.c

+        mv -f .deps/urlize.Tpo .deps/urlize.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o urlize urlize.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a popen.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o urlize urlize.o utils.o popen.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_ldap.o -MD -MP -MF .deps/check_ldap.Tpo -c -o check_ldap.o check_ldap.c

+        mv -f .deps/check_ldap.Tpo .deps/check_ldap.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_ldap check_ldap.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lldap -llber -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_ldap check_ldap.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -L/opt/freeware/lib -lldap -L/opt/freeware/src/packages/BUILD/openldap-2.0.21/libraries -lssl -lcrypto -ls -llber -lintl -lpthread -ldl -Wl,-blibpath:/opt/freeware/lib:/opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.0:/opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.0/../../..:/usr/lib:/lib 

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_procs.o -MD -MP -MF .deps/check_procs.Tpo -c -o check_procs.o check_procs.c

+        mv -f .deps/check_procs.Tpo .deps/check_procs.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_procs check_procs.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_procs check_procs.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_nagios.o -MD -MP -MF .deps/check_nagios.Tpo -c -o check_nagios.o check_nagios.c

+        mv -f .deps/check_nagios.Tpo .deps/check_nagios.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_nagios check_nagios.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a runcmd.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_nagios check_nagios.o utils.o runcmd.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_dns.o -MD -MP -MF .deps/check_dns.Tpo -c -o check_dns.o check_dns.c

+        mv -f .deps/check_dns.Tpo .deps/check_dns.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_dns check_dns.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl runcmd.o -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_dns check_dns.o netutils.o utils.o runcmd.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_by_ssh.o -MD -MP -MF .deps/check_by_ssh.Tpo -c -o check_by_ssh.o check_by_ssh.c

+        mv -f .deps/check_by_ssh.Tpo .deps/check_by_ssh.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_by_ssh check_by_ssh.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_by_ssh check_by_ssh.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_dig.o -MD -MP -MF .deps/check_dig.Tpo -c -o check_dig.o check_dig.c

+        mv -f .deps/check_dig.Tpo .deps/check_dig.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_dig check_dig.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl runcmd.o  -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_dig check_dig.o netutils.o utils.o runcmd.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I/usr/include/ldap  -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_nt.o -MD -MP -MF .deps/check_nt.Tpo -c -o check_nt.o check_nt.c

+        mv -f .deps/check_nt.Tpo .deps/check_nt.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_nt check_nt.o netutils.o utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl  -L/lib -lintl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_nt check_nt.o netutils.o utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins -L/lib ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lintl -lpthread -ldl

+        rm -f check_ftp

+        ln -s check_tcp check_ftp

+        rm -f check_imap

+        ln -s check_tcp check_imap

+        rm -f check_nntp

+        ln -s check_tcp check_nntp

+        rm -f check_pop

+        ln -s check_tcp check_pop

+        rm -f check_udp

+        ln -s check_tcp check_udp

+        rm -f check_clamd

+        ln -s check_tcp check_clamd

+        rm -f check_simap

+        ln -s check_tcp check_simap

+        rm -f check_spop

+        ln -s check_tcp check_spop

+        rm -f check_jabber

+        ln -s check_tcp check_jabber

+        rm -f check_nntps

+        ln -s check_tcp check_nntps

+        rm -f check_ssmtp

+        ln -s check_tcp check_ssmtp

+Target "all" is up to date.

+Making all in plugins-scripts

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_breeze.pl > check_breeze

+        chmod +x check_breeze

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_disk_smb.pl > check_disk_smb

+        chmod +x check_disk_smb

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_flexlm.pl > check_flexlm

+        chmod +x check_flexlm

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_ircd.pl > check_ircd

+        chmod +x check_ircd

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_log.sh > check_log

+        chmod +x check_log

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_oracle.sh > check_oracle

+        chmod +x check_oracle

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_rpc.pl > check_rpc

+        chmod +x check_rpc

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_sensors.sh > check_sensors

+        chmod +x check_sensors

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_wave.pl > check_wave

+        chmod +x check_wave

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_ifstatus.pl > check_ifstatus

+        chmod +x check_ifstatus

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_ifoperstatus.pl > check_ifoperstatus

+        chmod +x check_ifoperstatus

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_mailq.pl > check_mailq

+        chmod +x check_mailq

+        NP_VERSION=1.4.14-61-g45e2 nawk -f ./subst check_file_age.pl > check_file_age

+        chmod +x check_file_age

+        cd .. && /bin/sh ./config.status plugins-scripts/utils.sh

+config.status: creating plugins-scripts/utils.sh

+        cd .. && /bin/sh ./config.status plugins-scripts/utils.pm

+config.status: creating plugins-scripts/utils.pm

+Target "all" is up to date.

+Making all in plugins-root

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I../plugins -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_dhcp.o -MD -MP -MF .deps/check_dhcp.Tpo -c -o check_dhcp.o check_dhcp.c

+check_dhcp.c: In function 'add_dhcp_offer':

+check_dhcp.c:843: warning: comparison is always false due to limited range of data type

+        mv -f .deps/check_dhcp.Tpo .deps/check_dhcp.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_dhcp check_dhcp.o -L/lib -lintl ../plugins/netutils.o ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lpthread -ldl 

+mkdir .libs

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_dhcp check_dhcp.o ../plugins/netutils.o ../plugins/utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins-root -L/lib -lintl ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lpthread -ldl

+        gcc -DLOCALEDIR=\"/usr/local/nagios/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I.. -I../lib -I../gl -I../intl -I../plugins -I/include   -I/include -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2 -MT check_icmp.o -MD -MP -MF .deps/check_icmp.Tpo -c -o check_icmp.o check_icmp.c

+check_icmp.c: In function 'recvfrom_wto':

+check_icmp.c:903: warning: passing argument 6 of 'nrecvfrom' from incompatible pointer type

+        mv -f .deps/check_icmp.Tpo .deps/check_icmp.Po

+        /bin/sh ../libtool --tag=CC    --mode=link gcc -DNP_VERSION='"1.4.14-61-g45e2"' -g -O2   -L. -L/lib -o check_icmp check_icmp.o -L/lib -lintl ../plugins/netutils.o ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a  -lnsl -lnsl -lpthread -ldl 

+gcc -DNP_VERSION=\"1.4.14-61-g45e2\" -g -O2 -o check_icmp check_icmp.o ../plugins/netutils.o ../plugins/utils.o  -L/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2/plugins-root -L/lib -lintl ../lib/libnagiosplug.a ../gl/libgnu.a -lnsl -lpthread -ldl

+Target "all" is up to date.

+Making all in po

+Target "all" is up to date.

+Target "all-am" is up to date.

+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# gvv    cc   ^C

+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# gcc -v

+Using built-in specs.

+Target: powerpc-ibm-aix5.3.0.0

+Configured with: ../configure --with-as=/usr/bin/as --with-ld=/usr/bin/ld --disable-nls --enable-languages=c,c++ --prefix=/opt/freeware --enable-threads --enable-version-specific-runtime-libs --host=powerpc-ibm-aix5.3.0.0

+Thread model: aix

+gcc version 4.0.0

+root@:/usr/src/packages/BUILD/nagios-plugins-1.4.14-61-g45e2# ^D

+
+Script command is complete on Mon Dec 21 14:51:51 2009.
diff --git a/web/attachments/357353-interdiff.txt b/web/attachments/357353-interdiff.txt
new file mode 100644
index 0000000..aaf3299
--- /dev/null
+++ b/web/attachments/357353-interdiff.txt
@@ -0,0 +1,107 @@
+--- nagios-plugins-1.4.13+git200906171200.orig/plugins/check_disk.c
++++ nagios-plugins-1.4.13+git200906171200/plugins/check_disk.c
+@@ -3,7 +3,7 @@
+ * Nagios check_disk plugin
+ * 
+ * License: GPL
+-* Copyright (c) 1999-2008 Nagios Plugins Development Team
++* Copyright (c) 1999-2010 Nagios Plugins Development Team
+ * 
+ * Description:
+ * 
+@@ -28,7 +28,7 @@
+ 
+ const char *progname = "check_disk";
+ const char *program_name = "check_disk";  /* Required for coreutils libs */
+-const char *copyright = "1999-2008";
++const char *copyright = "1999-2010";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ 
+@@ -51,6 +51,7 @@
+ # include <limits.h>
+ #endif
+ #include "regex.h"
++#include "human.h"
+ 
+ 
+ /* If nonzero, show inode information. */
+@@ -129,6 +130,7 @@
+ char *exclude_device;
+ char *units;
+ uintmax_t mult = 1024 * 1024;
++int human_readable_units = FALSE;
+ int verbose = 0;
+ int erronly = FALSE;
+ int display_mntp = FALSE;
+@@ -167,6 +169,8 @@
+   double warning_high_tide;
+   double critical_high_tide;
+   int temp_result;
++  char buf[LONGEST_HUMAN_READABLE];
++  int human_opts = human_suppress_point_zero | human_autoscale | human_SI | human_group_digits | human_base_1024;
+ 
+   struct mount_entry *me;
+   struct fs_usage fsp, tmpfsp;
+@@ -389,12 +393,19 @@
+       if (disk_result==STATE_OK && erronly && !verbose)
+         continue;
+ 
+-      asprintf (&output, "%s %s %.0f %s (%.0f%%",
+-                output,
+-                (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+-                dfree_units,
+-                units,
+-                dfree_pct);
++      if (human_readable_units)
++       asprintf (&output, "%s %s %s (%.0f%%",
++                 output,
++                 (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
++                 human_readable (available, buf, human_opts, fsp.fsu_blocksize, 1),
++                 dfree_pct);
++      else
++       asprintf (&output, "%s %s %.0f %s (%.0f%%",
++                 output,
++                 (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
++                 dfree_units,
++                 units,
++                 dfree_pct);
+       if (dused_inodes_percent < 0) {
+         asprintf(&output, "%s inode=-);", output);
+       } else {
+@@ -473,6 +484,7 @@
+     {"kilobytes", no_argument, 0, 'k'},
+     {"megabytes", no_argument, 0, 'm'},
+     {"units", required_argument, 0, 'u'},
++    {"human-readable", no_argument, 0, 'Z'},
+     {"path", required_argument, 0, 'p'},
+     {"partition", required_argument, 0, 'p'},
+     {"exclude_device", required_argument, 0, 'x'},
+@@ -601,6 +613,9 @@
+       if (units == NULL)
+         die (STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
+       break;
++    case 'Z': /* human readable */
++      human_readable_units = TRUE;
++      break;
+     case 'k': /* display mountpoint */
+       mult = 1024;
+       if (units)
+@@ -958,6 +973,8 @@
+   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", "--human-readable");
++  printf ("    %s\n", _("Print sizes in human readable format (e.g., 1K 234M 2G)"));
+ 
+ #ifdef NP_EXTRA_OPTS
+   printf ("\n");
+@@ -986,7 +1003,7 @@
+   printf (_("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] [--human-readable]\n");
+ }
+ 
+ void
diff --git a/web/attachments/35776-check_tcp.diff b/web/attachments/35776-check_tcp.diff
new file mode 100644
index 0000000..b461a63
--- /dev/null
+++ b/web/attachments/35776-check_tcp.diff
@@ -0,0 +1,26 @@
+--- check_tcp.c.orig    Wed Nov 20 12:15:44 2002
++++ check_tcp.c Wed Nov 20 12:15:03 2002
+@@ -241,19 +241,20 @@
+ 
+                /* watch for the expect string */
+ #ifdef HAVE_SSL
+-               if (use_ssl && SSL_read (ssl, buffer, MAX_INPUT_BUFFER - 1)>=0)
++               if (use_ssl && SSL_read (ssl, buffer, MAX_INPUT_BUFFER - 1)>0)
+                        status = strscat(status,buffer);
+                else
+ #endif
+                        {
+-                               if (recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0) >= 0)
++                               if (recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0) > 0)
+                                        status = strscat (status, buffer);
+                        }
+-               strip (status);
+ 
+                /* return a CRITICAL status if we couldn't read any data */
+                if (status == NULL)
+                        terminate (STATE_CRITICAL, "No data received from host\n");
++
++               strip (status);
+ 
+                if (status && verbose)
+                        printf ("%s\n", status);
diff --git a/web/attachments/36305-check_procs_1.5.txt b/web/attachments/36305-check_procs_1.5.txt
new file mode 100644
index 0000000..2cac0d2
--- /dev/null
+++ b/web/attachments/36305-check_procs_1.5.txt
@@ -0,0 +1,25 @@
+--- nagios-plugins-1.3.0-beta2.orig/plugins/check_procs.c       Fri Nov 22 02:33:26 2002

++++ nagios-plugins-1.3.0-beta2/plugins/check_procs.c    Wed Nov 27 16:21:10 2002

+@@ -72,10 +72,10 @@

+ int verbose = FALSE;

+ int uid;

+ int ppid;

+-char *statopts = NULL;

+-char *prog = NULL;

+-char *args = NULL;

+-char *fmt = NULL;

++char *statopts = "";

++char *prog = "";

++char *args = "";

++char *fmt = "";

+ char tmp[MAX_INPUT_BUFFER];

+

+ int

+@@ -275,7 +275,6 @@

+        };

+ #endif

+

+-       asprintf (&fmt, "");

+

+        for (c = 1; c < argc; c++)

+                if (strcmp ("-to", argv[c]) == 0)

diff --git a/web/attachments/364105-check_http_memory_leak.patch b/web/attachments/364105-check_http_memory_leak.patch
new file mode 100644
index 0000000..49a35b8
--- /dev/null
+++ b/web/attachments/364105-check_http_memory_leak.patch
@@ -0,0 +1,23 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 0a4b12b..5cdf144 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -784,6 +784,7 @@ check_http (void)
+   int i = 0;
+   size_t pagesize = 0;
+   char *full_page;
++  char *full_page_new;
+   char *buf;
+   char *pos;
+   long microsec;
+@@ -871,7 +872,9 @@ check_http (void)
+   full_page = strdup("");
+   while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
+     buffer[i] = '\0';
+-    asprintf (&full_page, "%s%s", full_page, buffer);
++    asprintf (&full_page_new, "%s%s", full_page, buffer);
++    free (full_page);
++    full_page = full_page_new;
+     pagesize += i;
+ 
+                 if (no_body && document_headers_done (full_page)) {
diff --git a/web/attachments/366210-check_dhcp.patch b/web/attachments/366210-check_dhcp.patch
new file mode 100644
index 0000000..845bc95
--- /dev/null
+++ b/web/attachments/366210-check_dhcp.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824602" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824602" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824602" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824602" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824602');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2968305&group_id=29880&atid=397599&file_id=366210"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/366211-check_dhcp.patch b/web/attachments/366211-check_dhcp.patch
new file mode 100644
index 0000000..5dbc924
--- /dev/null
+++ b/web/attachments/366211-check_dhcp.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-10 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824600" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824600" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824600" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824600" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824600');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2968305&group_id=29880&atid=397599&file_id=366211"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/366213-check_dhcp.patch b/web/attachments/366213-check_dhcp.patch
new file mode 100644
index 0000000..729b46c
--- /dev/null
+++ b/web/attachments/366213-check_dhcp.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824599" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824599" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824599" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824599" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824599');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2968305&group_id=29880&atid=397599&file_id=366213"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/366214-check_dhcp.patch b/web/attachments/366214-check_dhcp.patch
new file mode 100644
index 0000000..7fb76be
--- /dev/null
+++ b/web/attachments/366214-check_dhcp.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824599" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824599" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824599" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824599" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824599');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=2968305&group_id=29880&atid=397599&file_id=366214"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/366217-check_dhcp.patch b/web/attachments/366217-check_dhcp.patch
new file mode 100644
index 0000000..f22685a
--- /dev/null
+++ b/web/attachments/366217-check_dhcp.patch
@@ -0,0 +1,418 @@
+--- /home/thunderboltFS/mike/usr/local/src/nagios-plugins-1.4.14/plugins-root/check_dhcp.c.old  2010-03-05 11:26:26.000000000 -0600
++++ /home/thunderboltFS/mike/usr/local/src/nagios-plugins-1.4.14/plugins-root/check_dhcp.c      2010-03-10 17:36:02.313724052 -0600
+@@ -291,6 +291,9 @@
+        /* wait for a DHCPOFFER packet */
+        get_dhcp_offer(dhcp_socket);
+ 
++       /* send DHCPREQUEST packet */
++       send_dhcp_request(dhcp_socket);
++
+        /* close socket we created */
+        close_dhcp_socket(dhcp_socket);
+ 
+@@ -411,7 +414,7 @@
+                print_hardware_address(client_hardware_address);
+ 
+        return OK;
+-        }
++       }
+ 
+ /* determines IP address of the client interface */
+ int get_ip_address(int sock,char *interface_name){
+@@ -444,7 +447,7 @@
+ int send_dhcp_discover(int sock){
+        dhcp_packet discover_packet;
+        struct sockaddr_in sockaddr_broadcast;
+-    unsigned short opts;
++       unsigned short opts;
+ 
+ 
+        /* clear the packet data structure */
+@@ -490,7 +493,7 @@
+        discover_packet.options[2]='\x53';
+        discover_packet.options[3]='\x63';
+ 
+-    opts = 4;
++       opts = 4;
+        /* DHCP message type is embedded in options field */
+        discover_packet.options[opts++]=DHCP_OPTION_MESSAGE_TYPE;    /* DHCP message type option identifier */
+        discover_packet.options[opts++]='\x01';               /* DHCP message option length in bytes */
+@@ -502,7 +505,7 @@
+                discover_packet.options[opts++]='\x04';
+                memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address));
+                opts += sizeof(requested_address);
+-               }
++               }
+        discover_packet.options[opts++]=DHCP_OPTION_END;
+ 
+        /* unicast fields */
+@@ -513,8 +516,8 @@
+        discover_packet.hops = unicast ? 1 : 0;
+ 
+        /* send the DHCPDISCOVER packet to broadcast address */
+-        sockaddr_broadcast.sin_family=AF_INET;
+-        sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
++       sockaddr_broadcast.sin_family=AF_INET;
++       sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
+        sockaddr_broadcast.sin_addr.s_addr = unicast ? dhcp_ip.s_addr : INADDR_BROADCAST;
+        bzero(&sockaddr_broadcast.sin_zero,sizeof(sockaddr_broadcast.sin_zero));
+ 
+@@ -522,10 +525,10 @@
+        if(verbose){
+                printf(_("DHCPDISCOVER to %s port %d\n"),inet_ntoa(sockaddr_broadcast.sin_addr),ntohs(sockaddr_broadcast.sin_port));
+                printf("DHCPDISCOVER XID: %u (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));
+-               printf("DHCDISCOVER ciaddr:  %s\n",inet_ntoa(discover_packet.ciaddr));
+-               printf("DHCDISCOVER yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));
+-               printf("DHCDISCOVER siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));
+-               printf("DHCDISCOVER giaddr:  %s\n",inet_ntoa(discover_packet.giaddr));
++               printf("DHCPDISCOVER ciaddr:  %s\n",inet_ntoa(discover_packet.ciaddr));
++               printf("DHCPDISCOVER yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));
++               printf("DHCPDISCOVER siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));
++               printf("DHCPDISCOVER giaddr:  %s\n",inet_ntoa(discover_packet.giaddr));
+                }
+ 
+        /* send the DHCPDISCOVER packet out */
+@@ -535,9 +538,110 @@
+                printf("\n\n");
+ 
+        return OK;
+-        }
++       }
++
++/* sends a DHCPREQUEST broadcast message in an attempt to allow DHCP servers to drop any OFFER reservations and return those IPs to their free pools */
++int send_dhcp_request(int sock){
++       dhcp_packet discover_packet;
++       struct sockaddr_in sockaddr_broadcast;
++       unsigned short opts;
++
++
++       /* clear the packet data structure */
++       bzero(&discover_packet,sizeof(discover_packet));
++
++
++       /* boot request flag (backward compatible with BOOTP servers) */
++       discover_packet.op=BOOTREQUEST;
++
++       /* hardware address type */
++       discover_packet.htype=ETHERNET_HARDWARE_ADDRESS;
++
++       /* length of our hardware address */
++       discover_packet.hlen=ETHERNET_HARDWARE_ADDRESS_LENGTH;
++
++       /*
++        * transaction ID is supposed to be random.  We won't use the address so
++        * we don't care about high entropy here.  time(2) is good enough.
++        */
++       srand(time(NULL));
++       packet_xid=random();
++       discover_packet.xid=htonl(packet_xid);
++
++       /**** WHAT THE HECK IS UP WITH THIS?!?  IF I DON'T MAKE THIS CALL, ONLY ONE SERVER RESPONSE IS PROCESSED!!!! ****/
++       /* downright bizzarre... */
++       ntohl(discover_packet.xid);
++
++       /*discover_packet.secs=htons(65535);*/
++       discover_packet.secs=0xFF;
++
++       /*
++        * server needs to know if it should broadcast or unicast its response:
++        * 0x8000L == 32768 == 1 << 15 == broadcast, 0 == unicast
++        */
++       discover_packet.flags = unicast ? 0 : htons(DHCP_BROADCAST_FLAG);
++
++       /* our hardware address */
++       memcpy(discover_packet.chaddr,client_hardware_address,ETHERNET_HARDWARE_ADDRESS_LENGTH);
++
++       /* first four bytes of options field is magic cookie (as per RFC 2132) */
++       discover_packet.options[0]='\x63';
++       discover_packet.options[1]='\x82';
++       discover_packet.options[2]='\x53';
++       discover_packet.options[3]='\x63';
++
++       opts = 4;
++       /* DHCP message type is embedded in options field */
++       discover_packet.options[opts++]=DHCP_OPTION_MESSAGE_TYPE;    /* DHCP message type option identifier */
++       discover_packet.options[opts++]='\x01';               /* DHCP message option length in bytes */
++       discover_packet.options[opts++]=DHCPREQUEST;
++
++       /* the IP address we're requesting */
++       if(request_specific_address==TRUE){
++               discover_packet.options[opts++]=DHCP_OPTION_REQUESTED_ADDRESS;
++               discover_packet.options[opts++]='\x04';
++               memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address));
++               opts += sizeof(requested_address);
++               }
++
++       /* Set the server identifier to our own address, so that no other DHCP server will match */
++       discover_packet.options[opts++]=DHCP_OPTION_SERVER_IDENTIFIER;
++       discover_packet.options[opts++]='\x04';
++       memcpy(&discover_packet.options[opts],&discover_packet.ciaddr,sizeof(discover_packet.ciaddr));
++
++       discover_packet.options[opts++]=DHCP_OPTION_END;
++
++       /* unicast fields */
++       if(unicast)
++               discover_packet.giaddr.s_addr = my_ip.s_addr;
++
++       /* see RFC 1542, 4.1.1 */
++       discover_packet.hops = unicast ? 1 : 0;
++
++       /* send the DHCPREQUEST packet to broadcast address */
++       sockaddr_broadcast.sin_family=AF_INET;
++       sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
++       sockaddr_broadcast.sin_addr.s_addr = unicast ? dhcp_ip.s_addr : INADDR_BROADCAST;
++       bzero(&sockaddr_broadcast.sin_zero,sizeof(sockaddr_broadcast.sin_zero));
++
+ 
++       if(verbose){
++               printf(_("DHCPREQUEST to %s port %d\n"),inet_ntoa(sockaddr_broadcast.sin_addr),ntohs(sockaddr_broadcast.sin_port));
++               printf("DHCPREQUEST XID: %u (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));
++               printf("DHCPREQUEST ciaddr:  %s\n",inet_ntoa(discover_packet.ciaddr));
++               printf("DHCPREQUEST yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));
++               printf("DHCPREQUEST siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));
++               printf("DHCPREQUEST giaddr:  %s\n",inet_ntoa(discover_packet.giaddr));
++               }
+ 
++       /* send the DHCPREQUEST packet out */
++       send_dhcp_packet(&discover_packet,sizeof(discover_packet),sock,&sockaddr_broadcast);
++
++       if(verbose)
++               printf("\n\n");
++
++       return OK;
++       }
+ 
+ 
+ /* waits for a DHCPOFFER message from one or more DHCP servers */
+@@ -604,7 +708,7 @@
+                                printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);
+ 
+                        continue;
+-                       }
++                       }
+ 
+                /* check hardware address */
+                result=OK;
+@@ -626,7 +730,7 @@
+                                printf(_("DHCPOFFER hardware address did not match our own - ignoring packet\n"));
+ 
+                        continue;
+-                       }
++                       }
+ 
+                if(verbose){
+                        printf("DHCPOFFER ciaddr: %s\n",inet_ntoa(offer_packet.ciaddr));
+@@ -638,7 +742,7 @@
+                add_dhcp_offer(source.sin_addr,&offer_packet);
+ 
+                valid_responses++;
+-               }
++               }
+ 
+        if(verbose){
+                printf(_("Total responses seen on the wire: %d\n"),responses);
+@@ -646,7 +750,7 @@
+                }
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ 
+@@ -663,7 +767,7 @@
+                return ERROR;
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ 
+@@ -713,7 +817,7 @@
+                                printf("errno: (%d) -> %s\n",errno,strerror(errno));
+                                }
+                         return ERROR;
+-                        }
++                       }
+                else{
+                        if(verbose){
+                                printf(_("receive_dhcp_packet() result: %d\n"),recv_result);
+@@ -722,11 +826,11 @@
+ 
+                        memcpy(address,&source_address,sizeof(source_address));
+                        return OK;
+-                       }
+-                }
++                       }
++               }
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ /* creates a socket for DHCP communication */
+@@ -749,7 +853,7 @@
+         if(sock<0){
+                printf(_("Error: Could not create socket!\n"));
+                exit(STATE_UNKNOWN);
+-               }
++               }
+ 
+        if(verbose)
+                printf("DHCP socket: %d\n",sock);
+@@ -759,13 +863,13 @@
+         if(setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(char *)&flag,sizeof(flag))<0){
+                printf(_("Error: Could not set reuse address option on DHCP socket!\n"));
+                exit(STATE_UNKNOWN);
+-               }
++               }
+ 
+         /* set the broadcast option - we need this to listen to DHCP broadcast messages */
+         if(!unicast && setsockopt(sock,SOL_SOCKET,SO_BROADCAST,(char *)&flag,sizeof flag)<0){
+                printf(_("Error: Could not set broadcast option on DHCP socket!\n"));
+                exit(STATE_UNKNOWN);
+-               }
++               }
+ 
+        /* bind socket to interface */
+ #if defined(__linux__)
+@@ -774,7 +878,7 @@
+        if(setsockopt(sock,SOL_SOCKET,SO_BINDTODEVICE,(char *)&interface,sizeof(interface))<0){
+                printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"),network_interface_name);
+                exit(STATE_UNKNOWN);
+-               }
++               }
+ 
+ #else
+        strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ-1);
+@@ -785,10 +889,10 @@
+         if(bind(sock,(struct sockaddr *)&myname,sizeof(myname))<0){
+                printf(_("Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"),DHCP_CLIENT_PORT);
+                exit(STATE_UNKNOWN);
+-               }
++               }
+ 
+         return sock;
+-        }
++       }
+ 
+ 
+ /* closes DHCP socket */
+@@ -820,7 +924,7 @@
+                printf(_("Requested server address: %s\n"),inet_ntoa(new_server->server_address));
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ 
+@@ -924,7 +1028,7 @@
+        dhcp_offer_list=new_offer;
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ /* frees memory allocated to DHCP OFFER list */
+@@ -938,7 +1042,7 @@
+                }
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ /* frees memory allocated to requested server list */
+@@ -949,10 +1053,10 @@
+        for(this_server=requested_server_list;this_server!=NULL;this_server=next_server){
+                next_server=this_server->next;
+                free(this_server);
+-               }
++               }
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ /* gets state and plugin output to return */
+@@ -993,11 +1097,11 @@
+                                                requested_responses++;
+                                                temp_server->answered=TRUE;
+                                                }
+-                                       }
+-                               }
+-                       }
++                                       }
++                               }
++                       }
+ 
+-               }
++               }
+ 
+        /* else check and see if we got our requested address from any server */
+        else{
+@@ -1011,8 +1115,8 @@
+                        /* see if we got the address we requested */
+                        if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
+                                received_requested_address=TRUE;
+-                       }
+-               }
++                       }
++               }
+ 
+        result=STATE_OK;
+        if(valid_responses==0)
+@@ -1037,7 +1141,7 @@
+        if(dhcp_offer_list==NULL){
+                printf(_("No DHCPOFFERs were received.\n"));
+                return result;
+-               }
++               }
+ 
+        printf(_("Received %d DHCPOFFER(s)"),valid_responses);
+ 
+@@ -1056,7 +1160,7 @@
+        printf(".\n");
+ 
+        return result;
+-        }
++       }
+ 
+ 
+ /* process command-line arguments */
+@@ -1076,7 +1180,7 @@
+                }
+ 
+        return validate_arguments();
+-        }
++       }
+ 
+ 
+ 
+@@ -1181,17 +1285,17 @@
+ 
+                default:
+                        break;
+-                       }
+-               }
++                       }
++               }
+ 
+        return i;
+-        }
++       }
+ 
+ 
+ int validate_arguments(void){
+ 
+        return OK;
+-        }
++       }
+ 
+ 
+ #if defined(__sun__) || defined(__solaris__) || defined(__hpux__)
diff --git a/web/attachments/36739-check_dns.diff b/web/attachments/36739-check_dns.diff
new file mode 100644
index 0000000..c0eb4c6
--- /dev/null
+++ b/web/attachments/36739-check_dns.diff
@@ -0,0 +1,913 @@
+--- check_dns_resolver/check_dns_resolver.c     Mon Nov 25 18:01:26 2002
++++ TarZip/nagiosplug-1.3-beta1/plugins/check_dns.c     Thu Feb 28 01:42:57 2002
+@@ -1,508 +1,415 @@
+-/*
+- * check_dns_resolver is a version of check_dns (for nagios) that
+- * talks to the nameservers without using nslookup
+- *
+- * Author: Roy Marantz (marantz@nbcs.rutgers.edu)
+- * no copyrite - do what you want with this.
+- *
+- * $Id: check_dns_resolver.c,v 1.1.1.1 2002/11/25 23:01:26 marantz Exp $
+- *
+- * solaris build instructions
+- * cc -o check_dns_resolver check_dns_resolver.c  -lresolv -lsocket -lnsl
+- *
+- */
+-
+-#include <stdio.h>
+-#include <signal.h>
+-#include <sys/types.h>
+-#include <netinet/in.h>
+-#include <arpa/nameser.h>
+-#include <resolv.h>
+-#include <netdb.h>
+-#include <arpa/inet.h>
+-#include <time.h>
+-#include  <sys/socket.h>
+-#include <strings.h>
+-#include <stdlib.h>
+-
+-#define MAXPACKET 8192              /* BIND maximum packet size */
+-
+-void catch_alarm(int ignored) {
+-  printf("query timed out\n");
+-  exit(2);
++/******************************************************************************
++ *
++ * CHECK_DNS.C
++ *
++ * Program: DNS plugin for Nagios
++ * License: GPL
++ * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
++ *
++ * Last Modified: $Date: 2002/02/28 06:42:57 $
++ *
++ * Notes:
++ *  - Safe popen added by Karl DeBisschop 9-11-99
++ *
++ * Command line: CHECK_DNS <query_address> [dns_server]
++ *
++ * Description:
++ *
++ * This program will use the nslookup program to obtain the IP address
++ * for a given host name.  A optional DNS server may be specified.  If
++ * no DNS server is specified, the default server(s) for the system
++ * are used.
++ *
++ * Return Values:
++ *  OK           The DNS query was successful (host IP address was returned).
++ *  WARNING      The DNS server responded, but could not fulfill the request.
++ *  CRITICAL     The DNS server is not responding or encountered an error.
++ *
++ * License Information:
++ *
++ * 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 2 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, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ *****************************************************************************/
++
++#include "common.h"
++#include "popen.h"
++#include "utils.h"
++
++int process_arguments (int, char **);
++int call_getopt (int, char **);
++int validate_arguments (void);
++void print_usage (char *);
++void print_help (char *);
++int error_scan (char *);
++
++#define ADDRESS_LENGTH 256
++char query_address[ADDRESS_LENGTH] = "";
++char dns_server[ADDRESS_LENGTH] = "";
++char ptr_server[ADDRESS_LENGTH] = "";
++int verbose = FALSE;
++
++int
++main (int argc, char **argv)
++{
++       char *command_line = NULL;
++       char input_buffer[MAX_INPUT_BUFFER];
++       char *output = NULL;
++       char *address = NULL;
++       char *temp_buffer = NULL;
++       int result = STATE_UNKNOWN;
++
++       /* Set signal handling and alarm */
++       if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
++               printf ("Cannot catch SIGALRM");
++               return STATE_UNKNOWN;
++       }
++
++       if (process_arguments (argc, argv) != OK) {
++               print_usage (my_basename (argv[0]));
++               return STATE_UNKNOWN;
++       }
++
++       /* get the command to run */
++       command_line = ssprintf (command_line, "%s %s %s", NSLOOKUP_COMMAND,
++               query_address, dns_server);
++
++       alarm (timeout_interval);
++       time (&start_time);
++
++       if (verbose)
++               printf ("%s\n", command_line);
++       /* run the command */
++       child_process = spopen (command_line);
++       if (child_process == NULL) {
++               printf ("Could not open pipe: %s\n", command_line);
++               return STATE_UNKNOWN;
++       }
++
++       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
++       if (child_stderr == NULL)
++               printf ("Could not open stderr for %s\n", command_line);
++
++       /* scan stdout */
++       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++
++               if (verbose)
++                       printf ("%s\n", input_buffer);
++
++               if (strstr (input_buffer, ".in-addr.arpa")) {
++                       if ((temp_buffer = strstr (input_buffer, "name = ")))
++                               address = strscpy (address, temp_buffer + 7);
++                       else {
++                               output = strscpy (output, "Unknown error (plugin)");
++                               result = STATE_WARNING;
++                       }
++               }
++
++               /* the server is responding, we just got the host name... */
++               if (strstr (input_buffer, "Name:")) {
++
++                       /* get the host address */
++                       if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
++                               break;
++
++                       if (verbose)
++                               printf ("%s\n", input_buffer);
++
++                       if ((temp_buffer = index (input_buffer, ':'))) {
++                               address = strscpy (address, temp_buffer + 2);
++                               strip (address);
++                               result = STATE_OK;
++                       }
++                       else {
++                               output = strscpy (output, "Unknown error (plugin)");
++                               result = STATE_WARNING;
++                       }
++
++                       break;
++               }
++
++               result = error_scan (input_buffer);
++               if (result != STATE_OK) {
++                       output = strscpy (output, 1 + index (input_buffer, ':'));
++                       break;
++               }
++
++       }
++
++       /* scan stderr */
++       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
++               if (error_scan (input_buffer) != STATE_OK) {
++                       result = max (result, error_scan (input_buffer));
++                       output = strscpy (output, 1 + index (input_buffer, ':'));
++               }
++       }
++
++       /* close stderr */
++       (void) fclose (child_stderr);
++
++       /* close stdout */
++       if (spclose (child_process)) {
++               result = max (result, STATE_WARNING);
++               if (!strcmp (output, ""))
++                       output = strscpy (output, "nslookup returned error status");
++       }
++
++       (void) time (&end_time);
++
++       if (result == STATE_OK)
++               printf ("DNS ok - %d seconds response time, Address(es) is/are %s\n",
++                                               (int) (end_time - start_time), address);
++       else if (result == STATE_WARNING)
++               printf ("DNS WARNING - %s\n",
++                       !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
++       else if (result == STATE_CRITICAL)
++               printf ("DNS CRITICAL - %s\n",
++                       !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
++       else
++               printf ("DNS problem - %s\n",
++                       !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
++
++       return result;
+ }
+ 
+-typedef union {
+-    HEADER hdr;
+-    u_char buf[MAXPACKET];
+-} querybuf;
+-
+-static struct hostent *
+-getanswer(const querybuf *answer,
+-         int anslen,
+-         const char *qname,
+-         int qtype);
+-
+-int debugging = 0;
+-
+-int main (int argc, char **argv) {
+-  int n;
+-  time_t start_time, end_time;
+-  querybuf answer;
+-  struct hostent *hentry;
+-  register char **h;
+-
+-  int norecurse = 0;
+-  int timeout = 30;
+-  char *host = NULL;
+-  char *server = NULL;
+-
+-/*  if (process_arguments (argc, argv) != OK) {
+-    print_usage (my_basename (argv[0]));
+-    exit(1);
+-  }
+-*/
+-
+-  {
+-    int c;
+-    int errflg = 0;
+-    int showversion = 0;
+-    char *pgm = argv[0];
+-    extern char *optarg;
+-    extern int optind;
+-
+-    while ((c = getopt(argc, argv, "dhrt:s:H:V")) != EOF)
+-      switch (c) {
+-      case 't': timeout = atoi(optarg); break;
+-      case 's': server = optarg;        break;
+-      case 'H': host = optarg;          break;
+-      case 'r': norecurse = 1;         break;
+-      case 'd': debugging++;           break;
+-      case 'V': showversion++;         break;
+-      case 'h':
+-      case '?': errflg++;
+-    }
+-    if (host == NULL || errflg || optind != argc) {
+-      fprintf(stderr, "usage: %s %s\n%s %d\n%s\n%s\n%s\n%s\n%s\n",
+-             pgm,
+-             "[-d] [-V] [-r] [-t timeout] [-s server] -H host",
+-             "where: timeout is time (in seconds) to wait for dns server, default",
+-             timeout,
+-             "       host is the fully qualified hostname to ask address of",
+-             "       server is the IP address or hostname of the nameserver to ask, default from /etc/resolv.conf",
+-             "       -r turns off recursive resolver lookups",
+-             "       -d turns on resolver debugging",
+-             "       -V prints program version"
+-             );
+-      exit (2);
+-    }
+-    if (showversion) {
+-      printf("%s version $Revision: 1.1.1.1 $\n", pgm);
+-      exit(0);
+-    }
+-  }
+-
+-
+-  /* Set signal handling and alarm */
+-  if (signal (SIGALRM, catch_alarm) == SIG_ERR) {
+-    printf("DNS problem - Cannot set ALRM handler");
+-    exit(33);
+-  }
+-
+-  /* process /etc/resolv.conf */
+-  if (res_init() == -1) {
+-    printf("DNS problem - Cannot call res_init \n");
+-    exit(33);  
+-  }
+-
+-  if (debugging) {
+-    _res.options |= RES_DEBUG;         /* turn on resolver debugging */
+-  }
+-
+-  if (norecurse) {
+-    _res.options &= ~RES_RECURSE;      /* turn off recursive lookup */
+-  }
+-
+-  if (server) {
+-    struct hostent *hp;
+-    static struct sockaddr_in *a;
+-    in_addr_t s;
+-
+-    /* override the nameservers from resolv.conf */
+-    _res.nscount = 1;
+-    a = &_res.nsaddr_list[0];
+-    /* a->sin_port = ... leave the port alone */
+-
+-    hp = gethostbyname(server);
+-    if (hp && hp->h_addr_list[0] != NULL) {
+-      a->sin_family = hp->h_addrtype;
+-      bcopy(hp->h_addr_list[0], &a->sin_addr, hp->h_length);
+-    } else {
+-      /* assume a dotted quad address */
+-      s = inet_addr(server);
+-      if (s == -1) {
+-       printf("DNS problem - Cannot resolve server %s\n", server);
+-       exit(33);  
+-      }
+-      a->sin_family = AF_INET;
+-      bcopy(&s, &a->sin_addr, sizeof(in_addr_t));
+-    }
+-  }
+-
+-  time (&start_time);
+-  alarm (timeout);
+-
+-  n = res_query(host, C_IN, T_A, answer.buf, sizeof(answer));
+-
+-  alarm(0);                            /* cancel pending alarm */
+-  (void) time (&end_time);
+-
+-  if (n < 0) {
+-    printf("DNS CRITICAL - query failed: %d\n", n);
+-    exit(n);
+-  }
+-
+-  hentry = getanswer(&answer, n, host, T_A);
+-  if (hentry == NULL) {
+-    printf("DNS WARNING - no answer\n");
+-    exit(2);
+-  }
+-  printf("DNS ok - %d seconds response time, Address(es) is/are",
+-       (int) (end_time - start_time));
+-  for(h=hentry->h_addr_list; *h; h++) {
+-    struct in_addr a;
+-    bcopy(*h, &a, hentry->h_length);
+-    printf(" %s", inet_ntoa(a));
+-  }
+-  printf("\n");
++int
++error_scan (char *input_buffer)
++{
++
++       /* the DNS lookup timed out */
++       if (strstr (input_buffer,
++            "Note:  nslookup is deprecated and may be removed from future releases.")
++           || strstr (input_buffer,
++            "Consider using the `dig' or `host' programs instead.  Run nslookup with")
++           || strstr (input_buffer,
++            "the `-sil[ent]' option to prevent this message from appearing."))
++               return STATE_OK;
++
++       /* the DNS lookup timed out */
++       else if (strstr (input_buffer, "Timed out"))
++               return STATE_WARNING;
++
++       /* DNS server is not running... */
++       else if (strstr (input_buffer, "No response from server"))
++               return STATE_CRITICAL;
++
++       /* Host name is valid, but server doesn't have records... */
++       else if (strstr (input_buffer, "No records"))
++               return STATE_WARNING;
++
++       /* Host or domain name does not exist */
++       else if (strstr (input_buffer, "Non-existent"))
++               return STATE_CRITICAL;
++       else if (strstr (input_buffer, "** server can't find"))
++               return STATE_CRITICAL;
++       else if(strstr(input_buffer,"NXDOMAIN")) /* 9.x */
++               return STATE_CRITICAL;
++
++       /* Connection was refused */
++       else if (strstr (input_buffer, "Connection refused"))
++               return STATE_CRITICAL;
++
++       /* Network is unreachable */
++       else if (strstr (input_buffer, "Network is unreachable"))
++               return STATE_CRITICAL;
++
++       /* Internal server failure */
++       else if (strstr (input_buffer, "Server failure"))
++               return STATE_CRITICAL;
++
++       /* DNS server refused to service request */
++       else if (strstr (input_buffer, "Refused"))
++               return STATE_CRITICAL;
++
++       /* Request error */
++       else if (strstr (input_buffer, "Format error"))
++               return STATE_WARNING;
++
++       else
++               return STATE_OK;
+ 
+- exit(0);
+ }
+ 
++/* process command-line arguments */
++int
++process_arguments (int argc, char **argv)
++{
++       int c;
++
++       if (argc < 2)
++               return ERROR;
+ 
++       for (c = 1; c < argc; c++)
++               if (strcmp ("-to", argv[c]) == 0)
++                       strcpy (argv[c], "-t");
++
++       c = 0;
++       while (c += (call_getopt (argc - c, &argv[c]))) {
++               if (argc <= c)
++                       break;
++               if (query_address[0] == 0) {
++                       if (is_host (argv[c]) == FALSE) {
++                               printf ("Invalid name/address: %s\n\n", argv[c]);
++                               return ERROR;
++                       }
++                       if (strlen (argv[c]) >= ADDRESS_LENGTH)
++                               terminate (STATE_UNKNOWN, "Input buffer overflow\n");
++                       strcpy (query_address, argv[c]);
++               }
++               else if (dns_server[0] == 0) {
++                       if (is_host (argv[c]) == FALSE) {
++                               printf ("Invalid name/address: %s\n\n", argv[c]);
++                               return ERROR;
++                       }
++                       if (strlen (argv[c]) >= ADDRESS_LENGTH)
++                               terminate (STATE_UNKNOWN, "Input buffer overflow\n");
++                       strcpy (dns_server, argv[c]);
++               }
++       }
+ 
+-/* stripped down getanswer */
++       return validate_arguments ();
++
++}
+ 
+-/*
+- * Copyright (c) 1985, 1988, 1993
+- *    The Regents of the University of California.  All rights reserved.
+- * 
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in the
+- *    documentation and/or other materials provided with the distribution.
+- * 3. All advertising materials mentioning features or use of this software
+- *    must display the following acknowledgement:
+- *      This product includes software developed by the University of
+- *      California, Berkeley and its contributors.
+- * 4. Neither the name of the University nor the names of its contributors
+- *    may be used to endorse or promote products derived from this software
+- *    without specific prior written permission.
+- * 
+- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+- * SUCH DAMAGE.
+- * -
+- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+- * 
+- * Permission to use, copy, modify, and distribute this software for any
+- * purpose with or without fee is hereby granted, provided that the above
+- * copyright notice and this permission notice appear in all copies, and that
+- * the name of Digital Equipment Corporation not be used in advertising or
+- * publicity pertaining to distribution of the document or software without
+- * specific, written prior permission.
+- * 
+- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+- * SOFTWARE.
+- * -
+- * --Copyright--
+- */
+-
+-static const char AskedForGot[] =
+-    "gethostby*.getanswer: asked for \"%s\", got \"%s\"";
+-static char *h_addr_ptrs[MAXADDRS + 1];
+-
+-static struct hostent host;
+-static char *host_aliases[MAXALIASES];
+-static char hostbuf[8*1024];
+-static u_char host_addr[16];    /* IPv4 or IPv6 */
+-static FILE *hostf = NULL;
+-static int stayopen = 0;
+-
+-
+-typedef union {
+-    int32_t al;
+-    char ac;
+-} align;
+-
+-#define dprintf printf
+-
+-static struct hostent *
+-getanswer(const querybuf *answer,
+-         int anslen,
+-         const char *qname,
+-         int qtype)
++int
++call_getopt (int argc, char **argv)
+ {
+-  register const HEADER *hp;
+-  register const u_char *cp;
+-  register int n;
+-  const u_char *eom;
+-  char *bp, **ap, **hap;
+-  int type, class, buflen, ancount, qdcount;
+-  int haveanswer, had_error;
+-  int toobig = 0;
+-  char tbuf[MAXDNAME];
+-  const char *tname;
+-  int (*name_ok) __P((const char *));
+-
+-  tname = qname;
+-  host.h_name = NULL;
+-  host.h_length = INADDRSZ;
+-  host.h_addrtype = AF_INET;
+-
+-  eom = answer->buf + anslen;
+-  switch (qtype) {
+-  case T_A:
+-  case T_AAAA:
+-    name_ok = res_hnok;
+-    break;
+-  case T_PTR:
+-    name_ok = res_dnok;
+-    break;
+-  default:
+-    return (NULL);  /* XXX should be abort(); */
+-  }
+-  /*
+-   * find first satisfactory answer
+-   */
+-  hp = &answer->hdr;
+-  ancount = ntohs(hp->ancount);
+-  qdcount = ntohs(hp->qdcount);
+-  bp = hostbuf;
+-  buflen = sizeof hostbuf;
+-  cp = answer->buf + HFIXEDSZ;
+-  if (qdcount != 1) {
+-    h_errno = NO_RECOVERY;
+-    return (NULL);
+-  }
+-  n = dn_expand(answer->buf, eom, cp, bp, buflen);
+-  if ((n < 0) || !(*name_ok)(bp)) {
+-    h_errno = NO_RECOVERY;
+-    return (NULL);
+-  }
+-  cp += n + QFIXEDSZ;
+-  if (qtype == T_A || qtype == T_AAAA) {
+-    /* res_send() has already verified that the query name is the
+-     * same as the one we sent; this just gets the expanded name
+-     * (i.e., with the succeeding search-domain tacked on).
+-     */
+-    n = strlen(bp) + 1;             /* for the \0 */
+-    host.h_name = bp;
+-    bp += n;
+-    buflen -= n;
+-    /* The qname can be abbreviated, but h_name is now absolute. */
+-    qname = host.h_name;
+-  }
+-  ap = host_aliases;
+-  *ap = NULL;
+-  host.h_aliases = host_aliases;
+-  hap = h_addr_ptrs;
+-  *hap = NULL;
+-  host.h_addr_list = h_addr_ptrs;
+-  haveanswer = 0;
+-  had_error = 0;
+-  while (ancount-- > 0 && cp < eom && !had_error) {
+-    n = dn_expand(answer->buf, eom, cp, bp, buflen);
+-    if ((n < 0) || !(*name_ok)(bp)) {
+-      had_error++;
+-      continue;
+-    }
+-
+-    cp += n;                        /* name */
+-    type = _getshort(cp);
+-    cp += INT16SZ;                  /* type */
+-    class = _getshort(cp);
+-    cp += INT16SZ + INT32SZ;        /* class, TTL */
+-    n = _getshort(cp);
+-    cp += INT16SZ;                  /* len */
+-    if (class != C_IN) {
+-      /* XXX - debug? syslog? */
+-      cp += n;
+-      continue;               /* XXX - had_error++ ? */
+-    }
+-    if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
+-      if (ap >= &host_aliases[MAXALIASES-1])
+-       continue;
+-      n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
+-      if ((n < 0) || !(*name_ok)(tbuf)) {
+-       had_error++;
+-       continue;
+-      }
+-      cp += n;
+-      /* Store alias. */
+-      *ap++ = bp;
+-      n = strlen(bp) + 1;     /* for the \0 */
+-      bp += n;
+-      buflen -= n;
+-      /* Get canonical name. */
+-      n = strlen(tbuf) + 1;   /* for the \0 */
+-      if (n > buflen) {
+-       had_error++;
+-       continue;
+-      }
+-      strcpy(bp, tbuf);
+-      host.h_name = bp;
+-      bp += n;
+-      buflen -= n;
+-      continue;
+-    }
+-
+-    if (qtype == T_PTR && type == T_CNAME) {
+-      n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
+-      if ((n < 0) || !res_hnok(tbuf)) {
+-       had_error++;
+-       continue;
+-      }
+-      cp += n;
+-      /* Get canonical name. */
+-      n = strlen(tbuf) + 1;   /* for the \0 */
+-      if (n > buflen) {
+-       had_error++;
+-       continue;
+-      }
+-      strcpy(bp, tbuf);
+-      tname = bp;
+-      bp += n;
+-      buflen -= n;
+-      continue;
+-    }
+-    if (type != qtype) {
+-      dprintf("gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
+-            qname, p_class(C_IN), p_type(qtype),
+-            p_type(type));
+-      cp += n;
+-      continue;               /* XXX - had_error++ ? */
+-    }
+-    switch (type) {
+-    case T_PTR:
+-      if (strcasecmp(tname, bp) != 0) {
+-       dprintf(AskedForGot, qname, bp);
+-       cp += n;
+-       continue;       /* XXX - had_error++ ? */
+-      }
+-      n = dn_expand(answer->buf, eom, cp, bp, buflen);
+-      if ((n < 0) || !res_hnok(bp)) {
+-       had_error++;
+-       break;
+-      }
+-#if MULTI_PTRS_ARE_ALIASES
+-      cp += n;
+-      if (!haveanswer)
+-       host.h_name = bp;
+-      else if (ap < &host_aliases[MAXALIASES-1])
+-       *ap++ = bp;
+-      else
+-       n = -1;
+-      if (n != -1) {
+-       n = strlen(bp) + 1;     /* for the \0 */
+-       bp += n;
+-       buflen -= n;
+-      }
+-      break;
++       int c, i = 1;
+ 
++#ifdef HAVE_GETOPT_H
++       int opt_index = 0;
++       static struct option long_opts[] = {
++               {"help", no_argument, 0, 'h'},
++               {"version", no_argument, 0, 'V'},
++               {"verbose", no_argument, 0, 'v'},
++               {"timeout", required_argument, 0, 't'},
++               {"hostname", required_argument, 0, 'H'},
++               {"server", required_argument, 0, 's'},
++               {"reverse-server", required_argument, 0, 'r'},
++               {0, 0, 0, 0}
++       };
++#endif
++
++
++       while (1) {
++#ifdef HAVE_GETOPT_H
++               c = getopt_long (argc, argv, "+?hVvt:H:s:r:", long_opts, &opt_index);
+ #else
+-      host.h_name = bp;
+-      h_errno = NETDB_SUCCESS;
+-      return (&host);
++               c = getopt (argc, argv, "+?hVvt:H:s:r:");
+ #endif
+-    case T_A:
+-    case T_AAAA:
+-      if (strcasecmp(host.h_name, bp) != 0) {
+-       dprintf(AskedForGot, host.h_name, bp);
+-       cp += n;
+-       continue;       /* XXX - had_error++ ? */
+-      }
+-      if (n != host.h_length) {
+-       cp += n;
+-       continue;
+-      }
+-      if (!haveanswer) {
+-       register int nn;
+-
+-       host.h_name = bp;
+-       nn = strlen(bp) + 1;    /* for the \0 */
+-       bp += nn;
+-       buflen -= nn;
+-      }
+-
+-      bp += sizeof(align) - ((u_long)bp % sizeof(align));
+-
+-      if (bp + n >= &hostbuf[sizeof hostbuf]) {
+-       dprintf("size (%d) too big\n", n);
+-       had_error++;
+-       continue;
+-      }
+-      if (hap >= &h_addr_ptrs[MAXADDRS-1]) {
+-       if (!toobig++)
+-         dprintf("Too many addresses (%d)\n",
+-                 MAXADDRS);
+-       cp += n;
+-       continue;
+-      }
+-      bcopy(cp, *hap++ = bp, n);
+-      bp += n;
+-      buflen -= n;
+-      cp += n;
+-      break;
+-    default:
+-      abort();
+-    }
+-    if (!had_error)
+-      haveanswer++;
+-  }
+-  if (haveanswer) {
+-    *ap = NULL;
+-    *hap = NULL;
+-# if defined(RESOLVSORT)
+-    /*
+-     * Note: we sort even if host can take only one address
+-     * in its return structures - should give it the "best"
+-     * address in that case, not some random one
+-     */
+-    if (_res.nsort && haveanswer > 1 && qtype == T_A)
+-      addrsort(h_addr_ptrs, haveanswer);
+-# endif /*RESOLVSORT*/
+-    if (!host.h_name) {
+-      n = strlen(qname) + 1;  /* for the \0 */
+-      if (n > buflen)
+-       goto try_again;
+-      strcpy(bp, qname);
+-      host.h_name = bp;
+-      bp += n;
+-      buflen -= n;
+-    }
+-    h_errno = NETDB_SUCCESS;
+-    return (&host);
+-  }
+- try_again:
+-  h_errno = TRY_AGAIN;
+-  return (NULL);
++
++               if (c == -1 || c == EOF)
++                       break;
++
++               i++;
++               switch (c) {
++               case 't':
++               case 'H':
++               case 's':
++               case 'r':
++                       i++;
++               }
++
++               switch (c) {
++               case '?': /* args not parsable */
++                       printf ("%s: Unknown argument: %s\n\n", my_basename (argv[0]), optarg);
++                       print_usage (my_basename (argv[0]));
++                       exit (STATE_UNKNOWN);
++               case 'h': /* help */
++                       print_help (my_basename (argv[0]));
++                       exit (STATE_OK);
++               case 'V': /* version */
++                       print_revision (my_basename (argv[0]), "$Revision: 1.1.1.1 $");
++                       exit (STATE_OK);
++               case 'v': /* version */
++                       verbose = TRUE;
++                       break;
++               case 't': /* timeout period */
++                       timeout_interval = atoi (optarg);
++                       break;
++               case 'H': /* hostname */
++                       if (is_host (optarg) == FALSE) {
++                               printf ("Invalid host name/address\n\n");
++                               print_usage (my_basename (argv[0]));
++                               exit (STATE_UNKNOWN);
++                       }
++                       if (strlen (optarg) >= ADDRESS_LENGTH)
++                               terminate (STATE_UNKNOWN, "Input buffer overflow\n");
++                       strcpy (query_address, optarg);
++                       break;
++               case 's': /* server name */
++                       if (is_host (optarg) == FALSE) {
++                               printf ("Invalid server name/address\n\n");
++                               print_usage (my_basename (argv[0]));
++                               exit (STATE_UNKNOWN);
++                       }
++                       if (strlen (optarg) >= ADDRESS_LENGTH)
++                               terminate (STATE_UNKNOWN, "Input buffer overflow\n");
++                       strcpy (dns_server, optarg);
++                       break;
++               case 'r': /* reverse server name */
++                       if (is_host (optarg) == FALSE) {
++                               printf ("Invalid host name/address\n\n");
++                               print_usage (my_basename (argv[0]));
++                               exit (STATE_UNKNOWN);
++                       }
++                       if (strlen (optarg) >= ADDRESS_LENGTH)
++                               terminate (STATE_UNKNOWN, "Input buffer overflow\n");
++                       strcpy (ptr_server, optarg);
++                       break;
++               }
++       }
++       return i;
++}
++
++int
++validate_arguments ()
++{
++       if (query_address[0] == 0)
++               return ERROR;
++       else
++               return OK;
++}
++
++void
++print_usage (char *cmd)
++{
++       printf ("Usage: %s -H host [-s server] [-t timeout]\n" "       %s --help\n"
++                                       "       %s --version\n", cmd, cmd, cmd);
++}
++
++void
++print_help (char *cmd)
++{
++       print_revision (cmd, "$Revision: 1.1.1.1 $");
++       printf ("Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)\n\n");
++       print_usage (cmd);
++       printf ("\n");
++       printf
++               ("-H, --hostname=HOST\n"
++                "   The name or address you want to query\n"
++                "-s, --server=HOST\n"
++                "   Optional DNS server you want to use for the lookup\n"
++                "-t, --timeout=INTEGER\n"
++                "   Seconds before connection times out (default: %d)\n"
++                "-h, --help\n"
++                "   Print detailed help\n"
++                "-V, --version\n"
++                "   Print version numbers and license information\n"
++                "\n"
++                "This plugin uses the nslookup program to obtain the IP address\n"
++                "for the given host/domain query.  A optional DNS server to use may\n"
++                "be specified.  If no DNS server is specified, the default server(s)\n"
++                "specified in /etc/resolv.conf will be used.\n", DEFAULT_SOCKET_TIMEOUT);
+ }
diff --git a/web/attachments/36789-NSClient-1.07.0_1.patch b/web/attachments/36789-NSClient-1.07.0_1.patch
new file mode 100644
index 0000000..7ce4552
--- /dev/null
+++ b/web/attachments/36789-NSClient-1.07.0_1.patch
@@ -0,0 +1,240 @@
+diff -uNr NSClient-1.07.0.orig/UnixSource/check_nt.c NSClient-1.07.0/UnixSource/check_nt.c
+--- NSClient-1.07.0.orig/UnixSource/check_nt.c  Sun Feb 24 14:55:48 2002
++++ NSClient-1.07.0/UnixSource/check_nt.c       Wed Nov 27 12:10:46 2002
+@@ -95,7 +95,7 @@
+        int updays=0;
+        int uphours=0;
+        int upminutes=0;
+-       req_password=strscpy(req_password,"None");
++       asprintf(&req_password,"None");
+ 
+        if(process_arguments(argc,argv)==ERROR)
+                usage("Could not parse arguments\n");
+@@ -108,11 +108,11 @@
+ 
+        if (vars_to_check==CHECK_CLIENTVERSION) {
+                        
+-               send_buffer = strscpy(send_buffer,strcat(req_password,"&1"));
++               asprintf(&send_buffer,strcat(req_password,"&1"));
+                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if(result!=STATE_OK)
+                        return result;
+-               output_message = strscpy(output_message,recv_buffer);
++               asprintf(&output_message,recv_buffer);
+                return_code=STATE_OK;
+        }
+        else if(vars_to_check==CHECK_CPULOAD){
+@@ -121,14 +121,14 @@
+                        if (strtolarray(&lvalue_list,value_list,",")==TRUE) {
+                                // -l parameters is present with only integers
+                                return_code=STATE_OK;
+-                               temp_string = strscpy(temp_string,"CPU Load");
++                               asprintf(&temp_string,"CPU Load");
+                                while (lvalue_list[0+offset]>0 && lvalue_list[0+offset]<=17280 && 
+                                                        lvalue_list[1+offset]>=0 && lvalue_list[1+offset]<=100 && 
+                                                        lvalue_list[2+offset]>=0 && lvalue_list[2+offset]<=100) {
+                                        // loop until one of the parameters is wrong or not present
+ 
+                                        // Send request and retrieve data
+-                                       send_buffer = ssprintf(send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]);
++                                       asprintf(&send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]);
+                                        result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                                        if(result!=STATE_OK)
+                                                return result;
+@@ -146,27 +146,27 @@
+                                        else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING)
+                                                return_code=STATE_WARNING;
+ 
+-                                       output_message = ssprintf(output_message," (%lu min. %lu%)",lvalue_list[0+offset], utilization);
+-                                       temp_string = strscat(temp_string,output_message);
++                                       asprintf(&output_message," (%lu min. %lu%)",lvalue_list[0+offset], utilization);
++                                       asprintf(&temp_string,"%s%s",temp_string,output_message);
+                                        offset+=3;      //move accross the array 
+                                }               
+                                if (strlen(temp_string)>10) {
+                                        // we had at least on loop
+-                                       output_message = ssprintf(output_message,"%s",temp_string);
++                                       asprintf(&output_message,"%s",temp_string);
+                                }       
+                                else
+-                                       output_message = strscpy(output_message,"not enough values for -l parameters");
++                                       asprintf(&output_message,"%s","not enough values for -l parameters");
+                                        
+                        } else 
+-                               output_message = strscpy(output_message,"wrong -l parameter.");
++                               asprintf(&output_message,"wrong -l parameter.");
+ 
+                } else
+-                       output_message = strscpy(output_message,"missing -l parameters");
++                       asprintf(&output_message,"missing -l parameters");
+        }
+ 
+        else if(vars_to_check==CHECK_UPTIME){
+ 
+-               send_buffer = strscpy(send_buffer,strcat(req_password,"&3"));
++               asprintf(&send_buffer,strcat(req_password,"&3"));
+                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if(result!=STATE_OK)
+                        return result;
+@@ -180,7 +180,7 @@
+                updays = uptime / 86400;                        
+                uphours = (uptime % 86400) / 3600;
+                upminutes = ((uptime % 86400) % 3600) / 60;
+-               output_message = ssprintf(output_message,"System Uptime : %u day(s) %u hour(s) %u minute(s)",updays,uphours, upminutes);
++               asprintf(&output_message,"System Uptime : %u day(s) %u hour(s) %u minute(s)",updays,uphours, upminutes);
+                return_code=STATE_OK;
+        }
+ 
+@@ -189,7 +189,7 @@
+                return_code=STATE_UNKNOWN;      
+                if (check_value_list==TRUE) {
+                        if (strlen(value_list)==1) {
+-                               send_buffer = ssprintf(send_buffer,"%s&4&%s", req_password, value_list);
++                               asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
+                                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                                if(result!=STATE_OK)
+                                        return result;
+@@ -204,7 +204,7 @@
+                                percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+ 
+                                if (free_disk_space>=0) {
+-                                       temp_string = ssprintf(temp_string,"%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)",
++                                       asprintf(&temp_string,"%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)",
+                                                        value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824, percent_used_space,
+                                                         free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100); 
+ 
+@@ -216,18 +216,18 @@
+                                        else
+                                                return_code=STATE_OK;   
+ 
+-                                       output_message = ssprintf(output_message,"%s",temp_string);
++                                       asprintf(&output_message,"%s",temp_string);
+ 
+                                }
+                                else {
+-                                       output_message = ssprintf(output_message,"Free disk space : Invalid drive ");
++                                       asprintf(&output_message,"Free disk space : Invalid drive ");
+                                        return_code=STATE_UNKNOWN;
+                                }               
+                        }
+                        else 
+-                               output_message = strscpy(output_message,"wrong -l argument");
++                               asprintf(&output_message,"wrong -l argument");
+                } else 
+-                       output_message = strscpy(output_message,"missing -l parameters");
++                       asprintf(&output_message,"missing -l parameters");
+                        
+        }
+ 
+@@ -235,7 +235,7 @@
+ 
+                if (check_value_list==TRUE) {
+                        preparelist(value_list);                // replace , between services with & to send the request
+-                       send_buffer = ssprintf(send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
++                       asprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
+                                (show_all==TRUE)?"ShowAll":"ShowFail",value_list);
+                        result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if(result!=STATE_OK)
+@@ -247,15 +247,15 @@
+                        }
+                        return_code=atoi(strtok(recv_buffer,"&"));
+                        temp_string=strtok(NULL,"&");
+-                       output_message = ssprintf(output_message, "%s",temp_string);
++                       asprintf(&output_message, "%s",temp_string);
+                }
+                else 
+-                       output_message = strscpy(output_message,"No service/process specified");
++                       asprintf(&output_message,"No service/process specified");
+        }
+ 
+        else if(vars_to_check==CHECK_MEMUSE) {
+                
+-               send_buffer = ssprintf(send_buffer,"%s&7", req_password);
++               asprintf(&send_buffer,"%s&7", req_password);
+                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                if (result!=STATE_OK)
+                        return result;
+@@ -268,7 +268,7 @@
+                mem_commitLimit=atof(strtok(recv_buffer,"&"));
+                mem_commitByte=atof(strtok(NULL,"&"));
+                percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
+-               output_message = ssprintf(output_message,"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)", 
++               asprintf(&output_message,"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)", 
+                        mem_commitLimit / 1048576, mem_commitByte / 1048567, percent_used_space,  
+                        (mem_commitLimit - mem_commitByte) / 1048576, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+        
+@@ -285,7 +285,7 @@
+ 
+                if (check_value_list==TRUE) {                                                                                                                                                   
+                        preparelist(value_list);                // replace , between services with & to send the request
+-                       send_buffer = ssprintf(send_buffer,"%s&8&%s", req_password,value_list);
++                       asprintf(&send_buffer,"%s&8&%s", req_password,value_list);
+                        result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+                                return result;
+@@ -299,9 +299,9 @@
+                        description = strtok(NULL,"&");
+                        counter_value = atof(recv_buffer);
+                        if (description == NULL) 
+-                               output_message = ssprintf(output_message, "%.f", counter_value);
++                               asprintf(&output_message, "%.f", counter_value);
+                        else
+-                               output_message = ssprintf(output_message, description, counter_value);
++                               asprintf(&output_message, description, counter_value);
+        
+                        if (critical_value > warning_value) {
+                                // Normal thresholds            
+@@ -324,7 +324,7 @@
+                
+                }
+                else {
+-                       output_message = strscpy(output_message,"No counter specified");
++                       asprintf(&output_message,"No counter specified");
+                        result=STATE_UNKNOWN;
+                }
+        }
+@@ -332,7 +332,7 @@
+ 
+                if (check_value_list==TRUE) {                                                                                                                                                   
+                        preparelist(value_list);                // replace , between services with & to send the request
+-                       send_buffer = ssprintf(send_buffer,"%s&9&%s", req_password,value_list);
++                       asprintf(&send_buffer,"%s&9&%s", req_password,value_list);
+                        result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+                                return result;
+@@ -344,7 +344,7 @@
+ 
+                        age_in_minutes = atoi(strtok(recv_buffer,"&"));
+                        description = strtok(NULL,"&");
+-                       output_message = ssprintf(output_message, description);
++                       asprintf(&output_message, description);
+        
+                        if (critical_value > warning_value) {
+                                // Normal thresholds            
+@@ -367,7 +367,7 @@
+                
+                }
+                else {
+-                       output_message = strscpy(output_message,"No file specified");
++                       asprintf(&output_message,"No file specified");
+                        result=STATE_UNKNOWN;
+                }
+        }
+@@ -447,7 +447,7 @@
+                                server_address=optarg;
+                                break;
+                        case 's': /* password */
+-                               req_password=strscpy(req_password,optarg);
++                               asprintf(&req_password,optarg);
+                                break;
+                        case 'p': /* port */
+                                if (is_intnonneg(optarg))
+@@ -480,7 +480,7 @@
+                                        return ERROR;
+                                break;
+                        case 'l': /* value list */
+-                               value_list=strscpy(value_list,optarg);
++                               asprintf(&value_list,optarg);
+                                check_value_list=TRUE;
+                                break;
+                        case 'w': /* warning threshold */
diff --git a/web/attachments/367917-check_http.HTTP_CONNECT_patch b/web/attachments/367917-check_http.HTTP_CONNECT_patch
new file mode 100644
index 0000000..00a4008
--- /dev/null
+++ b/web/attachments/367917-check_http.HTTP_CONNECT_patch
@@ -0,0 +1,145 @@
+*** plugins/check_http.c.orig   2010-03-18 15:05:53.000000000 -0400
+--- plugins/check_http.c        2010-03-23 14:26:48.000000000 -0400
+***************
+*** 121,126 ****
+--- 121,127 ----
+  char *http_post_data;
+  char *http_content_type;
+  char buffer[MAX_INPUT_BUFFER];
++ int http_connect = FALSE;
+  
+  int process_arguments (int, char **);
+  int check_http (void);
+***************
+*** 186,191 ****
+--- 187,193 ----
+      {"link", no_argument, 0, 'L'},
+      {"nohtml", no_argument, 0, 'n'},
+      {"ssl", no_argument, 0, 'S'},
++     {"http-connect", no_argument, 0, 'K'},
+      {"post", required_argument, 0, 'P'},
+      {"method", required_argument, 0, 'j'},
+      {"IP-address", required_argument, 0, 'I'},
+***************
+*** 229,235 ****
+    }
+  
+    while (1) {
+!     c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+      if (c == -1 || c == EOF)
+        break;
+  
+--- 231,237 ----
+    }
+  
+    while (1) {
+!     c = getopt_long (argc, argv, "Vvh46Kt:c:w:A:k:H:P:j:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+      if (c == -1 || c == EOF)
+        break;
+  
+***************
+*** 401,406 ****
+--- 403,411 ----
+        usage4 (_("IPv6 support not available"));
+  #endif
+        break;
++     case 'K': /* use http-connect */
++       http_connect = TRUE;
++       break;
+      case 'v': /* verbose */
+        verbose = TRUE;
+        break;
+***************
+*** 790,795 ****
+--- 795,807 ----
+      die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+  #ifdef HAVE_SSL
+    if (use_ssl == TRUE) {
++ 
++     if (http_connect == TRUE) {
++       /* only using port 443 */
++       if (http_connect_through_proxy(host_name, 443, user_agent, sd) != STATE_OK)
++       die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open proxy tunnel TCP socket\n"));
++     }
++ 
+      np_net_ssl_init_with_hostname(sd, host_name);
+      if (check_cert == TRUE) {
+        result = np_net_ssl_check_cert(days_till_exp);
+***************
+*** 1234,1239 ****
+--- 1246,1290 ----
+  }
+  
+  
++ 
++ /* start the HTTP CONNECT method exchange with a proxy host */
++ int
++ http_connect_through_proxy (char *host_name, int port, char *user_agent, int sd)
++ {
++   int result;
++   char *send_buffer=NULL;
++   char recv_buffer[MAX_INPUT_BUFFER];
++   char *status_line;
++   char *status_code;
++   int http_status;
++ 
++   asprintf( &send_buffer, "CONNECT %s:%d HTTP/1.0\r\nUser-agent: %s\r\n\r\n", host_name, port, user_agent);
++ 
++   result = STATE_OK;
++   result = send_tcp_request (sd, send_buffer, recv_buffer, sizeof(recv_buffer));
++   if (result != STATE_OK)
++     return result;
++ 
++   status_line = recv_buffer;
++   status_line[strcspn(status_line, "\r\n")] = 0;
++   strip (status_line);
++   if (verbose)
++     printf ("HTTP_CONNECT STATUS: %s\n", status_line);
++ 
++   status_code = strchr (status_line, ' ') + sizeof (char);
++   if (strspn (status_code, "1234567890") != 3)
++     die (STATE_CRITICAL, _("HTTP CRITICAL: HTTP_CONNECT Returns Invalid Status Line (%s)\n"), status_line);
++ 
++   http_status = atoi (status_code);
++ 
++   if (http_status != 200) {
++     die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid HTTP Connect Proxy Status (%s)\n"), status_line);
++   }
++ 
++   return STATE_OK;
++ }
++ 
++ 
+  int
+  server_type_check (const char *type)
+  {
+***************
+*** 1308,1313 ****
+--- 1359,1368 ----
+  #ifdef HAVE_SSL
+    printf (" %s\n", "-S, --ssl");
+    printf ("   %s\n", _("Connect via SSL. Port defaults to 443"));
++   printf (" %s\n", "-K, --http-connect");
++   printf ("   %s\n", _("Connect to a proxy using the HTTP CONNECT protocol (SSL tunnel)."));
++   printf ("   %s\n", _("Requires -S option.  Will only connect to host through tunnel"));
++   printf ("   %s\n", _("on port 443."));
+    printf (" %s\n", "-C, --certificate=INTEGER");
+    printf ("   %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
+    printf ("   %s\n", _("(when this option is used the URL is not checked.)\n"));
+***************
+*** 1406,1412 ****
+  {
+    printf (_("Usage:"));
+    printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
+!   printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n");
+    printf ("       [-a auth] [-f <ok | warn | critcal | follow | sticky | stickyport>]\n");
+    printf ("       [-e <expect>] [-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");
+--- 1461,1467 ----
+  {
+    printf (_("Usage:"));
+    printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
+!   printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-K]\n");
+    printf ("       [-a auth] [-f <ok | warn | critcal | follow | sticky | stickyport>]\n");
+    printf ("       [-e <expect>] [-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");
diff --git a/web/attachments/368326-check_ide_smart.c.patch b/web/attachments/368326-check_ide_smart.c.patch
new file mode 100644
index 0000000..f357216
--- /dev/null
+++ b/web/attachments/368326-check_ide_smart.c.patch
@@ -0,0 +1,22 @@
+--- plugins/check_ide_smart.c   Mon Dec  1 00:23:18 2008
++++ plugins/check_ide_smart.c.new       Fri Mar 26 17:38:17 2010
+@@ -158,9 +158,6 @@
+        values_t values;
+        int fd;
+ 
+-       /* Parse extra opts if any */
+-       argv=np_extra_opts (&argc, argv, progname);
+-
+        static struct option longopts[] = { 
+                {"device", required_argument, 0, 'd'}, 
+                {"immediate", no_argument, 0, 'i'}, 
+@@ -173,6 +170,9 @@
+                {0, 0, 0, 0}
+        };
+ 
++       /* Parse extra opts if any */
++       argv=np_extra_opts (&argc, argv, progname);
++
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
diff --git a/web/attachments/371559-check_nt.c b/web/attachments/371559-check_nt.c
new file mode 100644
index 0000000..f21a17a
--- /dev/null
+++ b/web/attachments/371559-check_nt.c
@@ -0,0 +1,772 @@
+/*****************************************************************************
+* 
+* Nagios check_nt plugin
+* 
+* License: GPL
+* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
+* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* 
+* Description:
+* 
+* This file contains the check_nt plugin
+* 
+* This plugin collects data from the NSClient service running on a
+* Windows NT/2000/XP/2003 server.
+* This plugin requires NSClient software to run on NT
+* (http://nsclient.ready2run.nl/)
+* 
+* 
+* 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/>.
+* 
+* 
+*****************************************************************************/
+
+const char *progname = "check_nt";
+const char *copyright = "2000-2007";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
+enum checkvars {
+        CHECK_NONE,
+        CHECK_CLIENTVERSION,
+        CHECK_CPULOAD,
+        CHECK_UPTIME,
+        CHECK_USEDDISKSPACE,
+        CHECK_SERVICESTATE,
+        CHECK_PROCSTATE,
+        CHECK_MEMUSE,
+        CHECK_COUNTER,
+        CHECK_FILEAGE,
+        CHECK_INSTANCES
+};
+
+enum {
+        MAX_VALUE_LIST = 30,
+        PORT = 1248
+};
+
+char *server_address=NULL;
+char *volume_name=NULL;
+int server_port=PORT;
+char *value_list=NULL;
+char *req_password=NULL;
+unsigned long lvalue_list[MAX_VALUE_LIST];
+unsigned long warning_value=0L;
+unsigned long critical_value=0L;
+int check_warning_value=FALSE;
+int check_critical_value=FALSE;
+enum checkvars vars_to_check = CHECK_NONE;
+int show_all=FALSE;
+
+char recv_buffer[MAX_INPUT_BUFFER];
+
+void fetch_data (const char* address, int port, const char* sendb);
+int process_arguments(int, char **);
+void preparelist(char *string);
+int strtoularray(unsigned long *array, char *string, const char *delim);
+void print_help(void);
+void print_usage(void);
+
+int main(int argc, char **argv){
+
+/* should be    int result = STATE_UNKNOWN; */
+
+        int return_code = STATE_UNKNOWN;
+        char *send_buffer=NULL;
+        char *output_message=NULL;
+        char *perfdata=NULL;
+        char *temp_string=NULL;
+        char *temp_string_perf=NULL;
+        char *description=NULL,*counter_unit = NULL;
+        char *minval = NULL, *maxval = NULL, *errcvt = NULL;
+        char *fds=NULL, *tds=NULL;
+
+        double total_disk_space=0;
+        double free_disk_space=0;
+        double percent_used_space=0;
+        double warning_used_space=0;
+        double critical_used_space=0;
+        double mem_commitLimit=0;
+        double mem_commitByte=0;
+        double fminval = 0, fmaxval = 0;
+        unsigned long utilization;
+        unsigned long uptime;
+        unsigned long age_in_minutes;
+        double counter_value = 0.0;
+        int offset=0;
+        int updays=0;
+        int uphours=0;
+        int upminutes=0;
+
+        int isPercent = FALSE;
+        int allRight = FALSE;
+
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+
+        /* Parse extra opts if any */
+        argv=np_extra_opts (&argc, argv, progname);
+
+        if(process_arguments(argc,argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+
+        /* initialize alarm signal handling */
+        signal(SIGALRM,socket_timeout_alarm_handler);
+
+        /* set socket timeout */
+        alarm(socket_timeout);
+
+        switch (vars_to_check) {
+
+        case CHECK_CLIENTVERSION:
+
+                asprintf(&send_buffer, "%s&1", req_password);
+                fetch_data (server_address, server_port, send_buffer);
+                if (value_list != NULL && strcmp(recv_buffer, value_list) != 0) {
+                        asprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
+                        return_code = STATE_WARNING;
+                } else {
+                        asprintf (&output_message, "%s", recv_buffer);
+                        return_code = STATE_OK;
+                }
+                break;
+
+        case CHECK_CPULOAD:
+
+                if (value_list==NULL)
+                        output_message = strdup (_("missing -l parameters"));
+                else if (strtoularray(lvalue_list,value_list,",")==FALSE)
+                        output_message = strdup (_("wrong -l parameter."));
+                else {
+                        /* -l parameters is present with only integers */
+                        return_code=STATE_OK;
+                        temp_string = strdup (_("CPU Load"));
+                        temp_string_perf = strdup (" ");
+
+                        /* loop until one of the parameters is wrong or not present */
+                        while (lvalue_list[0+offset]> (unsigned long)0 &&
+                                                 lvalue_list[0+offset]<=(unsigned long)17280 &&
+                                                 lvalue_list[1+offset]> (unsigned long)0 &&
+                                                 lvalue_list[1+offset]<=(unsigned long)100 &&
+                                                 lvalue_list[2+offset]> (unsigned long)0 &&
+                                                 lvalue_list[2+offset]<=(unsigned long)100) {
+
+                                /* Send request and retrieve data */
+                                asprintf(&send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]);
+                                fetch_data (server_address, server_port, send_buffer);
+
+                                utilization=strtoul(recv_buffer,NULL,10);
+
+                                /* Check if any of the request is in a warning or critical state */
+                                if(utilization >= lvalue_list[2+offset])
+                                        return_code=STATE_CRITICAL;
+                                else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING)
+                                        return_code=STATE_WARNING;
+
+                                asprintf(&output_message,_(" %lu%% (%lu min average)"), utilization, lvalue_list[0+offset]);
+                                asprintf(&temp_string,"%s%s",temp_string,output_message);
+                                asprintf(&perfdata,_(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0+offset], utilization,
+                                  lvalue_list[1+offset], lvalue_list[2+offset]);
+                                asprintf(&temp_string_perf,"%s%s",temp_string_perf,perfdata);
+                                offset+=3;      /* move across the array */
+                        }
+
+                        if (strlen(temp_string)>10) {  /* we had at least one loop */
+                                output_message = strdup (temp_string);
+                                perfdata = temp_string_perf;
+                        } else
+                                output_message = strdup (_("not enough values for -l parameters"));
+                }
+                break;
+
+        case CHECK_UPTIME:
+
+                asprintf(&send_buffer, "%s&3", req_password);
+                fetch_data (server_address, server_port, send_buffer);
+                uptime=strtoul(recv_buffer,NULL,10);
+                updays = uptime / 86400;
+                uphours = (uptime % 86400) / 3600;
+                upminutes = ((uptime % 86400) % 3600) / 60;
+                asprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes);
+                return_code=STATE_OK;
+                break;
+
+        case CHECK_USEDDISKSPACE:
+
+                if (value_list==NULL)
+                        output_message = strdup (_("missing -l parameters"));
+                else if (strlen(value_list)!=1)
+                        output_message = strdup (_("wrong -l argument"));
+                else {
+                        asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+                        fds=strtok(recv_buffer,"&");
+                        tds=strtok(NULL,"&");
+                        if(fds!=NULL)
+                                free_disk_space=atof(fds);
+                        if(tds!=NULL)
+                                total_disk_space=atof(tds);
+
+                        if (total_disk_space>0 && free_disk_space>=0) {
+                                percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+                                warning_used_space = ((float)warning_value / 100) * total_disk_space;
+                                critical_used_space = ((float)critical_value / 100) * total_disk_space;
+
+                                asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
+                                  value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
+                                  percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
+                                asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
+                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
+
+                                if(check_critical_value==TRUE && percent_used_space >= critical_value)
+                                        return_code=STATE_CRITICAL;
+                                else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+                                        return_code=STATE_WARNING;
+                                else
+                                        return_code=STATE_OK;
+
+                                output_message = strdup (temp_string);
+                                perfdata = temp_string_perf;
+                        } else {
+                                output_message = strdup (_("Free disk space : Invalid drive"));
+                                return_code=STATE_UNKNOWN;
+                        }
+                }
+                break;
+
+        case CHECK_SERVICESTATE:
+        case CHECK_PROCSTATE:
+
+                if (value_list==NULL)
+                        output_message = strdup (_("No service/process specified"));
+                else {
+                        preparelist(value_list);                /* replace , between services with & to send the request */
+                        asprintf(&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);
+                        if (strstr(recv_buffer, "&")) {
+                                return_code=atoi(strtok(recv_buffer,"&"));
+                                temp_string=strtok(NULL,"&");
+                                output_message = strdup (temp_string);
+                        } else {
+                                asprintf(&temp_string,"Remote server error:[%s]", recv_buffer);
+                                output_message = temp_string;
+                                return_code=STATE_UNKNOWN;
+                        }
+                }
+                break;
+
+        case CHECK_MEMUSE:
+
+                asprintf(&send_buffer,"%s&7", req_password);
+                fetch_data (server_address, server_port, send_buffer);
+                mem_commitLimit=atof(strtok(recv_buffer,"&"));
+                mem_commitByte=atof(strtok(NULL,"&"));
+                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;
+
+                /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here,
+                which equals RAM + Pagefiles. */
+                asprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"),
+                  mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space,
+                  (mem_commitLimit - mem_commitByte) / 1048567, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+                asprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567,
+                  warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567);
+
+                return_code=STATE_OK;
+                if(check_critical_value==TRUE && percent_used_space >= critical_value)
+                        return_code=STATE_CRITICAL;
+                else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+                        return_code=STATE_WARNING;
+
+                break;
+
+        case CHECK_COUNTER:
+
+
+                /*
+                CHECK_COUNTER has been modified to provide extensive perfdata information.
+                In order to do this, some modifications have been done to the code
+                and some constraints have been introduced.
+
+                1) For the sake of simplicity of the code, perfdata information will only be
+                 provided when the "description" field is added.
+
+                2) If the counter you're going to measure is percent-based, the code will detect
+                 the percent sign in its name and will attribute minimum (0%) and maximum (100%)
+                 values automagically, as well the �%" sign to graph units.
+
+                3) OTOH, if the counter is "absolute", you'll have to provide the following
+                 the counter unit - that is, the dimensions of the counter you're getting. Examples:
+                 pages/s, packets transferred, etc.
+
+                4) If you want, you may provide the minimum and maximum values to expect. They aren't mandatory,
+                 but once specified they MUST have the same order of magnitude and units of -w and -c; otherwise.
+                 strange things will happen when you make graphs of your data.
+                */
+
+                if (value_list == NULL)
+                        output_message = strdup (_("No counter specified"));
+                else
+                {
+                        preparelist (value_list);       /* replace , between services with & to send the request */
+                        isPercent = (strchr (value_list, '%') != NULL);
+
+                        strtok (value_list, "&");       /* burn the first parameters */
+                        description = strtok (NULL, "&");
+                        counter_unit = strtok (NULL, "&");
+                        asprintf (&send_buffer, "%s&8&%s", req_password, value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+                        counter_value = atof (recv_buffer);
+
+                        if (description == NULL)
+                        asprintf (&output_message, "%.f", counter_value);
+                        else if (isPercent)
+                        {
+                                counter_unit = strdup ("%");
+                                allRight = TRUE;
+                        }
+
+                        if ((counter_unit != NULL) && (!allRight))
+                        {
+                                minval = strtok (NULL, "&");
+                                maxval = strtok (NULL, "&");
+
+                                /* All parameters specified. Let's check the numbers */
+
+                                fminval = (minval != NULL) ? strtod (minval, &errcvt) : -1;
+                                fmaxval = (minval != NULL) ? strtod (maxval, &errcvt) : -1;
+
+                                if ((fminval == 0) && (minval == errcvt))
+                                        output_message = strdup (_("Minimum value contains non-numbers"));
+                                else
+                                {
+                                        if ((fmaxval == 0) && (maxval == errcvt))
+                                                output_message = strdup (_("Maximum value contains non-numbers"));
+                                        else
+                                                allRight = TRUE;        /* Everything is OK. */
+
+                                }
+                        }
+                        else if ((counter_unit == NULL) && (description != NULL))
+                                output_message = strdup (_("No unit counter specified"));
+
+                        if (allRight)
+                        {
+                                /* Let's format the output string, finally... */
+                                        if (strstr(description, "%") == NULL) {
+                                                asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+                                        } else {
+                                                /* has formatting, will segv if wrong */
+                                                asprintf (&output_message, description, counter_value);
+                                        }
+                                        asprintf (&output_message, "%s |", output_message);
+                                        asprintf (&output_message,"%s %s", output_message,
+                                                fperfdata (description, counter_value,
+                                                        counter_unit, 1, warning_value, 1, critical_value,
+                                                        (!(isPercent) && (minval != NULL)), fminval,
+                                                        (!(isPercent) && (minval != NULL)), fmaxval));
+                        }
+                }
+
+                if (critical_value > warning_value)
+                {                       /* Normal thresholds */
+                        if (check_critical_value == TRUE && counter_value >= critical_value)
+                                return_code = STATE_CRITICAL;
+                        else if (check_warning_value == TRUE && counter_value >= warning_value)
+                                return_code = STATE_WARNING;
+                        else
+                                return_code = STATE_OK;
+                }
+                else
+                {                       /* inverse thresholds */
+                        return_code = STATE_OK;
+                        if (check_critical_value == TRUE && counter_value <= critical_value)
+                                return_code = STATE_CRITICAL;
+                        else if (check_warning_value == TRUE && counter_value <= warning_value)
+                                return_code = STATE_WARNING;
+                }
+        break;
+
+        case CHECK_FILEAGE:
+
+                if (value_list==NULL)
+                        output_message = strdup (_("No counter specified"));
+                else {
+                        preparelist(value_list);                /* replace , between services with & to send the request */
+                        asprintf(&send_buffer,"%s&9&%s", req_password,value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+                        age_in_minutes = atoi(strtok(recv_buffer,"&"));
+                        description = strtok(NULL,"&");
+                        output_message = strdup (description);
+
+                        if (critical_value > warning_value) {        /* Normal thresholds */
+                                if(check_critical_value==TRUE && age_in_minutes >= critical_value)
+                                        return_code=STATE_CRITICAL;
+                                else if (check_warning_value==TRUE && age_in_minutes >= warning_value)
+                                        return_code=STATE_WARNING;
+                                else
+                                        return_code=STATE_OK;
+                        }
+                        else {                                       /* inverse thresholds */
+                                if(check_critical_value==TRUE && age_in_minutes <= critical_value)
+                                        return_code=STATE_CRITICAL;
+                                else if (check_warning_value==TRUE && age_in_minutes <= warning_value)
+                                        return_code=STATE_WARNING;
+                                else
+                                        return_code=STATE_OK;
+                        }
+                }
+                break;
+
+        case CHECK_INSTANCES:
+                if (value_list==NULL)
+                        output_message = strdup (_("No counter specified"));
+                else {
+                        asprintf(&send_buffer,"%s&10&%s", req_password,value_list);
+                        fetch_data (server_address, server_port, send_buffer);
+                        if (!strncmp(recv_buffer,"ERROR",5)) {
+                                printf("NSClient - %s\n",recv_buffer);
+                                exit(STATE_UNKNOWN);
+                        }
+                        asprintf(&output_message,"%s",recv_buffer);
+                        return_code=STATE_OK;
+                }
+                break;
+
+        case CHECK_NONE:
+        default:
+                usage4 (_("Please specify a variable to check"));
+                break;
+
+        }
+
+        /* reset timeout */
+        alarm(0);
+
+        if (perfdata==NULL)
+                printf("%s\n",output_message);
+        else
+                printf("%s | %s\n",output_message,perfdata);
+        return return_code;
+}
+
+
+
+/* process command-line arguments */
+int process_arguments(int argc, char **argv){
+        int c;
+
+        int option = 0;
+        static struct option longopts[] =
+        {
+                {"port",     required_argument,0,'p'},
+                {"timeout",  required_argument,0,'t'},
+                {"critical", required_argument,0,'c'},
+                {"warning",  required_argument,0,'w'},
+                {"variable", required_argument,0,'v'},
+                {"hostname", required_argument,0,'H'},
+                {"params",   required_argument,0,'l'},
+                {"secret",   required_argument,0,'s'},
+                {"display",  required_argument,0,'d'},
+                {"unknown-timeout", no_argument, 0, 'u'},
+                {"version",  no_argument,      0,'V'},
+                {"help",     no_argument,      0,'h'},
+                {0,0,0,0}
+        };
+
+        /* no options were supplied */
+        if(argc<2) return ERROR;
+
+        /* backwards compatibility */
+        if (! is_option(argv[1])) {
+                server_address = strdup(argv[1]);
+                argv[1]=argv[0];
+                argv=&argv[1];
+                argc--;
+        }
+
+        for (c=1;c<argc;c++) {
+                if(strcmp("-to",argv[c])==0)
+                        strcpy(argv[c],"-t");
+                else if (strcmp("-wv",argv[c])==0)
+                        strcpy(argv[c],"-w");
+                else if (strcmp("-cv",argv[c])==0)
+                        strcpy(argv[c],"-c");
+        }
+
+        while (1) {
+                c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:u",longopts,&option);
+
+                if (c==-1||c==EOF||c==1)
+                        break;
+
+                switch (c) {
+                        case '?': /* print short usage statement if args not parsable */
+                        usage5 ();
+                        case 'h': /* help */
+                                print_help();
+                                exit(STATE_OK);
+                        case 'V': /* version */
+                                print_revision(progname, NP_VERSION);
+                                exit(STATE_OK);
+                        case 'H': /* hostname */
+                                server_address = optarg;
+                                break;
+                        case 's': /* password */
+                                req_password = optarg;
+                                break;
+                        case 'p': /* port */
+                                if (is_intnonneg(optarg))
+                                        server_port=atoi(optarg);
+                                else
+                                        die(STATE_UNKNOWN,_("Server port must be an integer\n"));
+                                break;
+                        case 'v':
+                                if(strlen(optarg)<4)
+                                        return ERROR;
+                                if(!strcmp(optarg,"CLIENTVERSION"))
+                                        vars_to_check=CHECK_CLIENTVERSION;
+                                else if(!strcmp(optarg,"CPULOAD"))
+                                        vars_to_check=CHECK_CPULOAD;
+                                else if(!strcmp(optarg,"UPTIME"))
+                                        vars_to_check=CHECK_UPTIME;
+                                else if(!strcmp(optarg,"USEDDISKSPACE"))
+                                        vars_to_check=CHECK_USEDDISKSPACE;
+                                else if(!strcmp(optarg,"SERVICESTATE"))
+                                        vars_to_check=CHECK_SERVICESTATE;
+                                else if(!strcmp(optarg,"PROCSTATE"))
+                                        vars_to_check=CHECK_PROCSTATE;
+                                else if(!strcmp(optarg,"MEMUSE"))
+                                        vars_to_check=CHECK_MEMUSE;
+                                else if(!strcmp(optarg,"COUNTER"))
+                                        vars_to_check=CHECK_COUNTER;
+                                else if(!strcmp(optarg,"FILEAGE"))
+                                        vars_to_check=CHECK_FILEAGE;
+                                else if(!strcmp(optarg,"INSTANCES"))
+                                        vars_to_check=CHECK_INSTANCES;
+                                else
+                                        return ERROR;
+                                break;
+                        case 'l': /* value list */
+                                value_list = optarg;
+                                break;
+                        case 'w': /* warning threshold */
+                                warning_value=strtoul(optarg,NULL,10);
+                                check_warning_value=TRUE;
+                                break;
+                        case 'c': /* critical threshold */
+                                critical_value=strtoul(optarg,NULL,10);
+                                check_critical_value=TRUE;
+                                break;
+                        case 'd': /* Display select for services */
+                                if (!strcmp(optarg,"SHOWALL"))
+                                        show_all = TRUE;
+                                break;
+                        case 'u':
+                                socket_timeout_state=STATE_UNKNOWN;
+                                break;
+                        case 't': /* timeout */
+                                socket_timeout=atoi(optarg);
+                                if(socket_timeout<=0)
+                                        return ERROR;
+                        }
+
+        }
+        if (server_address == NULL)
+                usage4 (_("You must provide a server address or host name"));
+
+        if (vars_to_check==CHECK_NONE)
+                return ERROR;
+
+        if (req_password == NULL)
+                req_password = strdup (_("None"));
+
+        return OK;
+}
+
+
+
+void fetch_data (const char *address, int port, const char *sendb) {
+        int result;
+
+        result=process_tcp_request(address, port, sendb, recv_buffer,sizeof(recv_buffer));
+
+        if(result!=STATE_OK)
+                die (result, _("could not fetch information from server\n"));
+
+        if (!strncmp(recv_buffer,"ERROR",5))
+                die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer);
+}
+
+int strtoularray(unsigned long *array, char *string, const char *delim) {
+        /* split a <delim> delimited string into a long array */
+        int idx=0;
+        char *t1;
+
+        for (idx=0;idx<MAX_VALUE_LIST;idx++)
+                array[idx]=0;
+
+        idx=0;
+        for(t1 = strtok(string,delim);t1 != NULL; t1 = strtok(NULL, delim)) {
+                if (is_numeric(t1) && idx<MAX_VALUE_LIST) {
+                        array[idx]=strtoul(t1,NULL,10);
+                        idx++;
+                } else
+                        return FALSE;
+        }
+        return TRUE;
+}
+
+void preparelist(char *string) {
+        /* Replace all , with & which is the delimiter for the request */
+        int i;
+
+        for (i = 0; (size_t)i < strlen(string); i++)
+                if (string[i] == ',') {
+                        string[i]='&';
+                }
+}
+
+
+
+void print_help(void)
+{
+        print_revision(progname, NP_VERSION);
+
+        printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
+        printf (COPYRIGHT, copyright, email);
+
+        printf ("%s\n", _("This plugin collects data from the NSClient service running on a"));
+        printf ("%s\n", _("Windows NT/2000/XP/2003 server."));
+
+        printf ("\n\n");
+
+        print_usage();
+
+        printf (_(UT_HELP_VRSN));
+        printf (_(UT_EXTRA_OPTS));
+
+        printf ("%s\n", _("Options:"));
+        printf (" %s\n", "-H, --hostname=HOST");
+        printf ("   %s\n", _("Name of the host to check"));
+        printf (" %s\n", "-p, --port=INTEGER");
+        printf ("   %s", _("Optional port number (default: "));
+        printf ("%d)\n", PORT);
+        printf (" %s\n", "-s, --secret=<password>");
+        printf ("   %s\n", _("Password needed for the request"));
+        printf (" %s\n", "-w, --warning=INTEGER");
+        printf ("   %s\n", _("Threshold which will result in a warning status"));
+        printf (" %s\n", "-c, --critical=INTEGER");
+        printf ("   %s\n", _("Threshold which will result in a critical status"));
+        printf (" %s\n", "-t, --timeout=INTEGER");
+        printf ("   %s", _("Seconds before connection attempt times out (default: "));
+        printf (" %s\n", "-l, --params=<parameters>");
+        printf ("   %s", _("Parameters passed to specified check (see below)"));
+        printf (" %s\n", "-d, --display={SHOWALL}");
+        printf ("   %s", _("Display options (currently only SHOWALL works)"));
+        printf (" %s\n", "-u, --unknown-timeout");
+        printf ("   %s", _("Return UNKNOWN on timeouts"));
+        printf ("%d)\n", DEFAULT_SOCKET_TIMEOUT);
+        printf (" %s\n", "-h, --help");
+        printf ("   %s\n", _("Print this help screen"));
+        printf (" %s\n", "-V, --version");
+        printf ("   %s\n", _("Print version information"));
+        printf (" %s\n", "-v, --variable=STRING");
+        printf ("   %s\n\n", _("Variable to check"));
+        printf ("%s\n", _("Valid variables are:"));
+        printf (" %s", "CLIENTVERSION =");
+        printf (" %s\n", _("Get the NSClient version"));
+        printf ("  %s\n", _("If -l <version> is specified, will return warning if versions differ."));
+        printf (" %s\n", "CPULOAD =");
+        printf ("  %s\n", _("Average CPU load on last x minutes."));
+        printf ("  %s\n", _("Request a -l parameter with the following syntax:"));
+        printf ("  %s\n", _("-l <minutes range>,<warning threshold>,<critical threshold>."));
+        printf ("  %s\n", _("<minute range> should be less than 24*60."));
+        printf ("  %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot."));
+        printf ("  %s\n", "ie: -l 60,90,95,120,90,95");
+        printf (" %s\n", "UPTIME =");
+        printf ("  %s\n", _("Get the uptime of the machine."));
+        printf ("  %s\n", _("No specific parameters. No warning or critical threshold"));
+        printf (" %s\n", "USEDDISKSPACE =");
+        printf ("  %s\n", _("Size and percentage of disk use."));
+        printf ("  %s\n", _("Request a -l parameter containing the drive letter only."));
+        printf ("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
+        printf (" %s\n", "MEMUSE =");
+        printf ("  %s\n", _("Memory use."));
+        printf ("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
+        printf (" %s\n", "SERVICESTATE =");
+        printf ("  %s\n", _("Check the state of one or several services."));
+        printf ("  %s\n", _("Request a -l parameters with the following syntax:"));
+        printf ("  %s\n", _("-l <service1>,<service2>,<service3>,..."));
+        printf ("  %s\n", _("You can specify -d SHOWALL in case you want to see working services"));
+        printf ("  %s\n", _("in the returned string."));
+        printf (" %s\n", "PROCSTATE =");
+        printf ("  %s\n", _("Check if one or several process are running."));
+        printf ("  %s\n", _("Same syntax as SERVICESTATE."));
+        printf (" %s\n", "COUNTER =");
+        printf ("  %s\n", _("Check any performance counter of Windows NT/2000."));
+        printf ("       %s\n", _("Request a -l parameters with the following syntax:"));
+        printf ("       %s\n", _("-l \"\\\\<performance object>\\\\counter\",\"<description>"));
+        printf ("       %s\n", _("The <description> parameter is optional and is given to a printf "));
+        printf ("  %s\n", _("output command which requires a float parameter."));
+        printf ("  %s\n", _("If <description> does not include \"%%\", it is used as a label."));
+        printf ("  %s\n", _("Some examples:"));
+        printf ("  %s\n", "\"Paging file usage is %%.2f %%%%\"");
+        printf ("  %s\n", "\"%%.f %%%% paging file used.\"");
+        printf (" %s\n", "INSTANCES =");
+        printf ("  %s\n", _("Check any performance counter object of Windows NT/2000."));
+        printf ("  %s\n", _("Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"));
+        printf ("  %s\n", _("<counter object> is a Windows Perfmon Counter object (eg. Process),"));
+        printf ("  %s\n", _("if it is two words, it should be enclosed in quotes"));
+        printf ("  %s\n", _("The returned results will be a comma-separated list of instances on "));
+        printf ("  %s\n", _(" the selected computer for that object."));
+        printf ("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
+        printf ("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
+        printf ("  %s\n", _("  to run Perfmon directly."));
+        printf ("  %s\n", _("It can also be used in scripts that automatically create Nagios service"));
+        printf ("  %s\n", _(" configuration files."));
+        printf ("  %s\n", _("Some examples:"));
+        printf ("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
+
+        printf ("%s\n", _("Notes:"));
+        printf (" %s\n", _("- The NSClient service should be running on the server to get any information"));
+        printf ("   %s\n", "(http://nsclient.ready2run.nl).");
+        printf (" %s\n", _("- Critical thresholds should be lower than warning thresholds"));
+        printf (" %s\n", _("- Default port 1248 is sometimes in use by other services. The error"));
+        printf ("   %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\"."));
+        printf ("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
+        printf ("   %s\n", _("and on the client service it\'s connecting to."));
+#ifdef NP_EXTRA_OPTS
+        printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+#endif
+
+        printf (_(UT_SUPPORT));
+}
+
+
+
+void print_usage(void)
+{
+        printf (_("Usage:"));
+        printf ("%s -H host -v variable [-p port] [-w warning] [-c critical]\n",progname);
+        printf ("[-l params] [-d SHOWALL] [-u] [-t timeout]\n");
+}
+
diff --git a/web/attachments/37289-nagiosplugins-cvs-20021210-ipv6.diff b/web/attachments/37289-nagiosplugins-cvs-20021210-ipv6.diff
new file mode 100644
index 0000000..bc3a280
--- /dev/null
+++ b/web/attachments/37289-nagiosplugins-cvs-20021210-ipv6.diff
@@ -0,0 +1,609 @@
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
+retrieving revision 1.29
+diff -u -r1.29 configure.in
+--- configure.in        22 Nov 2002 02:46:49 -0000      1.29
++++ configure.in        10 Dec 2002 19:43:09 -0000
+@@ -703,6 +703,57 @@
+ fi
+ AC_DEFINE_UNQUOTED(PING_COMMAND,"$PING_COMMAND",[path and args for ping command])
+ 
++AC_PATH_PROG(PATH_TO_PING6,ping6)
++
++AC_ARG_WITH(ping6_command,--with-ping6-command=<syntax> sets syntax for ping,PING6_COMMAND=$withval)
++if test -n "$PING6_COMMAND"
++then
++       echo "      ping6 syntax... (command-line) $PING6_COMMAND"
++       if test -n "$PING6_PACKETS_FIRST"
++       then
++               AC_DEFINE_UNQUOTED(PING6_PACKETS_FIRST,"$PING6_COMMAND",[Define if packet count must precede host])
++       fi
++elif [ping6 -n -U -c 1 ::1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++        PING6_COMMAND="$PATH_TO_PING6 -n -U -c %d %s"
++        AC_DEFINE_UNQUOTED(PING6_PACKETS_FIRST,"$PING6_COMMAND",[Define if packet count must precede host])
++        echo "      ping6 syntax... $PATH_TO_PING6 -n -U -c <count> <host>"
++elif [ping6 -n -c 1 ::1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 -n -c %d %s"
++       AC_DEFINE_UNQUOTED(PING6_PACKETS_FIRST,"$PING6_COMMAND",[Define if packet count must precede host])
++       echo "      ping6 syntax... $PATH_TO_PING6 -n -c <count> <host>"
++elif [ping6 -n ::1 -c 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 -n %s -c %d"
++       echo "      ping6 syntax... $PATH_TO_PING6 -n <host> -c <count>"
++elif [ping6 ::1 -n 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 %s -n %d"
++       echo "      ping6 syntax... $PATH_TO_PING6 <host> -n <count>"
++elif [ping6 -n -s ::1 56 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 -n -s %s 56 %d"
++       echo "      ping6 syntax... $PATH_TO_PING6 -n -s <host> 56 <count>"
++elif [ping6 -n -h ::1 -s 56 -c 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 -n -h %s -s 56 -c %d"
++       echo "      ping6 syntax... $PATH_TO_PING6 -n -h <host> -s 56 -c <count>"
++elif [ping6 -n -s 56 -c 1 ::1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 -n -s 56 -c %d %s"
++       AC_DEFINE_UNQUOTED(PING6_PACKETS_FIRST,"$PING6_COMMAND",[Define if packet count must precede host])
++       echo "      ping6 syntax... $PATH_TO_PING6 -n -s 56 -c <count> <host>"
++elif [ping6 -n -c 1 ::1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null]
++then
++       PING6_COMMAND="$PATH_TO_PING6 -n -c %d %s"
++       AC_DEFINE_UNQUOTED(PING6_PACKETS_FIRST,"$PING6_COMMAND",[Define if packet count must precede host])
++       echo "      ping6 syntax... $PATH_TO_PING6 -n -c <count> <host>"
++else
++       AC_MSG_WARN("unable to find usable ping6 syntax")
++fi
++AC_DEFINE_UNQUOTED(PING6_COMMAND,"$PING6_COMMAND",[path and args for ping command])
++
+ AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
+ if test -n "$ac_cv_path_PATH_TO_NSLOOKUP"
+ then
+Index: plugins/check_dig.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
+retrieving revision 1.7
+diff -u -r1.7 check_dig.c
+--- plugins/check_dig.c 21 Nov 2002 12:40:58 -0000      1.7
++++ plugins/check_dig.c 10 Dec 2002 19:43:09 -0000
+@@ -57,7 +57,7 @@
+                usage ("Could not parse arguments\n");
+ 
+        /* get the command to run */
+-       asprintf (&command_line, "%s @%s %s", PATH_TO_DIG, dns_server, query_address);
++       asprintf (&command_line, "%s -t any @%s %s", PATH_TO_DIG, dns_server, query_address);
+ 
+        alarm (timeout_interval);
+        time (&start_time);
+Index: plugins/check_dns.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
+retrieving revision 1.5
+diff -u -r1.5 check_dns.c
+--- plugins/check_dns.c 14 Nov 2002 02:26:34 -0000      1.5
++++ plugins/check_dns.c 10 Dec 2002 19:43:10 -0000
+@@ -308,7 +308,7 @@
+                        timeout_interval = atoi (optarg);
+                        break;
+                case 'H': /* hostname */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid host name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -318,7 +318,7 @@
+                        strcpy (query_address, optarg);
+                        break;
+                case 's': /* server name */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid server name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -328,7 +328,7 @@
+                        strcpy (dns_server, optarg);
+                        break;
+                case 'r': /* reverse server name */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid host name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -338,7 +338,7 @@
+                        strcpy (ptr_server, optarg);
+                        break;
+                case 'a': /* expected address */
+-                       if (is_dotted_quad (optarg) == FALSE) {
++                       if ((is_ipv4_addr (optarg)) == FALSE) {
+                                printf ("Invalid expected address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -352,8 +352,8 @@
+        }
+ 
+        c = optind;
+-       if (query_address[0] == 0) {
+-               if (is_host (argv[c]) == FALSE) {
++       if (query_address== NULL) {
++               if ((is_host (argv[c])) == FALSE) {
+                        printf ("Invalid name/address: %s\n\n", argv[c]);
+                        return ERROR;
+                }
+@@ -362,8 +362,8 @@
+                strcpy (query_address, argv[c++]);
+        }
+ 
+-       if (dns_server[0] == 0) {
+-               if (is_host (argv[c]) == FALSE) {
++       if (dns_server == NULL) {
++               if ((is_host (argv[c])) == FALSE) {
+                        printf ("Invalid name/address: %s\n\n", argv[c]);
+                        return ERROR;
+                }
+Index: plugins/check_ldap.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
+retrieving revision 1.2
+diff -u -r1.2 check_ldap.c
+--- plugins/check_ldap.c        14 Nov 2002 02:26:34 -0000      1.2
++++ plugins/check_ldap.c        10 Dec 2002 19:43:10 -0000
+@@ -7,7 +7,7 @@
+  * 
+  * Last Modified: $Date: 2002/11/14 02:26:34 $
+  *
+- * Command line: check_ldap -h <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
++ * Command line: check_ldap -H <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
+  *
+  * Description:
+  *
+@@ -197,7 +197,7 @@
+                        crit_time = atoi (optarg);
+                        break;
+                default:
+-                       usage ("check_ldap: could not parse arguments\n");
++                       usage ("check_ldap: could not parse unknown arguments\n");
+                        break;
+                }
+        }
+@@ -253,6 +253,6 @@
+ {
+        printf
+                ("Usage: %s -H <host> -b <base_dn> -p <port> [-a <attr>] [-D <binddn>]\n"
+-                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
++                "         [-P <password>] -w <warn_time> -c <crit_time> [-t timeout]\n"
+                 "(Note: all times are in seconds.)\n", PROGNAME);
+ }
+Index: plugins/check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.10
+diff -u -r1.10 check_ping.c
+--- plugins/check_ping.c        13 Nov 2002 11:50:54 -0000      1.10
++++ plugins/check_ping.c        10 Dec 2002 19:43:10 -0000
+@@ -88,9 +88,15 @@
+ 
+        /* does the host address of number of packets argument come first? */
+ #ifdef PING_PACKETS_FIRST
+-       asprintf (&command_line, PING_COMMAND, max_packets, server_address);
++       if (is_ipv6_addr (server_address)) 
++               asprintf (&command_line, PING6_COMMAND, max_packets, server_address);
++       else
++               asprintf (&command_line, PING_COMMAND, max_packets, server_address);
+ #else
+-       asprintf (&command_line, PING_COMMAND, server_address, max_packets);
++       if (is_ipv6_addr (server_address)) 
++               asprintf (&command_line, PING6_COMMAND, server_address, max_packets);
++       else
++               asprintf (&command_line, PING_COMMAND, server_address, max_packets);
+ #endif
+ 
+        /* Set signal handling and alarm */
+Index: plugins/netutils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.c
+--- plugins/netutils.c  28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ plugins/netutils.c  10 Dec 2002 19:43:10 -0000
+@@ -48,8 +48,6 @@
+ int my_udp_connect (char *, int, int *);
+ int my_connect (char *, int, int *, char *);
+ 
+-int my_inet_aton (register const char *, struct in_addr *);
+-
+ /* handles socket timeouts */
+ void
+ socket_timeout_alarm_handler (int sig)
+@@ -265,167 +263,70 @@
+ int
+ my_connect (char *host_name, int port, int *sd, char *proto)
+ {
+-       struct sockaddr_in servaddr;
+-       struct hostent *hp;
+-       struct protoent *ptrp;
+-       int result;
+-
+-       bzero ((char *) &servaddr, sizeof (servaddr));
+-       servaddr.sin_family = AF_INET;
+-       servaddr.sin_port = htons (port);
+-
+-       /* try to bypass using a DNS lookup if this is just an IP address */
+-       if (!my_inet_aton (host_name, &servaddr.sin_addr)) {
+-
+-               /* else do a DNS lookup */
+-               hp = gethostbyname ((const char *) host_name);
+-               if (hp == NULL) {
+-                       printf ("Invalid host name '%s'\n", host_name);
+-                       return STATE_UNKNOWN;
+-               }
+-
+-               memcpy (&servaddr.sin_addr, hp->h_addr, hp->h_length);
+-       }
+-
+-       /* map transport protocol name to protocol number */
+-       if ((ptrp = getprotobyname (proto)) == NULL) {
+-               printf ("Cannot map \"%s\" to protocol number\n", proto);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       /* create a socket */
+-       *sd =
+-               socket (PF_INET, (!strcmp (proto, "udp")) ? SOCK_DGRAM : SOCK_STREAM,
+-                                               ptrp->p_proto);
+-       if (*sd < 0) {
+-               printf ("Socket creation failed\n");
+-               return STATE_UNKNOWN;
+-       }
+-
+-       /* open a connection */
+-       result = connect (*sd, (struct sockaddr *) &servaddr, sizeof (servaddr));
+-       if (result < 0) {
+-               switch (errno) {
+-               case ECONNREFUSED:
+-                       printf ("Connection refused by host\n");
+-                       break;
+-               case ETIMEDOUT:
+-                       printf ("Timeout while attempting connection\n");
+-                       break;
+-               case ENETUNREACH:
+-                       printf ("Network is unreachable\n");
+-                       break;
+-               default:
+-                       printf ("Connection refused or timed out\n");
+-               }
+-
+-               return STATE_CRITICAL;
+-       }
+-
+-       return STATE_OK;
+-}
+-
+-
+-
+-/* This code was taken from Fyodor's nmap utility, which was originally
+-        taken from the GLIBC 2.0.6 libraries because Solaris doesn't contain
+-        the inet_aton() funtion. */
+-int
+-my_inet_aton (register const char *cp, struct in_addr *addr)
+-{
+-       register unsigned int val;              /* changed from u_long --david */
+-       register int base, n;
+-       register char c;
+-       u_int parts[4];
+-       register u_int *pp = parts;
+-
+-       c = *cp;
+-
+-       for (;;) {
+-
+-               /*
+-                * Collect number up to ``.''.
+-                * Values are specified as for C:
+-                * 0x=hex, 0=octal, isdigit=decimal.
+-                */
+-               if (!isdigit ((int) c))
+-                       return (0);
+-               val = 0;
+-               base = 10;
+-
+-               if (c == '0') {
+-                       c = *++cp;
+-                       if (c == 'x' || c == 'X')
+-                               base = 16, c = *++cp;
+-                       else
+-                               base = 8;
+-               }
+-
+-               for (;;) {
+-                       if (isascii ((int) c) && isdigit ((int) c)) {
+-                               val = (val * base) + (c - '0');
+-                               c = *++cp;
+-                       }
+-                       else if (base == 16 && isascii ((int) c) && isxdigit ((int) c)) {
+-                               val = (val << 4) | (c + 10 - (islower ((int) c) ? 'a' : 'A'));
+-                               c = *++cp;
+-                       }
+-                       else
+-                               break;
+-               }
+-
+-               if (c == '.') {
+-
+-                       /*
+-                        * Internet format:
+-                        *  a.b.c.d
+-                        *  a.b.c (with c treated as 16 bits)
+-                        *  a.b (with b treated as 24 bits)
+-                        */
+-                       if (pp >= parts + 3)
+-                               return (0);
+-                       *pp++ = val;
+-                       c = *++cp;
+-               }
+-               else
+-                       break;
+-       }
+-
+-       /* Check for trailing characters */
+-       if (c != '\0' && (!isascii ((int) c) || !isspace ((int) c)))
+-               return (0);
+-
+-       /* Concoct the address according to the number of parts specified */
+-       n = pp - parts + 1;
+-       switch (n) {
+-
+-       case 0:
+-               return (0);                                                                     /* initial nondigit */
+-
+-       case 1:                                                                                 /* a -- 32 bits */
+-               break;
+-
+-       case 2:                                                                                 /* a.b -- 8.24 bits */
+-               if (val > 0xffffff)
+-                       return (0);
+-               val |= parts[0] << 24;
+-               break;
+-
+-       case 3:                                                                                 /* a.b.c -- 8.8.16 bits */
+-               if (val > 0xffff)
+-                       return (0);
+-               val |= (parts[0] << 24) | (parts[1] << 16);
+-               break;
+-
+-       case 4:                                                                                 /* a.b.c.d -- 8.8.8.8 bits */
+-               if (val > 0xff)
+-                       return (0);
+-               val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+-               break;
++        struct addrinfo hints;
++        struct addrinfo *res;
++        struct protoent *ptrp;
++       char port_str[6];
++       char nbuf[NI_MAXHOST];
++        int result;
++
++        /* map the transport protocol name to protocol number */
++        ptrp = getprotobyname ((const char *)proto);
++       if (ptrp == NULL)
++        {
++                printf ("Cannot map %s to protocol number\n", proto);
++                return STATE_UNKNOWN;
++        }
++
++        memset (&hints, 0, sizeof (hints));
++        hints.ai_family = PF_UNSPEC;
++        hints.ai_protocol = ptrp->p_proto;
++
++       snprintf(port_str, sizeof(port_str), "%d", port);
++        /* nice clean AF-independent code doesn't matter if passed hostname or IP address */
++        result = getaddrinfo (host_name, port_str, &hints, &res);
++
++        if (result != 0)
++       {
++                printf ("%s\n", gai_strerror (result));
++                return STATE_UNKNOWN;
+        }
+-
+-       if (addr)
+-               addr->s_addr = htonl (val);
+-
+-       return (1);
++        else
++        {
++                while (res)
++                {
++                        /* attempt to create a socket */
++                        *sd = socket (res->ai_family, (!strcasecmp (proto, "udp")) ? SOCK_DGRAM : SOCK_STREAM, res->ai_protocol);
++
++                        if (*sd < 0) {
++                                printf ("Socket creation failed\n");
++                                freeaddrinfo (res);
++                                return STATE_UNKNOWN;
++                        }
++
++                       /* Little debugging here */
++                       result = getnameinfo (res->ai_addr, res->ai_addrlen,
++                               nbuf, sizeof (nbuf), NULL, 0, NI_NUMERICHOST);
++                       printf ("Connect attempt on socket %d to %s",
++                               *sd, nbuf);
++
++                       /* attempt to open a connection */
++                        result = connect (*sd, res->ai_addr, res->ai_addrlen);
++
++                        if (result == 0)
++                               break;
++
++                        close(*sd);
++                        res = res->ai_next;
++                }
++                freeaddrinfo (res);
++        }
++
++        if (result == 0)
++                return STATE_OK;
++        else
++        {
++                printf ("%s\n", strerror(errno));
++                return STATE_CRITICAL;
++        }
+ }
+Index: plugins/netutils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h.in,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.h.in
+--- plugins/netutils.h.in       28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ plugins/netutils.h.in       10 Dec 2002 19:43:10 -0000
+@@ -54,8 +54,6 @@
+ int my_udp_connect (char *address, int port, int *sd);
+ int my_connect (char *address, int port, int *sd, char *proto);
+ 
+-int my_inet_aton (register const char *cp, struct in_addr *addr);
+-
+ #ifndef DEFAULT_SOCKET_TIMEOUT
+ #include "config.h"
+ #include "common.h"
+Index: plugins/utils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.c,v
+retrieving revision 1.13
+diff -u -r1.13 utils.c
+--- plugins/utils.c     18 Nov 2002 07:22:28 -0000      1.13
++++ plugins/utils.c     10 Dec 2002 19:43:10 -0000
+@@ -16,6 +16,9 @@
+ #include "version.h"
+ #include <stdarg.h>
+ #include <limits.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
++#include <netdb.h>
+ 
+ extern int timeout_interval;
+ 
+@@ -27,7 +30,8 @@
+ RETSIGTYPE timeout_alarm_handler (int);
+ 
+ int is_host (char *);
+-int is_dotted_quad (char *);
++int is_ipv4_addr (char *);
++int is_ipv6_addr (char *);
+ int is_hostname (char *);
+ 
+ int is_integer (char *);
+@@ -154,25 +158,51 @@
+ int
+ is_host (char *address)
+ {
+-       if (is_dotted_quad (address) || is_hostname (address))
++       if (is_ipv4_addr (address) || is_ipv6_addr (address) || 
++               is_hostname (address))
+                return (TRUE);
++
+        return (FALSE);
+ }
+ 
+ int
+-is_dotted_quad (char *address)
++is_ipv4_addr (char *address)
+ {
+-       int o1, o2, o3, o4;
+-       char c[1];
++       struct addrinfo hints;
++       struct addrinfo *res;
++       int retval;
+ 
+-       if (sscanf (address, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, c) != 4)
+-               return FALSE;
+-       else if (o1 > 255 || o2 > 255 || o3 > 255 || o4 > 255)
++       memset (&hints, 0, sizeof (hints));
++       hints.ai_family = PF_INET;
++       retval = getaddrinfo (address, NULL, &hints, &res);
++
++       if (retval != 0)
+                return FALSE;
+-       else if (o1 < 0 || o2 < 0 || o3 < 0 || o4 < 0)
++       else
++       {
++               freeaddrinfo (res);
++               return TRUE;
++       }
++}
++
++int
++is_ipv6_addr (char *address)
++{
++       struct addrinfo hints;
++       struct addrinfo *res;
++       int retval;
++
++       memset (&hints, 0, sizeof (hints));
++       hints.ai_family = PF_INET6;
++       retval = getaddrinfo (address, NULL, &hints, &res);
++
++       if (retval != 0)
+                return FALSE;
+        else
++       {
++               freeaddrinfo (res);
+                return TRUE;
++       }
+ }
+ 
+ /* from RFC-1035
+@@ -185,22 +215,21 @@
+ int
+ is_hostname (char *s1)
+ {
+-       if (strlen (s1) > 63)
+-               return FALSE;
+-       if (strcspn
+-                       (s1,
+-                        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") !=
+-                       0) return FALSE;
+-       if (strspn (s1, "0123456789-.") == 1)
++       struct addrinfo hints;
++       struct addrinfo *res;
++       int retval;
++
++       memset (&hints, 0, sizeof (hints));
++       hints.ai_family = PF_UNSPEC;
++       retval = getaddrinfo (s1, NULL, &hints, &res);
++
++       if (retval != 0)
+                return FALSE;
+-       while ((s1 = index (s1, '.'))) {
+-               s1++;
+-               if (strspn (s1, "0123456789-.") == 1) {
+-                       printf ("%s\n", s1);
+-                       return FALSE;
+-               }
++       else
++       {
++               freeaddrinfo (res);
++               return TRUE;
+        }
+-       return TRUE;
+ }
+ 
+ int
+Index: plugins/utils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h.in,v
+retrieving revision 1.7
+diff -u -r1.7 utils.h.in
+--- plugins/utils.h.in  9 Nov 2002 03:39:35 -0000       1.7
++++ plugins/utils.h.in  10 Dec 2002 19:43:10 -0000
+@@ -28,7 +28,8 @@
+ /* Test input types */
+ 
+ int is_host (char *);
+-int is_dotted_quad (char *);
++int is_ipv4_addr (char *);
++int is_ipv6_addr (char *);
+ int is_hostname (char *);
+ 
+ int is_integer (char *);
diff --git a/web/attachments/37323-nagiosplugins-cvs-20021210-ipv6.diff b/web/attachments/37323-nagiosplugins-cvs-20021210-ipv6.diff
new file mode 100644
index 0000000..da47ec3
--- /dev/null
+++ b/web/attachments/37323-nagiosplugins-cvs-20021210-ipv6.diff
@@ -0,0 +1,740 @@
+Index: check_dig.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
+retrieving revision 1.7
+diff -u -r1.7 check_dig.c
+--- check_dig.c 21 Nov 2002 12:40:58 -0000      1.7
++++ check_dig.c 11 Dec 2002 02:39:50 -0000
+@@ -57,7 +57,7 @@
+                usage ("Could not parse arguments\n");
+ 
+        /* get the command to run */
+-       asprintf (&command_line, "%s @%s %s", PATH_TO_DIG, dns_server, query_address);
++       asprintf (&command_line, "%s -t any @%s %s", PATH_TO_DIG, dns_server, query_address);
+ 
+        alarm (timeout_interval);
+        time (&start_time);
+Index: check_dns.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
+retrieving revision 1.5
+diff -u -r1.5 check_dns.c
+--- check_dns.c 14 Nov 2002 02:26:34 -0000      1.5
++++ check_dns.c 11 Dec 2002 02:39:50 -0000
+@@ -308,7 +308,7 @@
+                        timeout_interval = atoi (optarg);
+                        break;
+                case 'H': /* hostname */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid host name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -318,7 +318,7 @@
+                        strcpy (query_address, optarg);
+                        break;
+                case 's': /* server name */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid server name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -328,7 +328,7 @@
+                        strcpy (dns_server, optarg);
+                        break;
+                case 'r': /* reverse server name */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid host name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -338,7 +338,7 @@
+                        strcpy (ptr_server, optarg);
+                        break;
+                case 'a': /* expected address */
+-                       if (is_dotted_quad (optarg) == FALSE) {
++                       if ((is_ipv4_addr (optarg)) == FALSE) {
+                                printf ("Invalid expected address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -352,8 +352,8 @@
+        }
+ 
+        c = optind;
+-       if (query_address[0] == 0) {
+-               if (is_host (argv[c]) == FALSE) {
++       if (query_address == NULL) {
++               if ((is_host (argv[c])) == FALSE) {
+                        printf ("Invalid name/address: %s\n\n", argv[c]);
+                        return ERROR;
+                }
+@@ -362,8 +362,8 @@
+                strcpy (query_address, argv[c++]);
+        }
+ 
+-       if (dns_server[0] == 0) {
+-               if (is_host (argv[c]) == FALSE) {
++       if (dns_server == NULL) {
++               if ((is_host (argv[c])) == FALSE) {
+                        printf ("Invalid name/address: %s\n\n", argv[c]);
+                        return ERROR;
+                }
+Index: check_ldap.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
+retrieving revision 1.2
+diff -u -r1.2 check_ldap.c
+--- check_ldap.c        14 Nov 2002 02:26:34 -0000      1.2
++++ check_ldap.c        11 Dec 2002 02:39:50 -0000
+@@ -7,7 +7,7 @@
+  * 
+  * Last Modified: $Date: 2002/11/14 02:26:34 $
+  *
+- * Command line: check_ldap -h <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
++ * Command line: check_ldap -H <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
+  *
+  * Description:
+  *
+@@ -197,7 +197,7 @@
+                        crit_time = atoi (optarg);
+                        break;
+                default:
+-                       usage ("check_ldap: could not parse arguments\n");
++                       usage ("check_ldap: could not parse unknown arguments\n");
+                        break;
+                }
+        }
+@@ -253,6 +253,6 @@
+ {
+        printf
+                ("Usage: %s -H <host> -b <base_dn> -p <port> [-a <attr>] [-D <binddn>]\n"
+-                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
++                "         [-P <password>] -w <warn_time> -c <crit_time> [-t timeout]\n"
+                 "(Note: all times are in seconds.)\n", PROGNAME);
+ }
+Index: check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.10
+diff -u -r1.10 check_ping.c
+--- check_ping.c        13 Nov 2002 11:50:54 -0000      1.10
++++ check_ping.c        11 Dec 2002 02:39:50 -0000
+@@ -88,9 +88,15 @@
+ 
+        /* does the host address of number of packets argument come first? */
+ #ifdef PING_PACKETS_FIRST
+-       asprintf (&command_line, PING_COMMAND, max_packets, server_address);
++       if (is_ipv6_addr (server_address)) 
++               asprintf (&command_line, PING6_COMMAND, max_packets, server_address);
++       else
++               asprintf (&command_line, PING_COMMAND, max_packets, server_address);
+ #else
+-       asprintf (&command_line, PING_COMMAND, server_address, max_packets);
++       if (is_ipv6_addr (server_address)) 
++               asprintf (&command_line, PING6_COMMAND, server_address, max_packets);
++       else
++               asprintf (&command_line, PING_COMMAND, server_address, max_packets);
+ #endif
+ 
+        /* Set signal handling and alarm */
+Index: check_tcp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
+retrieving revision 1.8
+diff -u -r1.8 check_tcp.c
+--- check_tcp.c 25 Nov 2002 12:00:17 -0000      1.8
++++ check_tcp.c 11 Dec 2002 02:39:50 -0000
+@@ -225,8 +225,12 @@
+                {
+                        if (PROTOCOL == UDP_PROTOCOL)
+                                result = my_udp_connect (server_address, server_port, &sd);
+-                       else                                                                                                    /* default is TCP */
+-                               result = my_tcp_connect (server_address, server_port, &sd);
++                       else
++                               /* default is TCP */
++                               // result = my_tcp_connect (server_address, server_port, &sd);
++                               result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
++printf ("Catch value: %d\n", result);
++printf ("XXX: Check valve\n");
+                }
+ 
+        if (result == STATE_CRITICAL)
+Index: check_udp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_udp.c,v
+retrieving revision 1.2
+diff -u -r1.2 check_udp.c
+--- check_udp.c 30 Oct 2002 18:46:01 -0000      1.2
++++ check_udp.c 11 Dec 2002 02:39:50 -0000
+@@ -74,9 +74,8 @@
+        alarm (socket_timeout);
+ 
+        time (&start_time);
+-       result =
+-               process_udp_request (server_address, server_port, server_send,
+-                                                                                                recv_buffer, MAX_INPUT_BUFFER - 1);
++       result = process_udp_request (server_address, server_port, server_send,
++                       recv_buffer, MAX_INPUT_BUFFER - 1);
+        time (&end_time);
+ 
+        if (result != STATE_OK) {
+Index: netutils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.c
+--- netutils.c  28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ netutils.c  11 Dec 2002 02:39:50 -0000
+@@ -42,13 +42,11 @@
+ int process_tcp_request2 (char *, int, char *, char *, int);
+ int process_tcp_request (char *, int, char *, char *, int);
+ int process_udp_request (char *, int, char *, char *, int);
+-int process_request (char *, int, char *, char *, char *, int);
++int process_request (char *, int, int, char *, char *, int);
+ 
+ int my_tcp_connect (char *, int, int *);
+ int my_udp_connect (char *, int, int *);
+-int my_connect (char *, int, int *, char *);
+-
+-int my_inet_aton (register const char *, struct in_addr *);
++int my_connect (char *, int, int *, int);
+ 
+ /* handles socket timeouts */
+ void
+@@ -64,47 +62,29 @@
+ /* connects to a host on a specified TCP port, sends a string,
+    and gets a response */
+ int
+-process_tcp_request (char *server_address,
+-                                                                                int server_port,
+-                                                                                char *send_buffer, char *recv_buffer, int recv_size)
++process_tcp_request (char *server_address, int server_port,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+-       int result;
+-       char proto[4] = "tcp";
+-
+-       result = process_request (server_address,
+-                                                                                                               server_port,
+-                                                                                                               proto, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
++       return process_request (server_address, server_port, IPPROTO_TCP,
++               send_buffer, recv_buffer, recv_size);
+ }
+ 
+-
+ /* connects to a host on a specified UDP port, sends a string, and gets a
+     response */
+ int
+-process_udp_request (char *server_address,
+-                                                                                int server_port,
+-                                                                                char *send_buffer, char *recv_buffer, int recv_size)
++process_udp_request (char *server_address, int server_port,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+-       int result;
+-       char proto[4] = "udp";
+-
+-       result = process_request (server_address,
+-                                                                                                               server_port,
+-                                                                                                               proto, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
++       return process_request (server_address, server_port, IPPROTO_UDP,
++               send_buffer, recv_buffer, recv_size);
+ }
+ 
+-
+-
+ /* connects to a host on a specified tcp port, sends a string, and gets a 
+         response. loops on select-recv until timeout or eof to get all of a 
+         multi-packet answer */
+ int
+-process_tcp_request2 (char *server_address,
+-                                                                                       int server_port,
+-                                                                                       char *send_buffer, char *recv_buffer, int recv_size)
++process_tcp_request2 (char *server_address, int server_port,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+ 
+        int result;
+@@ -115,7 +95,7 @@
+        fd_set readfds;
+        int recv_length = 0;
+ 
+-       result = my_connect (server_address, server_port, &sd, "tcp");
++       result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
+        if (result != STATE_OK)
+                return STATE_CRITICAL;
+ 
+@@ -149,24 +129,30 @@
+                else {                                                                                  /* it has */
+                        recv_result =
+                                recv (sd, recv_buffer + recv_length, recv_size - recv_length - 1, 0);
+-                       if (recv_result == -1) {        /* recv failed, bail out */
++                       if (recv_result == -1) {
++                               /* recv failed, bail out */
+                                strcpy (recv_buffer + recv_length, "");
+                                result = STATE_WARNING;
+                                break;
+                        }
+-                       else if (recv_result == 0) {    /* end of file ? */
++                       else if (recv_result == 0) {
++                               /* end of file ? */
+                                recv_buffer[recv_length] = 0;
+                                break;
+                        }
+-                       else {                                                                          /* we got data! */
++                       else {
++                               /* we got data! */
+                                recv_length += recv_result;
+-                               if (recv_length >= recv_size - 1) {     /* buffer full, we're done */
++                               if (recv_length >= recv_size - 1) {
++                                       /* buffer full, we're done */
+                                        recv_buffer[recv_size - 1] = 0;
+                                        break;
+                                }
+                        }
+-               }                                                                                                               /* end if(!FD_ISSET(sd,&readfds)) */
+-       }                                                                                                                       /* end while(1) */
++               }
++               /* end if(!FD_ISSET(sd,&readfds)) */
++       }
++       /* end while(1) */
+ 
+        close (sd);
+        return result;
+@@ -175,10 +161,8 @@
+ /* connects to a host on a specified port, sends a string, and gets a 
+    response */
+ int
+-process_request (char *server_address,
+-                                                                int server_port,
+-                                                                char *proto,
+-                                                                char *send_buffer, char *recv_buffer, int recv_size)
++process_request (char *server_address, int server_port, int proto,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+        int result;
+        int send_result;
+@@ -218,7 +202,7 @@
+                recv_result = recv (sd, recv_buffer, recv_size - 1, 0);
+                if (recv_result == -1) {
+                        strcpy (recv_buffer, "");
+-                       if (!strcmp (proto, "tcp"))
++                       if (proto != IPPROTO_TCP)
+                                printf ("recv() failed\n");
+                        result = STATE_WARNING;
+                }
+@@ -236,196 +220,74 @@
+ 
+ 
+ /* opens a connection to a remote host/tcp port */
++
+ int
+ my_tcp_connect (char *host_name, int port, int *sd)
+ {
+-       int result;
+-       char proto[4] = "tcp";
+-
+-       result = my_connect (host_name, port, sd, proto);
+-
+-       return result;
++       return my_connect (host_name, port, sd, IPPROTO_TCP); 
+ }
+ 
+-
+ /* opens a connection to a remote host/udp port */
+ int
+ my_udp_connect (char *host_name, int port, int *sd)
+ {
+-       int result;
+-       char proto[4] = "udp";
+-
+-       result = my_connect (host_name, port, sd, proto);
+-
+-       return result;
++       return my_connect (host_name, port, sd, IPPROTO_UDP);
+ }
+ 
+ 
+ /* opens a tcp or udp connection to a remote host */
+ int
+-my_connect (char *host_name, int port, int *sd, char *proto)
+-{
+-       struct sockaddr_in servaddr;
+-       struct hostent *hp;
+-       struct protoent *ptrp;
+-       int result;
+-
+-       bzero ((char *) &servaddr, sizeof (servaddr));
+-       servaddr.sin_family = AF_INET;
+-       servaddr.sin_port = htons (port);
+-
+-       /* try to bypass using a DNS lookup if this is just an IP address */
+-       if (!my_inet_aton (host_name, &servaddr.sin_addr)) {
+-
+-               /* else do a DNS lookup */
+-               hp = gethostbyname ((const char *) host_name);
+-               if (hp == NULL) {
+-                       printf ("Invalid host name '%s'\n", host_name);
+-                       return STATE_UNKNOWN;
+-               }
+-
+-               memcpy (&servaddr.sin_addr, hp->h_addr, hp->h_length);
+-       }
+-
+-       /* map transport protocol name to protocol number */
+-       if ((ptrp = getprotobyname (proto)) == NULL) {
+-               printf ("Cannot map \"%s\" to protocol number\n", proto);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       /* create a socket */
+-       *sd =
+-               socket (PF_INET, (!strcmp (proto, "udp")) ? SOCK_DGRAM : SOCK_STREAM,
+-                                               ptrp->p_proto);
+-       if (*sd < 0) {
+-               printf ("Socket creation failed\n");
+-               return STATE_UNKNOWN;
+-       }
+-
+-       /* open a connection */
+-       result = connect (*sd, (struct sockaddr *) &servaddr, sizeof (servaddr));
+-       if (result < 0) {
+-               switch (errno) {
+-               case ECONNREFUSED:
+-                       printf ("Connection refused by host\n");
+-                       break;
+-               case ETIMEDOUT:
+-                       printf ("Timeout while attempting connection\n");
+-                       break;
+-               case ENETUNREACH:
+-                       printf ("Network is unreachable\n");
+-                       break;
+-               default:
+-                       printf ("Connection refused or timed out\n");
+-               }
+-
+-               return STATE_CRITICAL;
+-       }
+-
+-       return STATE_OK;
+-}
+-
+-
+-
+-/* This code was taken from Fyodor's nmap utility, which was originally
+-        taken from the GLIBC 2.0.6 libraries because Solaris doesn't contain
+-        the inet_aton() funtion. */
+-int
+-my_inet_aton (register const char *cp, struct in_addr *addr)
++my_connect (char *host_name, int port, int *sd, int proto)
+ {
+-       register unsigned int val;              /* changed from u_long --david */
+-       register int base, n;
+-       register char c;
+-       u_int parts[4];
+-       register u_int *pp = parts;
+-
+-       c = *cp;
+-
+-       for (;;) {
+-
+-               /*
+-                * Collect number up to ``.''.
+-                * Values are specified as for C:
+-                * 0x=hex, 0=octal, isdigit=decimal.
+-                */
+-               if (!isdigit ((int) c))
+-                       return (0);
+-               val = 0;
+-               base = 10;
+-
+-               if (c == '0') {
+-                       c = *++cp;
+-                       if (c == 'x' || c == 'X')
+-                               base = 16, c = *++cp;
+-                       else
+-                               base = 8;
+-               }
+-
+-               for (;;) {
+-                       if (isascii ((int) c) && isdigit ((int) c)) {
+-                               val = (val * base) + (c - '0');
+-                               c = *++cp;
+-                       }
+-                       else if (base == 16 && isascii ((int) c) && isxdigit ((int) c)) {
+-                               val = (val << 4) | (c + 10 - (islower ((int) c) ? 'a' : 'A'));
+-                               c = *++cp;
+-                       }
+-                       else
+-                               break;
+-               }
+-
+-               if (c == '.') {
+-
+-                       /*
+-                        * Internet format:
+-                        *  a.b.c.d
+-                        *  a.b.c (with c treated as 16 bits)
+-                        *  a.b (with b treated as 24 bits)
+-                        */
+-                       if (pp >= parts + 3)
+-                               return (0);
+-                       *pp++ = val;
+-                       c = *++cp;
+-               }
+-               else
+-                       break;
+-       }
+-
+-       /* Check for trailing characters */
+-       if (c != '\0' && (!isascii ((int) c) || !isspace ((int) c)))
+-               return (0);
+-
+-       /* Concoct the address according to the number of parts specified */
+-       n = pp - parts + 1;
+-       switch (n) {
+-
+-       case 0:
+-               return (0);                                                                     /* initial nondigit */
+-
+-       case 1:                                                                                 /* a -- 32 bits */
+-               break;
+-
+-       case 2:                                                                                 /* a.b -- 8.24 bits */
+-               if (val > 0xffffff)
+-                       return (0);
+-               val |= parts[0] << 24;
+-               break;
+-
+-       case 3:                                                                                 /* a.b.c -- 8.8.16 bits */
+-               if (val > 0xffff)
+-                       return (0);
+-               val |= (parts[0] << 24) | (parts[1] << 16);
+-               break;
+-
+-       case 4:                                                                                 /* a.b.c.d -- 8.8.8.8 bits */
+-               if (val > 0xff)
+-                       return (0);
+-               val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+-               break;
+-       }
+-
+-       if (addr)
+-               addr->s_addr = htonl (val);
+-
+-       return (1);
++        struct addrinfo hints;
++        struct addrinfo *res;
++        struct protoent *ptrp;
++       char port_str[6];
++        int result;
++
++        memset (&hints, 0, sizeof (hints));
++        hints.ai_family = PF_UNSPEC;
++        hints.ai_protocol = proto;
++
++       snprintf(port_str, sizeof(port_str), "%d", port);
++        /* nice clean AF-independent code doesn't matter if passed hostname or IP address */
++        result = getaddrinfo (host_name, port_str, &hints, &res);
++
++        if (result != 0)
++       {
++                printf ("%s\n", gai_strerror (result));
++                return STATE_UNKNOWN;
++       }
++        else
++        {
++                while (res)
++                {
++                        /* attempt to create a socket */
++                        *sd = socket (res->ai_family, (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM, res->ai_protocol);
++
++                        if (*sd < 0) {
++                                printf ("Socket creation failed\n");
++                                freeaddrinfo (res);
++                                return STATE_UNKNOWN;
++                        }
++
++                       /* attempt to open a connection */
++                        result = connect (*sd, res->ai_addr, res->ai_addrlen);
++
++                        if (result == 0)
++                               break;
++
++                        close(*sd);
++                        res = res->ai_next;
++                }
++                freeaddrinfo (res);
++        }
++
++        if (result == 0)
++                return STATE_OK;
++        else
++        {
++                printf ("%s\n", strerror(errno));
++                return STATE_CRITICAL;
++        }
+ }
+Index: netutils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h.in,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.h.in
+--- netutils.h.in       28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ netutils.h.in       11 Dec 2002 02:39:50 -0000
+@@ -42,19 +42,17 @@
+ void socket_timeout_alarm_handler (int);
+ 
+ int process_tcp_request2 (char *address, int port, char *sbuffer,
+-                                                                                                       char *rbuffer, int rsize);
++       char *rbuffer, int rsize);
+ int process_tcp_request (char *address, int port, char *sbuffer,
+-                                                                                                char *rbuffer, int rsize);
++       char *rbuffer, int rsize);
+ int process_udp_request (char *address, int port, char *sbuffer,
+-                                                                                                char *rbuffer, int rsize);
+-int process_request (char *address, int port, char *proto, char *sbuffer,
+-                                                                                char *rbuffer, int rsize);
++       char *rbuffer, int rsize);
++int process_request (char *address, int port, int proto, char *sbuffer,
++       char *rbuffer, int rsize);
+ 
+ int my_tcp_connect (char *address, int port, int *sd);
+ int my_udp_connect (char *address, int port, int *sd);
+-int my_connect (char *address, int port, int *sd, char *proto);
+-
+-int my_inet_aton (register const char *cp, struct in_addr *addr);
++int my_connect (char *address, int port, int *sd, int proto);
+ 
+ #ifndef DEFAULT_SOCKET_TIMEOUT
+ #include "config.h"
+Index: utils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.c,v
+retrieving revision 1.13
+diff -u -r1.13 utils.c
+--- utils.c     18 Nov 2002 07:22:28 -0000      1.13
++++ utils.c     11 Dec 2002 02:39:50 -0000
+@@ -16,6 +16,9 @@
+ #include "version.h"
+ #include <stdarg.h>
+ #include <limits.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
++#include <netdb.h>
+ 
+ extern int timeout_interval;
+ 
+@@ -27,7 +30,9 @@
+ RETSIGTYPE timeout_alarm_handler (int);
+ 
+ int is_host (char *);
+-int is_dotted_quad (char *);
++int resolve_host_or_addr (char *, int); 
++int is_ipv4_addr (char *);
++int is_ipv6_addr (char *);
+ int is_hostname (char *);
+ 
+ int is_integer (char *);
+@@ -154,53 +159,49 @@
+ int
+ is_host (char *address)
+ {
+-       if (is_dotted_quad (address) || is_hostname (address))
++       if (is_ipv4_addr (address) || is_ipv6_addr (address) || 
++               is_hostname (address))
+                return (TRUE);
++
+        return (FALSE);
+ }
+ 
+ int
+-is_dotted_quad (char *address)
++resolve_host_or_addr (char *address, int family)
+ {
+-       int o1, o2, o3, o4;
+-       char c[1];
++       struct addrinfo hints;
++       struct addrinfo *res;
++       int retval;
+ 
+-       if (sscanf (address, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, c) != 4)
+-               return FALSE;
+-       else if (o1 > 255 || o2 > 255 || o3 > 255 || o4 > 255)
+-               return FALSE;
+-       else if (o1 < 0 || o2 < 0 || o3 < 0 || o4 < 0)
++       memset (&hints, 0, sizeof (hints));
++       hints.ai_family = family;
++       retval = getaddrinfo (address, NULL, &hints, &res);
++
++       if (retval != 0)
+                return FALSE;
+        else
++       {
++               freeaddrinfo (res);
+                return TRUE;
++       }
+ }
+ 
+-/* from RFC-1035
+- * 
+- * The labels must follow the rules for ARPANET host names.  They must
+- * start with a letter, end with a letter or digit, and have as interior
+- * characters only letters, digits, and hyphen.  There are also some
+- * restrictions on the length.  Labels must be 63 characters or less. */
++int
++is_ipv4_addr (char *address)
++{
++       return resolve_host_or_addr (address, AF_INET);
++}
++
++int
++is_ipv6_addr (char *address)
++{
++       return resolve_host_or_addr (address, AF_INET6);
++}
+ 
+ int
+ is_hostname (char *s1)
+ {
+-       if (strlen (s1) > 63)
+-               return FALSE;
+-       if (strcspn
+-                       (s1,
+-                        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") !=
+-                       0) return FALSE;
+-       if (strspn (s1, "0123456789-.") == 1)
+-               return FALSE;
+-       while ((s1 = index (s1, '.'))) {
+-               s1++;
+-               if (strspn (s1, "0123456789-.") == 1) {
+-                       printf ("%s\n", s1);
+-                       return FALSE;
+-               }
+-       }
+-       return TRUE;
++       return resolve_host_or_addr (s1, AF_UNSPEC);
+ }
+ 
+ int
+Index: utils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h.in,v
+retrieving revision 1.7
+diff -u -r1.7 utils.h.in
+--- utils.h.in  9 Nov 2002 03:39:35 -0000       1.7
++++ utils.h.in  11 Dec 2002 02:39:50 -0000
+@@ -28,7 +28,8 @@
+ /* Test input types */
+ 
+ int is_host (char *);
+-int is_dotted_quad (char *);
++int is_ipv4_addr (char *);
++int is_ipv6_addr (char *);
+ int is_hostname (char *);
+ 
+ int is_integer (char *);
diff --git a/web/attachments/37324-nagiosplugins-netutils-20021210.diff b/web/attachments/37324-nagiosplugins-netutils-20021210.diff
new file mode 100644
index 0000000..06cdcbb
--- /dev/null
+++ b/web/attachments/37324-nagiosplugins-netutils-20021210.diff
@@ -0,0 +1,434 @@
+Index: netutils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.c
+--- netutils.c  28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ netutils.c  11 Dec 2002 02:38:43 -0000
+@@ -42,13 +42,11 @@
+ int process_tcp_request2 (char *, int, char *, char *, int);
+ int process_tcp_request (char *, int, char *, char *, int);
+ int process_udp_request (char *, int, char *, char *, int);
+-int process_request (char *, int, char *, char *, char *, int);
++int process_request (char *, int, int, char *, char *, int);
+ 
+ int my_tcp_connect (char *, int, int *);
+ int my_udp_connect (char *, int, int *);
+-int my_connect (char *, int, int *, char *);
+-
+-int my_inet_aton (register const char *, struct in_addr *);
++int my_connect (char *, int, int *, int);
+ 
+ /* handles socket timeouts */
+ void
+@@ -64,47 +62,29 @@
+ /* connects to a host on a specified TCP port, sends a string,
+    and gets a response */
+ int
+-process_tcp_request (char *server_address,
+-                                                                                int server_port,
+-                                                                                char *send_buffer, char *recv_buffer, int recv_size)
++process_tcp_request (char *server_address, int server_port,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+-       int result;
+-       char proto[4] = "tcp";
+-
+-       result = process_request (server_address,
+-                                                                                                               server_port,
+-                                                                                                               proto, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
++       return process_request (server_address, server_port, IPPROTO_TCP,
++               send_buffer, recv_buffer, recv_size);
+ }
+ 
+-
+ /* connects to a host on a specified UDP port, sends a string, and gets a
+     response */
+ int
+-process_udp_request (char *server_address,
+-                                                                                int server_port,
+-                                                                                char *send_buffer, char *recv_buffer, int recv_size)
++process_udp_request (char *server_address, int server_port,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+-       int result;
+-       char proto[4] = "udp";
+-
+-       result = process_request (server_address,
+-                                                                                                               server_port,
+-                                                                                                               proto, send_buffer, recv_buffer, recv_size);
+-
+-       return result;
++       return process_request (server_address, server_port, IPPROTO_UDP,
++               send_buffer, recv_buffer, recv_size);
+ }
+ 
+-
+-
+ /* connects to a host on a specified tcp port, sends a string, and gets a 
+         response. loops on select-recv until timeout or eof to get all of a 
+         multi-packet answer */
+ int
+-process_tcp_request2 (char *server_address,
+-                                                                                       int server_port,
+-                                                                                       char *send_buffer, char *recv_buffer, int recv_size)
++process_tcp_request2 (char *server_address, int server_port,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+ 
+        int result;
+@@ -115,7 +95,7 @@
+        fd_set readfds;
+        int recv_length = 0;
+ 
+-       result = my_connect (server_address, server_port, &sd, "tcp");
++       result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
+        if (result != STATE_OK)
+                return STATE_CRITICAL;
+ 
+@@ -149,24 +129,30 @@
+                else {                                                                                  /* it has */
+                        recv_result =
+                                recv (sd, recv_buffer + recv_length, recv_size - recv_length - 1, 0);
+-                       if (recv_result == -1) {        /* recv failed, bail out */
++                       if (recv_result == -1) {
++                               /* recv failed, bail out */
+                                strcpy (recv_buffer + recv_length, "");
+                                result = STATE_WARNING;
+                                break;
+                        }
+-                       else if (recv_result == 0) {    /* end of file ? */
++                       else if (recv_result == 0) {
++                               /* end of file ? */
+                                recv_buffer[recv_length] = 0;
+                                break;
+                        }
+-                       else {                                                                          /* we got data! */
++                       else {
++                               /* we got data! */
+                                recv_length += recv_result;
+-                               if (recv_length >= recv_size - 1) {     /* buffer full, we're done */
++                               if (recv_length >= recv_size - 1) {
++                                       /* buffer full, we're done */
+                                        recv_buffer[recv_size - 1] = 0;
+                                        break;
+                                }
+                        }
+-               }                                                                                                               /* end if(!FD_ISSET(sd,&readfds)) */
+-       }                                                                                                                       /* end while(1) */
++               }
++               /* end if(!FD_ISSET(sd,&readfds)) */
++       }
++       /* end while(1) */
+ 
+        close (sd);
+        return result;
+@@ -175,10 +161,8 @@
+ /* connects to a host on a specified port, sends a string, and gets a 
+    response */
+ int
+-process_request (char *server_address,
+-                                                                int server_port,
+-                                                                char *proto,
+-                                                                char *send_buffer, char *recv_buffer, int recv_size)
++process_request (char *server_address, int server_port, int proto,
++       char *send_buffer, char *recv_buffer, int recv_size)
+ {
+        int result;
+        int send_result;
+@@ -218,7 +202,7 @@
+                recv_result = recv (sd, recv_buffer, recv_size - 1, 0);
+                if (recv_result == -1) {
+                        strcpy (recv_buffer, "");
+-                       if (!strcmp (proto, "tcp"))
++                       if (proto != IPPROTO_TCP)
+                                printf ("recv() failed\n");
+                        result = STATE_WARNING;
+                }
+@@ -236,196 +220,74 @@
+ 
+ 
+ /* opens a connection to a remote host/tcp port */
++
+ int
+ my_tcp_connect (char *host_name, int port, int *sd)
+ {
+-       int result;
+-       char proto[4] = "tcp";
+-
+-       result = my_connect (host_name, port, sd, proto);
+-
+-       return result;
++       return my_connect (host_name, port, sd, IPPROTO_TCP); 
+ }
+ 
+-
+ /* opens a connection to a remote host/udp port */
+ int
+ my_udp_connect (char *host_name, int port, int *sd)
+ {
+-       int result;
+-       char proto[4] = "udp";
+-
+-       result = my_connect (host_name, port, sd, proto);
+-
+-       return result;
++       return my_connect (host_name, port, sd, IPPROTO_UDP);
+ }
+ 
+ 
+ /* opens a tcp or udp connection to a remote host */
+ int
+-my_connect (char *host_name, int port, int *sd, char *proto)
+-{
+-       struct sockaddr_in servaddr;
+-       struct hostent *hp;
+-       struct protoent *ptrp;
+-       int result;
+-
+-       bzero ((char *) &servaddr, sizeof (servaddr));
+-       servaddr.sin_family = AF_INET;
+-       servaddr.sin_port = htons (port);
+-
+-       /* try to bypass using a DNS lookup if this is just an IP address */
+-       if (!my_inet_aton (host_name, &servaddr.sin_addr)) {
+-
+-               /* else do a DNS lookup */
+-               hp = gethostbyname ((const char *) host_name);
+-               if (hp == NULL) {
+-                       printf ("Invalid host name '%s'\n", host_name);
+-                       return STATE_UNKNOWN;
+-               }
+-
+-               memcpy (&servaddr.sin_addr, hp->h_addr, hp->h_length);
+-       }
+-
+-       /* map transport protocol name to protocol number */
+-       if ((ptrp = getprotobyname (proto)) == NULL) {
+-               printf ("Cannot map \"%s\" to protocol number\n", proto);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       /* create a socket */
+-       *sd =
+-               socket (PF_INET, (!strcmp (proto, "udp")) ? SOCK_DGRAM : SOCK_STREAM,
+-                                               ptrp->p_proto);
+-       if (*sd < 0) {
+-               printf ("Socket creation failed\n");
+-               return STATE_UNKNOWN;
+-       }
+-
+-       /* open a connection */
+-       result = connect (*sd, (struct sockaddr *) &servaddr, sizeof (servaddr));
+-       if (result < 0) {
+-               switch (errno) {
+-               case ECONNREFUSED:
+-                       printf ("Connection refused by host\n");
+-                       break;
+-               case ETIMEDOUT:
+-                       printf ("Timeout while attempting connection\n");
+-                       break;
+-               case ENETUNREACH:
+-                       printf ("Network is unreachable\n");
+-                       break;
+-               default:
+-                       printf ("Connection refused or timed out\n");
+-               }
+-
+-               return STATE_CRITICAL;
+-       }
+-
+-       return STATE_OK;
+-}
+-
+-
+-
+-/* This code was taken from Fyodor's nmap utility, which was originally
+-        taken from the GLIBC 2.0.6 libraries because Solaris doesn't contain
+-        the inet_aton() funtion. */
+-int
+-my_inet_aton (register const char *cp, struct in_addr *addr)
++my_connect (char *host_name, int port, int *sd, int proto)
+ {
+-       register unsigned int val;              /* changed from u_long --david */
+-       register int base, n;
+-       register char c;
+-       u_int parts[4];
+-       register u_int *pp = parts;
+-
+-       c = *cp;
+-
+-       for (;;) {
+-
+-               /*
+-                * Collect number up to ``.''.
+-                * Values are specified as for C:
+-                * 0x=hex, 0=octal, isdigit=decimal.
+-                */
+-               if (!isdigit ((int) c))
+-                       return (0);
+-               val = 0;
+-               base = 10;
+-
+-               if (c == '0') {
+-                       c = *++cp;
+-                       if (c == 'x' || c == 'X')
+-                               base = 16, c = *++cp;
+-                       else
+-                               base = 8;
+-               }
+-
+-               for (;;) {
+-                       if (isascii ((int) c) && isdigit ((int) c)) {
+-                               val = (val * base) + (c - '0');
+-                               c = *++cp;
+-                       }
+-                       else if (base == 16 && isascii ((int) c) && isxdigit ((int) c)) {
+-                               val = (val << 4) | (c + 10 - (islower ((int) c) ? 'a' : 'A'));
+-                               c = *++cp;
+-                       }
+-                       else
+-                               break;
+-               }
+-
+-               if (c == '.') {
+-
+-                       /*
+-                        * Internet format:
+-                        *  a.b.c.d
+-                        *  a.b.c (with c treated as 16 bits)
+-                        *  a.b (with b treated as 24 bits)
+-                        */
+-                       if (pp >= parts + 3)
+-                               return (0);
+-                       *pp++ = val;
+-                       c = *++cp;
+-               }
+-               else
+-                       break;
+-       }
+-
+-       /* Check for trailing characters */
+-       if (c != '\0' && (!isascii ((int) c) || !isspace ((int) c)))
+-               return (0);
+-
+-       /* Concoct the address according to the number of parts specified */
+-       n = pp - parts + 1;
+-       switch (n) {
+-
+-       case 0:
+-               return (0);                                                                     /* initial nondigit */
+-
+-       case 1:                                                                                 /* a -- 32 bits */
+-               break;
+-
+-       case 2:                                                                                 /* a.b -- 8.24 bits */
+-               if (val > 0xffffff)
+-                       return (0);
+-               val |= parts[0] << 24;
+-               break;
+-
+-       case 3:                                                                                 /* a.b.c -- 8.8.16 bits */
+-               if (val > 0xffff)
+-                       return (0);
+-               val |= (parts[0] << 24) | (parts[1] << 16);
+-               break;
+-
+-       case 4:                                                                                 /* a.b.c.d -- 8.8.8.8 bits */
+-               if (val > 0xff)
+-                       return (0);
+-               val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+-               break;
+-       }
+-
+-       if (addr)
+-               addr->s_addr = htonl (val);
+-
+-       return (1);
++        struct addrinfo hints;
++        struct addrinfo *res;
++        struct protoent *ptrp;
++       char port_str[6];
++        int result;
++
++        memset (&hints, 0, sizeof (hints));
++        hints.ai_family = PF_UNSPEC;
++        hints.ai_protocol = proto;
++
++       snprintf(port_str, sizeof(port_str), "%d", port);
++        /* nice clean AF-independent code doesn't matter if passed hostname or IP address */
++        result = getaddrinfo (host_name, port_str, &hints, &res);
++
++        if (result != 0)
++       {
++                printf ("%s\n", gai_strerror (result));
++                return STATE_UNKNOWN;
++       }
++        else
++        {
++                while (res)
++                {
++                        /* attempt to create a socket */
++                        *sd = socket (res->ai_family, (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM, res->ai_protocol);
++
++                        if (*sd < 0) {
++                                printf ("Socket creation failed\n");
++                                freeaddrinfo (res);
++                                return STATE_UNKNOWN;
++                        }
++
++                       /* attempt to open a connection */
++                        result = connect (*sd, res->ai_addr, res->ai_addrlen);
++
++                        if (result == 0)
++                               break;
++
++                        close(*sd);
++                        res = res->ai_next;
++                }
++                freeaddrinfo (res);
++        }
++
++        if (result == 0)
++                return STATE_OK;
++        else
++        {
++                printf ("%s\n", strerror(errno));
++                return STATE_CRITICAL;
++        }
+ }
+Index: netutils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h.in,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.h.in
+--- netutils.h.in       28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ netutils.h.in       11 Dec 2002 02:38:43 -0000
+@@ -42,19 +42,17 @@
+ void socket_timeout_alarm_handler (int);
+ 
+ int process_tcp_request2 (char *address, int port, char *sbuffer,
+-                                                                                                       char *rbuffer, int rsize);
++       char *rbuffer, int rsize);
+ int process_tcp_request (char *address, int port, char *sbuffer,
+-                                                                                                char *rbuffer, int rsize);
++       char *rbuffer, int rsize);
+ int process_udp_request (char *address, int port, char *sbuffer,
+-                                                                                                char *rbuffer, int rsize);
+-int process_request (char *address, int port, char *proto, char *sbuffer,
+-                                                                                char *rbuffer, int rsize);
++       char *rbuffer, int rsize);
++int process_request (char *address, int port, int proto, char *sbuffer,
++       char *rbuffer, int rsize);
+ 
+ int my_tcp_connect (char *address, int port, int *sd);
+ int my_udp_connect (char *address, int port, int *sd);
+-int my_connect (char *address, int port, int *sd, char *proto);
+-
+-int my_inet_aton (register const char *cp, struct in_addr *addr);
++int my_connect (char *address, int port, int *sd, int proto);
+ 
+ #ifndef DEFAULT_SOCKET_TIMEOUT
+ #include "config.h"
diff --git a/web/attachments/37325-nagiosplugins-utils-20021210.diff b/web/attachments/37325-nagiosplugins-utils-20021210.diff
new file mode 100644
index 0000000..3295f2e
--- /dev/null
+++ b/web/attachments/37325-nagiosplugins-utils-20021210.diff
@@ -0,0 +1,126 @@
+Index: utils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.c,v
+retrieving revision 1.13
+diff -u -r1.13 utils.c
+--- utils.c     18 Nov 2002 07:22:28 -0000      1.13
++++ utils.c     11 Dec 2002 02:39:17 -0000
+@@ -16,6 +16,9 @@
+ #include "version.h"
+ #include <stdarg.h>
+ #include <limits.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
++#include <netdb.h>
+ 
+ extern int timeout_interval;
+ 
+@@ -27,7 +30,9 @@
+ RETSIGTYPE timeout_alarm_handler (int);
+ 
+ int is_host (char *);
+-int is_dotted_quad (char *);
++int resolve_host_or_addr (char *, int); 
++int is_ipv4_addr (char *);
++int is_ipv6_addr (char *);
+ int is_hostname (char *);
+ 
+ int is_integer (char *);
+@@ -154,53 +159,49 @@
+ int
+ is_host (char *address)
+ {
+-       if (is_dotted_quad (address) || is_hostname (address))
++       if (is_ipv4_addr (address) || is_ipv6_addr (address) || 
++               is_hostname (address))
+                return (TRUE);
++
+        return (FALSE);
+ }
+ 
+ int
+-is_dotted_quad (char *address)
++resolve_host_or_addr (char *address, int family)
+ {
+-       int o1, o2, o3, o4;
+-       char c[1];
++       struct addrinfo hints;
++       struct addrinfo *res;
++       int retval;
+ 
+-       if (sscanf (address, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, c) != 4)
+-               return FALSE;
+-       else if (o1 > 255 || o2 > 255 || o3 > 255 || o4 > 255)
+-               return FALSE;
+-       else if (o1 < 0 || o2 < 0 || o3 < 0 || o4 < 0)
++       memset (&hints, 0, sizeof (hints));
++       hints.ai_family = family;
++       retval = getaddrinfo (address, NULL, &hints, &res);
++
++       if (retval != 0)
+                return FALSE;
+        else
++       {
++               freeaddrinfo (res);
+                return TRUE;
++       }
+ }
+ 
+-/* from RFC-1035
+- * 
+- * The labels must follow the rules for ARPANET host names.  They must
+- * start with a letter, end with a letter or digit, and have as interior
+- * characters only letters, digits, and hyphen.  There are also some
+- * restrictions on the length.  Labels must be 63 characters or less. */
++int
++is_ipv4_addr (char *address)
++{
++       return resolve_host_or_addr (address, AF_INET);
++}
++
++int
++is_ipv6_addr (char *address)
++{
++       return resolve_host_or_addr (address, AF_INET6);
++}
+ 
+ int
+ is_hostname (char *s1)
+ {
+-       if (strlen (s1) > 63)
+-               return FALSE;
+-       if (strcspn
+-                       (s1,
+-                        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") !=
+-                       0) return FALSE;
+-       if (strspn (s1, "0123456789-.") == 1)
+-               return FALSE;
+-       while ((s1 = index (s1, '.'))) {
+-               s1++;
+-               if (strspn (s1, "0123456789-.") == 1) {
+-                       printf ("%s\n", s1);
+-                       return FALSE;
+-               }
+-       }
+-       return TRUE;
++       return resolve_host_or_addr (s1, AF_UNSPEC);
+ }
+ 
+ int
+Index: utils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h.in,v
+retrieving revision 1.7
+diff -u -r1.7 utils.h.in
+--- utils.h.in  9 Nov 2002 03:39:35 -0000       1.7
++++ utils.h.in  11 Dec 2002 02:39:17 -0000
+@@ -28,7 +28,8 @@
+ /* Test input types */
+ 
+ int is_host (char *);
+-int is_dotted_quad (char *);
++int is_ipv4_addr (char *);
++int is_ipv6_addr (char *);
+ int is_hostname (char *);
+ 
+ int is_integer (char *);
diff --git a/web/attachments/37326-nagiosplugins-updates-20021210.diff b/web/attachments/37326-nagiosplugins-updates-20021210.diff
new file mode 100644
index 0000000..a8f81ad
--- /dev/null
+++ b/web/attachments/37326-nagiosplugins-updates-20021210.diff
@@ -0,0 +1,180 @@
+Index: check_dig.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
+retrieving revision 1.7
+diff -u -r1.7 check_dig.c
+--- check_dig.c 21 Nov 2002 12:40:58 -0000      1.7
++++ check_dig.c 11 Dec 2002 02:40:59 -0000
+@@ -57,7 +57,7 @@
+                usage ("Could not parse arguments\n");
+ 
+        /* get the command to run */
+-       asprintf (&command_line, "%s @%s %s", PATH_TO_DIG, dns_server, query_address);
++       asprintf (&command_line, "%s -t any @%s %s", PATH_TO_DIG, dns_server, query_address);
+ 
+        alarm (timeout_interval);
+        time (&start_time);
+Index: check_dns.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
+retrieving revision 1.5
+diff -u -r1.5 check_dns.c
+--- check_dns.c 14 Nov 2002 02:26:34 -0000      1.5
++++ check_dns.c 11 Dec 2002 02:40:59 -0000
+@@ -308,7 +308,7 @@
+                        timeout_interval = atoi (optarg);
+                        break;
+                case 'H': /* hostname */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid host name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -318,7 +318,7 @@
+                        strcpy (query_address, optarg);
+                        break;
+                case 's': /* server name */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid server name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -328,7 +328,7 @@
+                        strcpy (dns_server, optarg);
+                        break;
+                case 'r': /* reverse server name */
+-                       if (is_host (optarg) == FALSE) {
++                       if ((is_host (optarg)) == FALSE) {
+                                printf ("Invalid host name/address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -338,7 +338,7 @@
+                        strcpy (ptr_server, optarg);
+                        break;
+                case 'a': /* expected address */
+-                       if (is_dotted_quad (optarg) == FALSE) {
++                       if ((is_ipv4_addr (optarg)) == FALSE) {
+                                printf ("Invalid expected address\n\n");
+                                print_usage ();
+                                exit (STATE_UNKNOWN);
+@@ -352,8 +352,8 @@
+        }
+ 
+        c = optind;
+-       if (query_address[0] == 0) {
+-               if (is_host (argv[c]) == FALSE) {
++       if (query_address == NULL) {
++               if ((is_host (argv[c])) == FALSE) {
+                        printf ("Invalid name/address: %s\n\n", argv[c]);
+                        return ERROR;
+                }
+@@ -362,8 +362,8 @@
+                strcpy (query_address, argv[c++]);
+        }
+ 
+-       if (dns_server[0] == 0) {
+-               if (is_host (argv[c]) == FALSE) {
++       if (dns_server == NULL) {
++               if ((is_host (argv[c])) == FALSE) {
+                        printf ("Invalid name/address: %s\n\n", argv[c]);
+                        return ERROR;
+                }
+Index: check_ldap.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
+retrieving revision 1.2
+diff -u -r1.2 check_ldap.c
+--- check_ldap.c        14 Nov 2002 02:26:34 -0000      1.2
++++ check_ldap.c        11 Dec 2002 02:40:59 -0000
+@@ -7,7 +7,7 @@
+  * 
+  * Last Modified: $Date: 2002/11/14 02:26:34 $
+  *
+- * Command line: check_ldap -h <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
++ * Command line: check_ldap -H <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
+  *
+  * Description:
+  *
+@@ -197,7 +197,7 @@
+                        crit_time = atoi (optarg);
+                        break;
+                default:
+-                       usage ("check_ldap: could not parse arguments\n");
++                       usage ("check_ldap: could not parse unknown arguments\n");
+                        break;
+                }
+        }
+@@ -253,6 +253,6 @@
+ {
+        printf
+                ("Usage: %s -H <host> -b <base_dn> -p <port> [-a <attr>] [-D <binddn>]\n"
+-                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
++                "         [-P <password>] -w <warn_time> -c <crit_time> [-t timeout]\n"
+                 "(Note: all times are in seconds.)\n", PROGNAME);
+ }
+Index: check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.10
+diff -u -r1.10 check_ping.c
+--- check_ping.c        13 Nov 2002 11:50:54 -0000      1.10
++++ check_ping.c        11 Dec 2002 02:40:59 -0000
+@@ -88,9 +88,15 @@
+ 
+        /* does the host address of number of packets argument come first? */
+ #ifdef PING_PACKETS_FIRST
+-       asprintf (&command_line, PING_COMMAND, max_packets, server_address);
++       if (is_ipv6_addr (server_address)) 
++               asprintf (&command_line, PING6_COMMAND, max_packets, server_address);
++       else
++               asprintf (&command_line, PING_COMMAND, max_packets, server_address);
+ #else
+-       asprintf (&command_line, PING_COMMAND, server_address, max_packets);
++       if (is_ipv6_addr (server_address)) 
++               asprintf (&command_line, PING6_COMMAND, server_address, max_packets);
++       else
++               asprintf (&command_line, PING_COMMAND, server_address, max_packets);
+ #endif
+ 
+        /* Set signal handling and alarm */
+Index: check_tcp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
+retrieving revision 1.8
+diff -u -r1.8 check_tcp.c
+--- check_tcp.c 25 Nov 2002 12:00:17 -0000      1.8
++++ check_tcp.c 11 Dec 2002 02:40:59 -0000
+@@ -225,8 +225,12 @@
+                {
+                        if (PROTOCOL == UDP_PROTOCOL)
+                                result = my_udp_connect (server_address, server_port, &sd);
+-                       else                                                                                                    /* default is TCP */
+-                               result = my_tcp_connect (server_address, server_port, &sd);
++                       else
++                               /* default is TCP */
++                               // result = my_tcp_connect (server_address, server_port, &sd);
++                               result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
++printf ("Catch value: %d\n", result);
++printf ("XXX: Check valve\n");
+                }
+ 
+        if (result == STATE_CRITICAL)
+Index: check_udp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_udp.c,v
+retrieving revision 1.2
+diff -u -r1.2 check_udp.c
+--- check_udp.c 30 Oct 2002 18:46:01 -0000      1.2
++++ check_udp.c 11 Dec 2002 02:40:59 -0000
+@@ -74,9 +74,8 @@
+        alarm (socket_timeout);
+ 
+        time (&start_time);
+-       result =
+-               process_udp_request (server_address, server_port, server_send,
+-                                                                                                recv_buffer, MAX_INPUT_BUFFER - 1);
++       result = process_udp_request (server_address, server_port, server_send,
++                       recv_buffer, MAX_INPUT_BUFFER - 1);
+        time (&end_time);
+ 
+        if (result != STATE_OK) {
diff --git a/web/attachments/373544-nagiosplug_check_http_search_string_in_not_found_output.patch b/web/attachments/373544-nagiosplug_check_http_search_string_in_not_found_output.patch
new file mode 100644
index 0000000..1a27819
--- /dev/null
+++ b/web/attachments/373544-nagiosplug_check_http_search_string_in_not_found_output.patch
@@ -0,0 +1,61 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 7f773c8..d363c17 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -100,6 +100,7 @@ int server_url_length;
+ int server_expect_yn = 0;
+ char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+ char string_expect[MAX_INPUT_BUFFER] = "";
++int output_string_match = FALSE;
+ double warning_time = 0;
+ int check_warning_time = FALSE;
+ double critical_time = 0;
+@@ -198,6 +199,7 @@ process_arguments (int argc, char **argv)
+     {"authorization", required_argument, 0, 'a'},
+     {"proxy_authorization", required_argument, 0, 'b'},
+     {"string", required_argument, 0, 's'},
++    {"output-string-match", no_argument, 0, 'o'},
+     {"expect", required_argument, 0, 'e'},
+     {"regex", required_argument, 0, 'r'},
+     {"ereg", required_argument, 0, 'r'},
+@@ -234,7 +236,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:nlLSm:M:N", longopts, &option);
++    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:e:p:s:oR:r:u:f:C:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -377,6 +379,9 @@ process_arguments (int argc, char **argv)
+       strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
+       string_expect[MAX_INPUT_BUFFER - 1] = 0;
+       break;
++    case 'o': /* output 'string' in STDOUT 'string not found' msg */
++      output_string_match = TRUE;
++      break;
+     case 'e': /* string or substring */
+       strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
+       server_expect[MAX_INPUT_BUFFER - 1] = 0;
+@@ -1037,7 +1042,11 @@ check_http (void)
+ 
+   if (strlen (string_expect)) {
+     if (!strstr (page, string_expect)) {
+-      asprintf (&msg, _("%sstring not found, "), msg);
++      if(!output_string_match){
++        asprintf (&msg, _("%sstring not found, "), msg);
++      } else {
++        asprintf (&msg, _("%sstring '%s' not found, "), msg, string_expect);
++      }
+       result = STATE_CRITICAL;
+     }
+   }
+@@ -1346,6 +1355,8 @@ print_help (void)
+   printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
+   printf (" %s\n", "-s, --string=STRING");
+   printf ("    %s\n", _("String to expect in the content"));
++  printf (" %s\n", "-o, --output-string-match");
++  printf ("    %s\n", _("Show given string as 'string xxx not found' message"));
+   printf (" %s\n", "-u, --url=PATH");
+   printf ("    %s\n", _("URL to GET or POST (default: /)"));
+   printf (" %s\n", "-P, --post=STRING");
diff --git a/web/attachments/37370-configure.in.patch b/web/attachments/37370-configure.in.patch
new file mode 100644
index 0000000..d18d3ca
--- /dev/null
+++ b/web/attachments/37370-configure.in.patch
@@ -0,0 +1,26 @@
+--- configure.in.original       Thu Dec  5 20:33:08 2002

++++ configure.in        Thu Dec  5 22:42:50 2002

+@@ -620,6 +620,23 @@

+        AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS glaxen",[])

+        AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])

+        echo "      ps syntax... $PATH_TO_PS glaxen"

++dnl MacOSX / Darwin

++dnl MacOSX has commands with spaces which will cause problems to PS_FORMAT

++dnl STAT      VSZ    RSS   UID USER     PPID UCOMM            COMMAND

++dnl Ss       1308    272     0 root        0 init             /sbin/init

++elif [ps waxo 'state vsz rss uid user ppid ucomm command' 2>/dev/null | egrep -i "^STAT +VSZ +RSS +UID +USER +PPID +UCOMM +COMMAND" >/dev/null]

++then

++       AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])

++       AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[])

++       AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'",[])

++       EXTRAS="$EXTRAS check_nagios"

++       AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid ucomm command'",[])

++       AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])

++       AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[])

++       AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])

++       AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'",[])

++       AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])

++       echo "      ps syntax... $PATH_TO_PS waxo 'state vsz rss command'"

+ else

+        echo "** Unable to find usable ps syntax"

+ fi

diff --git a/web/attachments/37372-plugins-Makefile.am.patch b/web/attachments/37372-plugins-Makefile.am.patch
new file mode 100644
index 0000000..ed969e9
--- /dev/null
+++ b/web/attachments/37372-plugins-Makefile.am.patch
@@ -0,0 +1,10 @@
+--- Makefile.am.original        Sat Dec  7 16:06:44 2002

++++ Makefile.am Thu Dec  5 21:01:50 2002

+@@ -127,6 +127,7 @@

+ 

+ libgetopt.a: getopt.o getopt1.o

+        $(AR) -r $@ getopt.o getopt1.o

++       $(RANLIB) $@

+ 

+ libsnprintf.a: snprintf.o

+        $(AR) -r $@ snprintf.o

diff --git a/web/attachments/37373-check_procs.c.patch b/web/attachments/37373-check_procs.c.patch
new file mode 100644
index 0000000..5cb9fe3
--- /dev/null
+++ b/web/attachments/37373-check_procs.c.patch
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>SourceForge - Unable to display the page requested</title>
+        <link href="//fonts.googleapis.com/css?family=Ubuntu:regular" rel="stylesheet">
+        <style type="text/css">
+            html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; }
+            body { line-height: 1; }
+            ol, ul { list-style: none; }
+            table { border-collapse: collapse; border-spacing: 0; }
+            caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
+            q, blockquote { quotes: none; }
+            q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; }
+            a img { border: none; }
+            article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; }
+            body { background: #fff; color: #333; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; margin: 0; padding: 0; }
+            a { color: #07a; }
+            #header { background: #eee; border-bottom: 1px solid #aaa; height: 50px; -moz-box-shadow: 0px 2px 4px 0px #cccccc; -webkit-box-shadow: 0px 2px 4px 0px #cccccc; -o-box-shadow: 0px 2px 4px 0px #cccccc; box-shadow: 0px 2px 4px 0px #cccccc; }
+            #header section { margin: 0 auto; width: 960px; padding: 5px 0; }
+            #content { margin: 0 auto; width: 960px; }
+            #content h1 { font-family: Ubuntu; font-size: 47px; font-weight: bold; margin: 40px 0 20px 0; }
+            #content p { margin-bottom: 60px; font-size: 16px; }
+            #content #error-message { float: left; margin-right: 20px; }
+            #content #twitter { float: left; position: relative; }
+            #content #twitter #twitter-bird { position: absolute; top: 40px; }
+            #content #twitter #message-bubble { position: relative; background: url("//a.fsdn.com/sorry/bubble.png") no-repeat; left: 60px; top: 18px; width: 333px; height: 150px; padding: 9px 28px; }
+        </style>
+    </head>
+    <body>
+        <header id="header">
+            <section>
+                <a id="logo" href="http://sourceforge.net"><img src="//a.fsdn.com/sorry/logo.png" alt="SourceForge Logo" /></a>
+            </section>
+        </header>
+        <section id="content">
+            <h1>Oops, looks like something went wrong.</h1>
+            <p>
+                For updates, follow us on <a href="http://twitter.com/sfnet_ops" title="@sfnet_ops">twitter</a> or check the <a href="http://sourceforge.net/sitestatus" title="Listing of services and their status">status dashboard</a>.
+                While we fix the issue checkout <a href="http://slashdot.org" title="News for Nerds">Slashdot</a> or <a href="http://thinkgeek.com" title="Stuff for smart masses">Thinkgeek</a>.
+            </p>
+            <img src="//a.fsdn.com/sorry/500.png" alt="500 Error" id="error-message"/>
+            <section id="twitter">
+                <img id="twitter-bird" src="//a.fsdn.com/sorry/twitter_bird.png" alt="Twitter Bird" />
+                <div id="message-bubble">
+                    <a class="twitter-timeline" data-dnt="true" href="https://twitter.com/sfnet_ops"  data-widget-id="347335110670049280" data-tweet-limit="1" width="330" height="115" data-chrome="nofooter noborders noscrollbar">Tweets by @sfnet_ops</a>
+                    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+                </div>
+            </section>
+        </section>
+        <script type="text/javascript">
+          var url, filename, project;
+
+         /*
+          Match:
+           /projects/xyz/files/a/download
+                  /a/b/c/download
+                  /a/download?use_mirror=m (url params aren't in window.location.pathname)
+          non-greedy match on project name
+          optional greedy match on file path including trailing slash
+          regular match on base file name
+          */
+          var regexp = new RegExp('^/projects/(.+?)/files/(.*/)?(.+)/download$');
+          var matches = window.location.pathname.match(regexp);
+          if (matches) {
+              project = matches[1];
+              var path = matches[2] || ''; // may be undefined
+              filename = matches[3];
+              url = '//downloads.sourceforge.net/project/' + project + '/' + path + filename;
+          }
+
+          if (window.location.pathname === '/project/downloading.php') {
+              /*
+              match:
+                /project/downloading.php?groupname=xyz&filename=abc.zip
+                                        abc.zip&use_mirror=m
+              non-greedy match on project name
+              non-greedy match on filename, terminated by EOL or '&'
+              */
+              var legacy_re = new RegExp('groupname=(.+?)&filename=(.+?)($|&)');
+              var legacy_matches = window.location.search.match(legacy_re);
+              if (legacy_matches) {
+                  project = legacy_matches[1];
+                  filename = legacy_matches[2];
+                  url = '//downloads.sourceforge.net/' + project + '/' + filename;
+              }
+          }
+
+          /*global console*/
+          if (url && filename) {
+              url += '?fromerrorjs=1';
+              if (window.location.hostname === 'sourceforge.net') {
+                  window.location = url;
+              } else if (window.console) {
+                  console.log('redirecting to ' + url);
+              }
+              document.title = 'Downloading ' + decodeURIComponent(filename) + ' [Internal Code - ' + document.title + ']';
+              // h2 with large font instead of h1, so that a styling is correct
+              document.getElementById('doc4').innerHTML = '<h2 style="margin:5em;font-size:150%">Downloading <a href="' + url + '">' + decodeURIComponent(filename) + '<\/a> ...<\/h2>';
+          }
+        </script>
+    </body>
+</html>
diff --git a/web/attachments/37375-check_vsz.c.patch b/web/attachments/37375-check_vsz.c.patch
new file mode 100644
index 0000000..6a0488a
--- /dev/null
+++ b/web/attachments/37375-check_vsz.c.patch
@@ -0,0 +1,82 @@
+--- check_vsz.c.original        Sat Dec  7 17:21:29 2002

++++ check_vsz.c Sat Dec  7 17:20:44 2002

+@@ -63,7 +63,7 @@

+        char proc_name[MAX_INPUT_BUFFER];

+        char *message = "";

+ 

+-       if (!process_arguments (argc, argv)) {

++       if (process_arguments (argc, argv) == ERROR ) {

+                printf ("%s: failure parsing arguments\n", my_basename (argv[0]));

+                print_help (my_basename (argv[0]));

+                return STATE_UNKNOWN;

+@@ -94,7 +94,7 @@

+                                        asprintf (&message, "%s %s(%d)", message, proc_name, proc_size);

+                                        result = max_state (result, STATE_WARNING);

+                                }

+-                               if (proc_size > crit) {

++                               if (crit != -1 && proc_size > crit) {

+                                        result = STATE_CRITICAL;

+                                }

+                        }

+@@ -103,7 +103,7 @@

+                                if (proc_size > warn) {

+                                        result = max_state (result, STATE_WARNING);

+                                }

+-                               if (proc_size > crit) {

++                               if (crit != -1 && proc_size > crit) {

+                                        result = STATE_CRITICAL;

+                                }

+                        }

+@@ -121,7 +121,7 @@

+                result = max_state (result, STATE_WARNING);

+ 

+        if (result == STATE_OK)

+-               printf ("ok (all VSZ<%d): %s\n", warn, message);

++               printf ("OK (all VSZ<%d): %s\n", warn, message);

+        else if (result == STATE_UNKNOWN)

+                printf ("Unable to read output\n");

+        else if (result == STATE_WARNING)

+@@ -166,7 +166,6 @@

+ 

+                switch (c) {

+                case '?':                                                                       /* help */

+-                       printf ("%s: Unknown argument: %s\n\n", my_basename (argv[0]), optarg);

+                        print_usage (my_basename (argv[0]));

+                        exit (STATE_UNKNOWN);

+                case 'h':                                                                       /* help */

+@@ -200,7 +199,7 @@

+        }

+ 

+        c = optind;

+-       if (warn == -1) {

++       if (warn == -1 && argv[c]) {

+                if (!is_intnonneg (argv[c])) {

+                        printf ("%s: critical threshold must be an integer: %s\n",

+                                                        PROGNAME, argv[c]);

+@@ -210,7 +209,7 @@

+                warn = atoi (argv[c++]);

+        }

+ 

+-       if (crit == -1) {

++       if (crit == -1 && argv[c]) {

+                if (!is_intnonneg (argv[c])) {

+                        printf ("%s: critical threshold must be an integer: %s\n",

+                                                        PROGNAME, argv[c]);

+@@ -222,6 +221,17 @@

+ 

+        if (proc == NULL)

+                proc = argv[c];

++

++       // Validate arguments

++       if (warn == -1) {

++               if (crit != -1)

++                       warn = crit;

++               else {

++                       printf ("%s: Must specify a critical or warning threshold\n", PROGNAME);

++                       print_usage (PROGNAME);

++                       exit (STATE_UNKNOWN);

++               }

++       }

+ 

+        return c;

+ }

diff --git a/web/attachments/37563-nagiosplug-check_ssh-20021213.diff b/web/attachments/37563-nagiosplug-check_ssh-20021213.diff
new file mode 100644
index 0000000..091b5bf
--- /dev/null
+++ b/web/attachments/37563-nagiosplug-check_ssh-20021213.diff
@@ -0,0 +1,126 @@
+Index: plugins/check_ssh.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ssh.c,v
+retrieving revision 1.3
+diff -u -r1.3 check_ssh.c
+--- plugins/check_ssh.c 30 Oct 2002 18:44:43 -0000      1.3
++++ plugins/check_ssh.c 14 Dec 2002 04:31:32 -0000
+@@ -34,7 +34,6 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-char *ssh_resolve (char *hostname);
+ int ssh_connect (char *haddr, short hport);
+ 
+ int
+@@ -49,7 +48,7 @@
+        alarm (socket_timeout);
+ 
+        /* ssh_connect exits if error is found */
+-       ssh_connect (ssh_resolve (server_name), port);
++       ssh_connect (server_name, port);
+ 
+        alarm (0);
+ 
+@@ -109,6 +108,8 @@
+                        socket_timeout = atoi (optarg);
+                        break;
+                case 'H':                                                                       /* host */
++                       if (is_host (optarg) == FALSE)
++                               usage ("Invalid host name/addresss\n");
+                        server_name = optarg;
+                        break;
+                case 'p':                                                                       /* port */
+@@ -125,7 +126,8 @@
+ 
+        c = optind;
+        if (server_name == NULL && argv[c]) {
+-               server_name = argv[c++];
++               if (is_host (argv[c++]))
++                       server_name = argv[c++];
+        }
+        else if (port == -1 && argv[c]) {
+                if (is_intpos (argv[c])) {
+@@ -153,26 +155,6 @@
+ 
+ /************************************************************************
+ *
+-* Resolve hostname into IP address
+-*
+-*-----------------------------------------------------------------------*/
+-
+-char *
+-ssh_resolve (char *hostname)
+-{
+-       struct hostent *host;
+-
+-       host = gethostbyname (hostname);
+-       if (!host) {
+-               herror (hostname);
+-               exit (STATE_CRITICAL);
+-       }
+-       return (host->h_addr);
+-}
+-
+-
+-/************************************************************************
+-*
+ * Try to connect to SSH server at specified server and port
+ *
+ *-----------------------------------------------------------------------*/
+@@ -180,39 +162,24 @@
+ int
+ ssh_connect (char *haddr, short hport)
+ {
+-       int s;
+-       struct sockaddr_in addr;
+-       int addrlen;
+-       int len;
++       int result;
++       int sock;
+        char *output = NULL;
+        char *buffer = NULL;
+        char *ssh_proto = NULL;
+        char *ssh_server = NULL;
+        char revision[20];
+ 
+-       sscanf ("$Revision: 1.3 $", "$Revision: %[0123456789.]", revision);
++       sscanf ("$Revision: 1.3 $", "$Revision: %[0-9.]", revision);
+ 
+-       addrlen = sizeof (addr);
+-       memset (&addr, 0, addrlen);
+-       addr.sin_port = htons (hport);
+-       addr.sin_family = AF_INET;
+-       bcopy (haddr, (void *) &addr.sin_addr.s_addr, 4);
+-
+-       s = socket (AF_INET, SOCK_STREAM, 0);
+-       if (!s) {
+-               printf ("socket(): %s for %s:%d\n", strerror (errno), server_name, hport);
+-               exit (STATE_CRITICAL);
+-       }
++       result = my_tcp_connect (haddr, hport, &sock);
+ 
+-       if (connect (s, (struct sockaddr *) &addr, addrlen)) {
+-               printf ("connect(): %s for %s:%d\n", strerror (errno), server_name,
+-                                               hport);
+-               exit (STATE_CRITICAL);
+-       }
++       if (result != STATE_OK)
++               return result;
+ 
+        output = (char *) malloc (BUFF_SZ + 1);
+        memset (output, 0, BUFF_SZ + 1);
+-       recv (s, output, BUFF_SZ, 0);
++       recv (sock, output, BUFF_SZ, 0);
+        if (strncmp (output, "SSH", 3)) {
+                printf ("Server answer: %s", output);
+                exit (STATE_CRITICAL);
+@@ -228,7 +195,7 @@
+                        ("SSH ok - %s (protocol %s)\n",
+                         ssh_server, ssh_proto);
+                asprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, revision);
+-               send (s, buffer, strlen (buffer), MSG_DONTWAIT);
++               send (sock, buffer, strlen (buffer), MSG_DONTWAIT);
+                if (verbose)
+                        printf ("%s\n", buffer);
+                exit (STATE_OK);
diff --git a/web/attachments/376677-nagiosplug_check_http_search_string_in_not_found_output.patch b/web/attachments/376677-nagiosplug_check_http_search_string_in_not_found_output.patch
new file mode 100644
index 0000000..ac18fe2
--- /dev/null
+++ b/web/attachments/376677-nagiosplug_check_http_search_string_in_not_found_output.patch
@@ -0,0 +1,61 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 7f773c8..3fe6998 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -100,6 +100,7 @@ int server_url_length;
+ int server_expect_yn = 0;
+ char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+ char string_expect[MAX_INPUT_BUFFER] = "";
++int output_string_match = FALSE;
+ double warning_time = 0;
+ int check_warning_time = FALSE;
+ double critical_time = 0;
+@@ -198,6 +199,7 @@ process_arguments (int argc, char **argv)
+     {"authorization", required_argument, 0, 'a'},
+     {"proxy_authorization", required_argument, 0, 'b'},
+     {"string", required_argument, 0, 's'},
++    {"output-string-match", no_argument, 0, 'o'},
+     {"expect", required_argument, 0, 'e'},
+     {"regex", required_argument, 0, 'r'},
+     {"ereg", required_argument, 0, 'r'},
+@@ -234,7 +236,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:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
++    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:e:p:s:oR:r:u:f:C:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -377,6 +379,9 @@ process_arguments (int argc, char **argv)
+       strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
+       string_expect[MAX_INPUT_BUFFER - 1] = 0;
+       break;
++    case 'o': /* output 'string' in STDOUT 'string not found' msg */
++      output_string_match = TRUE;
++      break;
+     case 'e': /* string or substring */
+       strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
+       server_expect[MAX_INPUT_BUFFER - 1] = 0;
+@@ -1037,7 +1042,11 @@ check_http (void)
+ 
+   if (strlen (string_expect)) {
+     if (!strstr (page, string_expect)) {
+-      asprintf (&msg, _("%sstring not found, "), msg);
++      if(!output_string_match){
++        asprintf (&msg, _("%sstring not found, "), msg);
++      } else {
++        asprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, string_expect, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
++      }
+       result = STATE_CRITICAL;
+     }
+   }
+@@ -1346,6 +1355,8 @@ print_help (void)
+   printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
+   printf (" %s\n", "-s, --string=STRING");
+   printf ("    %s\n", _("String to expect in the content"));
++  printf (" %s\n", "-o, --output-string-match");
++  printf ("    %s\n", _("Show given string as 'string xxx not found' message"));
+   printf (" %s\n", "-u, --url=PATH");
+   printf ("    %s\n", _("URL to GET or POST (default: /)"));
+   printf (" %s\n", "-P, --post=STRING");
diff --git a/web/attachments/379681-check_sip.diff b/web/attachments/379681-check_sip.diff
new file mode 100644
index 0000000..f73f7a9
--- /dev/null
+++ b/web/attachments/379681-check_sip.diff
@@ -0,0 +1,4 @@
+28c28
+< use lib "/usr/lib/nagios/plugins";
+---
+> use lib "/usr/local/nagios/libexec";
diff --git a/web/attachments/382256-nagios-plugins-check_disk_usage.patch b/web/attachments/382256-nagios-plugins-check_disk_usage.patch
new file mode 100644
index 0000000..8beefc1
--- /dev/null
+++ b/web/attachments/382256-nagios-plugins-check_disk_usage.patch
@@ -0,0 +1,89 @@
+diff -urN nagios-plugins-1.4.15/plugins/check_disk.c nagios-plugins-1.4.15.new/plugins/check_disk.c
+--- nagios-plugins-1.4.15/plugins/check_disk.c  2010-07-27 22:47:16.000000000 +0200
++++ nagios-plugins-1.4.15.new/plugins/check_disk.c      2010-08-04 13:49:46.000000000 +0200
+@@ -148,6 +148,7 @@
+ int path_selected = FALSE;
+ char *group = NULL;
+ struct stat *stat_buf;
++int output_usage = FALSE;
+ 
+ 
+ int
+@@ -173,7 +174,6 @@
+   struct parameter_list *temp_list, *path;
+   struct name_list *seen = NULL;
+ 
+-  preamble = strdup (" - free space:");
+   output = strdup ("");
+   details = strdup ("");
+   perf = strdup ("");
+@@ -191,6 +191,12 @@
+   if (process_arguments (argc, argv) == ERROR)
+     usage4 (_("Could not parse arguments"));
+ 
++  if (output_usage) {
++    preamble = strdup (" - used space:");
++  } else {
++    preamble = strdup (" - free space:");
++  }
++
+   /* If a list of paths has not been selected, find entire
+      mount list and create list of paths
+    */
+@@ -392,9 +398,9 @@
+       asprintf (&output, "%s %s %.0f %s (%.0f%%",
+                 output,
+                 (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+-                dfree_units,
++                output_usage ? dused_units : dfree_units,
+                 units,
+-                dfree_pct);
++                output_usage ? 100-dfree_pct : dfree_pct);
+       if (dused_inodes_percent < 0) {
+         asprintf(&output, "%s inode=-);", output);
+       } else {
+@@ -495,6 +501,7 @@
+     {"verbose", no_argument, 0, 'v'},
+     {"quiet", no_argument, 0, 'q'},
+     {"clear", no_argument, 0, 'C'},
++    {"usage", no_argument, 0, 'U'},
+     {"version", no_argument, 0, 'V'},
+     {"help", no_argument, 0, 'h'},
+     {0, 0, 0, 0}
+@@ -510,7 +517,7 @@
+       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, "+?VqhveUCt:c:w:K:W:u:p:x:X:mklLg:R:r:i:I:MEA", longopts, &option);
+ 
+     if (c == -1 || c == EOF)
+       break;
+@@ -782,6 +789,9 @@
+       path_selected = FALSE;
+       group = NULL;
+       break;
++    case 'U': /* display used space */
++      output_usage = TRUE;
++      break;
+     case 'V':                 /* version */
+       print_revision (progname, NP_VERSION);
+       exit (STATE_OK);
+@@ -958,6 +968,8 @@
+   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", "-U, --usage");
++  printf ("    %s\n", _("Output used space not free space"));
+ 
+   printf ("\n");
+   printf ("%s\n", _("Examples:"));
+@@ -980,7 +992,7 @@
+   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] [-U]\n");
+ }
+ 
+ void
diff --git a/web/attachments/382258-nagios-plugins-check_disk_smb.patch b/web/attachments/382258-nagios-plugins-check_disk_smb.patch
new file mode 100644
index 0000000..31c6873
--- /dev/null
+++ b/web/attachments/382258-nagios-plugins-check_disk_smb.patch
@@ -0,0 +1,62 @@
+diff -urN nagios-plugins-1.4.15/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.15.new/plugins-scripts/check_disk_smb.pl
+--- nagios-plugins-1.4.15/plugins-scripts/check_disk_smb.pl     2010-07-27 22:47:16.000000000 +0200
++++ nagios-plugins-1.4.15.new/plugins-scripts/check_disk_smb.pl 2010-08-04 14:06:46.000000000 +0200
+@@ -208,7 +208,11 @@
+        my ($avail_bytes) = $avail;
+        my ($capper) = int(($3/$1)*100);
+        my ($mountpt) = "\\\\$host\\$share";
+-
++       my ($mountptprint) = "//$host/$share";
++       my $warn_bytes;
++       my $crit_bytes;
++       my ($tot_bytes) = ($1*$2)/1024;
++       my ($used_bytes) = (($1-$3)*$2)/1024;
+ 
+        if (int($avail / 1024) > 0) {
+                $avail = int($avail / 1024);
+@@ -221,19 +225,33 @@
+        } else {
+                $avail = $avail ."K";
+        }
++       
++       if ($warn_type eq "P") {
++               $warn_bytes=int($tot_bytes/100*$warn);
++       } else {
++               $warn_bytes=$warn;
++       }
++
++       if ($crit_type eq "P") {
++               $crit_bytes=int($tot_bytes/100*$crit);
++       } else {
++               $crit_bytes=$crit;
++       }
++
++       my ($perfdata) = "$mountptprint=$used_bytes;$warn_bytes;$crit_bytes;0;$tot_bytes";
+ 
+ #print ":$warn:$warn_type:\n";
+ #print ":$crit:$crit_type:\n";
+ #print ":$avail:$avail_bytes:$capper:$mountpt:\n";
+ 
+        if ((($warn_type eq "P") && (100 - $capper) < $warn) || (($warn_type eq "K") && ($avail_bytes > $warn))) { 
+-               $answer = "Disk ok - $avail ($capper%) free on $mountpt\n";
++               $answer = "Disk ok - $avail ($capper%) free on $mountptprint|$perfdata\n";
+        } elsif ((($crit_type eq "P") && (100 - $capper) < $crit) || (($crit_type eq "K") && ($avail_bytes > $crit))) {
+                $state = "WARNING";
+-               $answer = "WARNING: Only $avail ($capper%) free on $mountpt\n";
++               $answer = "WARNING: Only $avail ($capper%) free on $mountptprint|$perfdata\n";
+        } else {
+                $state = "CRITICAL";
+-               $answer = "CRITICAL: Only $avail ($capper%) free on $mountpt\n";
++               $answer = "CRITICAL: Only $avail ($capper%) free on $mountptprint|$perfdata\n";
+        }
+ } else {
+        $answer = "Result from smbclient not suitable\n";
+@@ -250,7 +268,7 @@
+                        last;
+                }
+                if (/(You specified an invalid share name|NT_STATUS_BAD_NETWORK_NAME)/) {
+-                       $answer = "Invalid share name \\\\$host\\$share\n";
++                       $answer = "Invalid share name //$host//$share\n";
+                        $state = "CRITICAL";
+                        last;
+                }
diff --git a/web/attachments/38607-patch-nagiosplug_plugins_check_nagios.c b/web/attachments/38607-patch-nagiosplug_plugins_check_nagios.c
new file mode 100644
index 0000000..17f672d
--- /dev/null
+++ b/web/attachments/38607-patch-nagiosplug_plugins_check_nagios.c
@@ -0,0 +1,26 @@
+Index: nagiosplug/plugins/check_nagios.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
+retrieving revision 1.2
+diff -u -r1.2 check_nagios.c
+--- nagiosplug/plugins/check_nagios.c   19 Jun 2002 05:11:52 -0000      1.2
++++ nagiosplug/plugins/check_nagios.c   1 Jan 2003 22:18:50 -0000
+@@ -93,9 +93,9 @@
+                printf ("Could not open stderr for %s\n", PS_RAW_COMMAND);
+        }
+ 
+-       /* cound the number of matching Nagios processes... */
++       /* count the number of matching Nagios processes... */
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               if (strstr (input_buffer, process_string))
++               if ((!strstr (input_buffer, argv[0])) && (strstr (input_buffer, process_string)))
+                        proc_entries++;
+        }
+ 
+@@ -263,5 +263,5 @@
+                 "-V, --version\n"
+                 "   Print version information\n\n"
+                 "Example:\n"
+-                "   ./check_nagios -H /usr/local/nagios/var/status.log -e 5 -C /usr/local/nagios/bin/nagios\n");
++                "   ./check_nagios -F /usr/local/nagios/var/status.log -e 5 -C /usr/local/nagios/bin/nagios\n");
+ }
diff --git a/web/attachments/38638-patch-nagiosplug-tcp_refusal b/web/attachments/38638-patch-nagiosplug-tcp_refusal
new file mode 100644
index 0000000..a7629f2
--- /dev/null
+++ b/web/attachments/38638-patch-nagiosplug-tcp_refusal
@@ -0,0 +1,142 @@
+Index: nagiosplug/plugins/check_tcp.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
+retrieving revision 1.10
+diff -u -r1.10 check_tcp.c
+--- nagiosplug/plugins/check_tcp.c      19 Dec 2002 19:30:52 -0000      1.10
++++ nagiosplug/plugins/check_tcp.c      30 Dec 2002 23:07:44 -0000
+@@ -307,9 +307,11 @@
+        alarm (0);
+ 
+        printf
+-               ("%s %s - %7.3f second response time on port %d",
++               ("%s %s%s - %7.3f second response time on port %d",
+                 SERVICE,
+-                state_text (result), elapsed_time, server_port);
++                state_text (result),
++                (was_refused)?" (refused)":"",
++                elapsed_time, server_port);
+ 
+        if (status && strlen(status) > 0)
+                printf (" [%s]", status);
+@@ -346,6 +348,7 @@
+                {"expect", required_argument, 0, 'e'},
+                {"quit", required_argument, 0, 'q'},
+                {"delay", required_argument, 0, 'd'},
++               {"refuse", required_argument, 0, 'r'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+@@ -376,10 +379,10 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "+hVvH:s:e:q:c:w:t:p:C:W:d:S", long_options,
++                       getopt_long (argc, argv, "+hVvH:s:e:q:c:w:t:p:C:W:d:Sr:", long_options,
+                                                                         &option_index);
+ #else
+-               c = getopt (argc, argv, "+hVvH:s:e:q:c:w:t:p:C:W:d:S");
++               c = getopt (argc, argv, "+hVvH:s:e:q:c:w:t:p:C:W:d:Sr:");
+ #endif
+ 
+                if (c == -1 || c == EOF || c == 1)
+@@ -448,6 +451,16 @@
+                case 'q':
+                        server_quit = optarg;
+                        break;
++               case 'r':
++                       if (!strncmp(optarg,"ok",2))
++                               econn_refuse_state = STATE_OK;
++                       else if (!strncmp(optarg,"warn",4))
++                               econn_refuse_state = STATE_WARNING;
++                       else if (!strncmp(optarg,"crit",4))
++                               econn_refuse_state = STATE_CRITICAL;
++                       else
++                               usage ("Refuse mut be one of ok, warn, crit\n");
++                       break;
+                case 'd':
+                        if (is_intpos (optarg))
+                                delay = atoi (optarg);
+@@ -479,7 +492,8 @@
+ {
+        printf
+                ("Usage: %s -H host -p port [-w warn_time] [-c crit_time] [-s send]\n"
+-                "         [-e expect] [-W wait] [-t to_sec] [-v]\n", PROGNAME);
++                "         [-e expect] [-W wait] [-t to_sec] [-R refuse_state] [-v]\n",
++                PROGNAME);
+ }
+ 
+ 
+@@ -514,6 +528,8 @@
+                 "    Response time to result in critical status (seconds)\n"
+                 " -t, --timeout=INTEGER\n"
+                 "    Seconds before connection times out (default: %d)\n"
++                " -r, --refuse=ok|warn|crit\n"
++                "    Accept tcp refusals with states ok,warn, crit (default: crit)\n"
+                 " -v"
+                 "    Show details for command-line debugging (do not use with nagios server)\n"
+                 " -h, --help\n"
+@@ -549,7 +565,7 @@
+   time (&start_time);
+ 
+   /* Make TCP connection */
+-  if (my_tcp_connect (server_address, server_port, &sd) == STATE_OK)
++  if (my_tcp_connect (server_address, server_port, &sd) == STATE_OK && was_refused == FALSE)
+     {
+     /* Do the SSL handshake */
+       if ((ssl = SSL_new (ctx)) != NULL)
+Index: nagiosplug/plugins/netutils.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.c
+--- nagiosplug/plugins/netutils.c       28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ nagiosplug/plugins/netutils.c       30 Dec 2002 23:07:44 -0000
+@@ -39,6 +39,9 @@
+ extern int socket_timeout;
+ RETSIGTYPE socket_timeout_alarm_handler (int);
+ 
++extern int econn_refuse_state;
++extern int was_refused;
++
+ int process_tcp_request2 (char *, int, char *, char *, int);
+ int process_tcp_request (char *, int, char *, char *, int);
+ int process_udp_request (char *, int, char *, char *, int);
+@@ -307,7 +310,14 @@
+        if (result < 0) {
+                switch (errno) {
+                case ECONNREFUSED:
+-                       printf ("Connection refused by host\n");
++                       switch (econn_refuse_state) {
++                       case STATE_OK:
++                       case STATE_WARNING:
++                               was_refused = TRUE;
++                               return econn_refuse_state;
++                       default:
++                               printf ("Connection refused by host\n");
++                       }
+                        break;
+                case ETIMEDOUT:
+                        printf ("Timeout while attempting connection\n");
+@@ -316,7 +326,7 @@
+                        printf ("Network is unreachable\n");
+                        break;
+                default:
+-                       printf ("Connection refused or timed out\n");
++                       printf ("Connection refused or timed out: %s\n",strerror (errno));
+                }
+ 
+                return STATE_CRITICAL;
+Index: nagiosplug/plugins/netutils.h.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h.in,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 netutils.h.in
+--- nagiosplug/plugins/netutils.h.in    28 Feb 2002 06:42:59 -0000      1.1.1.1
++++ nagiosplug/plugins/netutils.h.in    30 Dec 2002 23:07:44 -0000
+@@ -61,3 +61,5 @@
+ #include "common.h"
+ #endif
+ int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
++int econn_refuse_state = STATE_CRITICAL;
++int was_refused = FALSE;
diff --git a/web/attachments/388024-sslutils.patch b/web/attachments/388024-sslutils.patch
new file mode 100644
index 0000000..417c6be
--- /dev/null
+++ b/web/attachments/388024-sslutils.patch
@@ -0,0 +1,59 @@
+--- plugins/sslutils.c  2010-07-27 16:47:16.000000000 -0400
++++ sslutils.c  2010-09-27 10:16:20.000000000 -0400
+@@ -51,24 +51,40 @@
+                                printf ("%s\n", _("CRITICAL - Cannot create SSL context."));
+                                return STATE_CRITICAL;
+                }
+-               if ((s = SSL_new (c)) != NULL){
++               if ((s = SSL_new (c)) == NULL){
++                       printf ("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
++                   return STATE_CRITICAL;
++               }
+ #ifdef SSL_set_tlsext_host_name
+-                               if (host_name != NULL)
+-                                       SSL_set_tlsext_host_name(s, host_name);
++        if (host_name != NULL)
++                   SSL_set_tlsext_host_name(s, host_name);
+ #endif
+-                               SSL_set_fd (s, sd);
+-                               if (SSL_connect(s) == 1){
+-                                               return OK;
+-                               } else {
+-                                               printf ("%s\n", _("CRITICAL - Cannot make SSL connection "));
+-#  ifdef USE_OPENSSL /* XXX look into ERR_error_string */
+-                                               ERR_print_errors_fp (stdout);
+-#  endif /* USE_OPENSSL */
+-                               }
+-               } else {
+-                               printf ("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
+-               }
+-               return STATE_CRITICAL;
++        SSL_set_fd (s, sd);
++               if (SSL_connect(s) == 1)
++                   return OK;
++
++    // Try TLS
++    // Free old pointers
++    SSL_CTX_free(c);
++    SSL_free(s);
++
++    if ((c = SSL_CTX_new(TLSv1_client_method())) == NULL) {
++        printf("%s\n", _("CRITICAL - Cannot create SSL context."));
++        return STATE_CRITICAL;
++    }
++    if ((s = SSL_new(c)) == NULL) {
++        printf("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
++        return STATE_CRITICAL;
++    }
++#ifdef SSL_set_tlsext_host_name
++    if (host_name != NULL)
++        SSL_set_tlsext_host_name(s, host_name);
++#endif
++    SSL_set_fd(s, sd);
++    if (SSL_connect(s) == 1){
++        return OK;
++    }
++    return STATE_CRITICAL;                                 
+ }
+ 
+ void np_net_ssl_cleanup (){
diff --git a/web/attachments/38944-check_ldap.c.patch b/web/attachments/38944-check_ldap.c.patch
new file mode 100644
index 0000000..50c5f86
--- /dev/null
+++ b/web/attachments/38944-check_ldap.c.patch
@@ -0,0 +1,67 @@
+--- check_ldap.c        Thu Nov 14 17:04:51 2002
++++ check_ldap.c.new    Mon Jan  6 02:15:41 2003
+@@ -32,6 +32,7 @@
+ #include <ldap.h>
+ 
+ #define UNKNOWN -1
++#define E_MOREARGS 3
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -53,10 +54,11 @@
+ 
+        int t_diff;
+        time_t time0, time1;
+-
+-       if (process_arguments (argc, argv) == ERROR)
++       int state = process_arguments (argc, argv);
++       if (state == ERROR)
+                usage ("check_ldap: could not parse arguments\n");
+-
++       if (state == E_MOREARGS)
++               usage ("check_ldap: four arguments are required\n");
+        /* initialize alarm signal handling */
+        signal (SIGALRM, socket_timeout_alarm_handler);
+ 
+@@ -143,7 +145,7 @@
+ #endif
+ 
+        if (argc < 2)
+-               return ERROR;
++               return E_MOREARGS;
+ 
+        for (c = 1; c < argc; c++) {
+                if (strcmp ("-to", argv[c]) == 0)
+@@ -212,10 +214,10 @@
+ int
+ validate_arguments ()
+ {
+-       if (ld_host[0] == 0 ||
+-                       ld_base[0] == 0 ||
++       if (ld_host == 0 ||
++                       ld_base == 0 ||
+                        ld_port == UNKNOWN || warn_time == UNKNOWN || crit_time == UNKNOWN) {
+-               return ERROR;
++               return E_MOREARGS;
+        }
+        else {
+                return OK;
+@@ -241,7 +243,7 @@
+                 "\t-b [--base] ... ldap base (eg. ou=my unit, o=my org, c=at)\n"
+                 "\t-D [--bind] ... ldap bind DN (if required)\n"
+                 "\t-P [--pass] ... ldap password (if required)\n"
+-                "\t-p [--port] ... ldap port (normaly 389)\n"
++                "\t-p [--port] ... ldap port (defaults to 389)\n"
+                 "\t-w [--warn] ... time in secs. - if the exceeds <warn> the STATE_WARNING will be returned\n"
+                 "\t-c [--crit] ... time in secs. - if the exceeds <crit> the STATE_CRITICAL will be returned\n"
+                 "\n");
+@@ -252,7 +254,7 @@
+ print_usage ()
+ {
+        printf
+-               ("Usage: %s -H <host> -b <base_dn> -p <port> [-a <attr>] [-D <binddn>]\n"
+-                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
++       ("Usage: %s -H <host> -b <base_dn>  -w <warn_time> -c <crit_time>\n" 
++        "[-p <port>] [-a <attr>] [-D <binddn>] [-P <password>] [-t time out]\n"
+                 "(Note: all times are in seconds.)\n", PROGNAME);
+ }
diff --git a/web/attachments/390908-critical.txt b/web/attachments/390908-critical.txt
new file mode 100644
index 0000000..db717d6
--- /dev/null
+++ b/web/attachments/390908-critical.txt
@@ -0,0 +1,62 @@
+DHCP socket: 4
+Hardware address: 00:0f:fe:26:df:10
+DHCPDISCOVER to 255.255.255.255 port 67
+DHCPDISCOVER XID: 444910351 (0x1A84CB0F)
+DHCDISCOVER ciaddr:  0.0.0.0
+DHCDISCOVER yiaddr:  0.0.0.0
+DHCDISCOVER siaddr:  0.0.0.0
+DHCDISCOVER giaddr:  0.0.0.0
+send_dhcp_packet result: 548
+
+
+
+
+recv_result_1: 300
+recv_result_2: 300
+receive_dhcp_packet() result: 300
+receive_dhcp_packet() source: 10.1.164.180
+Result=OK
+DHCPOFFER from IP address 10.1.164.1 via 10.1.164.180
+DHCPOFFER XID: 444910351 (0x1A84CB0F)
+DHCPOFFER chaddr: 000FFE26DF10
+DHCPOFFER ciaddr: 0.0.0.0
+DHCPOFFER yiaddr: 10.1.164.8
+DHCPOFFER siaddr: 10.1.164.1
+DHCPOFFER giaddr: 0.0.0.0
+Option: 53 (0x01)
+Option: 1 (0x04)
+Option: 58 (0x04)
+Option: 59 (0x04)
+Lease Time: 0 seconds
+Renewal Time: 1800 seconds
+Rebinding Time: 3150 seconds
+Added offer from server @ 10.1.164.1 of IP address 10.1.164.8
+
+
+recv_result_1: 300
+recv_result_2: 300
+receive_dhcp_packet() result: 300
+receive_dhcp_packet() source: 10.1.164.254
+Result=OK
+DHCPOFFER from IP address 10.1.164.1 via 10.1.164.254
+DHCPOFFER XID: 444910351 (0x1A84CB0F)
+DHCPOFFER chaddr: 000FFE26DF10
+DHCPOFFER ciaddr: 0.0.0.0
+DHCPOFFER yiaddr: 10.1.164.8
+DHCPOFFER siaddr: 10.1.164.1
+DHCPOFFER giaddr: 10.1.164.254
+Option: 53 (0x01)
+Option: 1 (0x04)
+Option: 58 (0x04)
+Option: 59 (0x04)
+Lease Time: 0 seconds
+Renewal Time: 1800 seconds
+Rebinding Time: 3150 seconds
+Added offer from server @ 10.1.164.1 of IP address 10.1.164.8
+
+
+No (more) data received (nfound: 0)
+Result=ERROR
+Total responses seen on the wire: 2
+Valid responses for this machine: 2
+CRITICAL: Received 2 DHCPOFFER(s), 0 of 1 requested servers responded, max lease time = 0 sec.
diff --git a/web/attachments/390909-ok.txt b/web/attachments/390909-ok.txt
new file mode 100644
index 0000000..5b97579
--- /dev/null
+++ b/web/attachments/390909-ok.txt
@@ -0,0 +1,64 @@
+DHCP socket: 4
+Hardware address: 00:0f:fe:26:df:10
+DHCPDISCOVER to 255.255.255.255 port 67
+DHCPDISCOVER XID: 641711297 (0x263FBCC1)
+DHCDISCOVER ciaddr:  0.0.0.0
+DHCDISCOVER yiaddr:  0.0.0.0
+DHCDISCOVER siaddr:  0.0.0.0
+DHCDISCOVER giaddr:  0.0.0.0
+send_dhcp_packet result: 548
+
+
+
+
+recv_result_1: 300
+recv_result_2: 300
+receive_dhcp_packet() result: 300
+receive_dhcp_packet() source: 10.1.164.180
+Result=OK
+DHCPOFFER from IP address 10.1.164.180 via 10.1.164.180
+DHCPOFFER XID: 641711297 (0x263FBCC1)
+DHCPOFFER chaddr: 000FFE26DF10
+DHCPOFFER ciaddr: 0.0.0.0
+DHCPOFFER yiaddr: 10.1.164.8
+DHCPOFFER siaddr: 10.1.164.180
+DHCPOFFER giaddr: 0.0.0.0
+Option: 53 (0x01)
+Option: 1 (0x04)
+Option: 58 (0x04)
+Option: 59 (0x04)
+Lease Time: 0 seconds
+Renewal Time: 1800 seconds
+Rebinding Time: 3150 seconds
+Added offer from server @ 10.1.164.180 of IP address 10.1.164.8
+
+
+recv_result_1: 300
+recv_result_2: 300
+receive_dhcp_packet() result: 300
+receive_dhcp_packet() source: 10.1.164.254
+Result=OK
+DHCPOFFER from IP address 10.1.164.180 via 10.1.164.254
+DHCPOFFER XID: 641711297 (0x263FBCC1)
+DHCPOFFER chaddr: 000FFE26DF10
+DHCPOFFER ciaddr: 0.0.0.0
+DHCPOFFER yiaddr: 10.1.164.8
+DHCPOFFER siaddr: 10.1.164.180
+DHCPOFFER giaddr: 10.1.164.254
+Option: 53 (0x01)
+Option: 1 (0x04)
+Option: 58 (0x04)
+Option: 59 (0x04)
+Lease Time: 0 seconds
+Renewal Time: 1800 seconds
+Rebinding Time: 3150 seconds
+Added offer from server @ 10.1.164.180 of IP address 10.1.164.8
+
+
+No (more) data received (nfound: 0)
+Result=ERROR
+Total responses seen on the wire: 2
+Valid responses for this machine: 2
+DHCP Server Match: Offerer=10.1.164.180 Requested=10.1.164.180
+DHCP Server Match: Offerer=10.1.164.180 Requested=10.1.164.180 (duplicate)
+OK: Received 2 DHCPOFFER(s), 1 of 1 requested servers responded, max lease time = 0 sec.
diff --git a/web/attachments/39204-contrib-brylon.tar.gz b/web/attachments/39204-contrib-brylon.tar.gz
new file mode 100644
index 0000000..622588e
--- /dev/null
+++ b/web/attachments/39204-contrib-brylon.tar.gz
diff --git a/web/attachments/392414-nagios-plugins-1.4.15-sslworkarounds.patch.txt b/web/attachments/392414-nagios-plugins-1.4.15-sslworkarounds.patch.txt
new file mode 100644
index 0000000..ffe72ca
--- /dev/null
+++ b/web/attachments/392414-nagios-plugins-1.4.15-sslworkarounds.patch.txt
@@ -0,0 +1,14 @@
+--- nagios-plugins-1.4.15-orig/plugins/sslutils.c       2010-07-27 16:47:16.000000000 -0400

++++ nagios-plugins-1.4.15/plugins/sslutils.c    2010-11-06 08:45:59.000000000 -0400

+@@ -51,6 +51,11 @@

+                                printf ("%s\n", _("CRITICAL - Cannot create SSL context."));

+                                return STATE_CRITICAL;

+                }

++#ifndef SSL_enforce_sanity

++               if (c) {

++                               SSL_CTX_set_options(c,SSL_OP_ALL);

++               }

++#endif

+                if ((s = SSL_new (c)) != NULL){

+ #ifdef SSL_set_tlsext_host_name

+                                if (host_name != NULL)

diff --git a/web/attachments/393797-mq-d b/web/attachments/393797-mq-d
new file mode 100644
index 0000000..2bc96c1
--- /dev/null
+++ b/web/attachments/393797-mq-d
@@ -0,0 +1,54 @@
+--- check_mailq.pl      2010-11-19 10:09:30.871245273 -0500
++++ /home/jwm/check_mailq       2010-11-19 10:13:33.060816778 -0500
+@@ -130,7 +130,26 @@
+ ##/var/spool/mqueue/qF/df is empty
+ ##                Total Requests: 1
+ 
+-       
++# separate submission/transport queues, empty
++## MSP Queue status...
++## /var/spool/mqueue-client is empty
++##                 Total requests: 0
++## MTA Queue status...
++## /var/spool/mqueue is empty
++##                 Total requests: 0
++# separate submission/transport queues: 1
++## MSP Queue status...
++##                 /var/spool/mqueue-client (1 request)
++## -----Q-ID----- --Size-- -----Q-Time----- ------------Sender/Recipient-----------
++## oAJEfhdW014123        5 Fri Nov 19 14:41 jwm
++##                  (Deferred: Connection refused by [127.0.0.1])
++##                                          root
++##                 Total requests: 1
++## MTA Queue status...
++## /var/spool/mqueue is empty
++##                 Total requests: 0
++
++       my $this_msg_q = 0;
+        while (<MAILQ>) {
+        
+                # match email addr on queue listing
+@@ -170,13 +189,18 @@
+                #
+                    # single queue: first line
+                    # multi queue: one for each queue. overwrite on multi queue below
+-                 $msg_q = $1 ;
++                 $this_msg_q = $1 ;
++                 $msg_q += $1 ;
+                        }
+                } elsif (/^\s+Total\sRequests:\s(\d+)$/i) {
+-                       print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
+-                       #
+-                       # multi queue: last line
+-                       $msg_q = $1 ;
++                       if ($this_msg_q) {
++                               $this_msg_q = 0 ;
++                       } else {
++                               print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
++                               #
++                               # multi queue: last line
++                               $msg_q += $1 ;
++                       }
+                }
+        
+        }
diff --git a/web/attachments/394815-woo b/web/attachments/394815-woo
new file mode 100644
index 0000000..352f7de
--- /dev/null
+++ b/web/attachments/394815-woo
@@ -0,0 +1,49 @@
+--- orig/plugins/check_hpjd.c   2010-07-27 21:47:16.000000000 +0100
++++ new/plugins/check_hpjd.c    2010-11-30 12:25:56.000000000 +0000
+@@ -41,7 +41,7 @@
+ #define DEFAULT_COMMUNITY "public"
+ 
+ 
+-const char *option_summary = "-H host [-C community]\n";
++const char *option_summary = "-H host [-C community] [-p port]\n";
+ 
+ #define HPJD_LINE_STATUS           ".1.3.6.1.4.1.11.2.3.9.1.1.2.1"
+ #define HPJD_PAPER_STATUS          ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
+@@ -66,6 +66,7 @@
+ 
+ char *community = NULL;
+ char *address = NULL;
++short port = 161;
+ 
+ int
+ main (int argc, char **argv)
+@@ -119,8 +120,8 @@
+                 HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
+ 
+        /* get the command to run */
+-       sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community,
+-                                                                       address, query_string);
++       sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%hd %s", PATH_TO_SNMPGET, community,
++                                                                       address, port, query_string);
+ 
+        /* run the command */
+        child_process = spopen (command_line);
+@@ -324,7 +325,7 @@
+ 
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVH:C:", longopts, &option);
++               c = getopt_long (argc, argv, "+hVH:C:p:", longopts, &option);
+ 
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+@@ -347,6 +348,9 @@
+                case 'h':                                                                       /* help */
+                        print_help ();
+                        exit (STATE_OK);
++               case 'p':                                                                       /* port */
++                       port = (short) atoi(optarg);
++                       break;
+                case '?':                                                                       /* help */
+                        usage5 ();
+                }
diff --git a/web/attachments/394886-time-rfc822.diff b/web/attachments/394886-time-rfc822.diff
new file mode 100644
index 0000000..e2e0d84
--- /dev/null
+++ b/web/attachments/394886-time-rfc822.diff
@@ -0,0 +1,25 @@
+--- nagios-plugins-1.4.15/plugins/sslutils.c    2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15.new/plugins/sslutils.c        2010-11-30 21:37:29.616606174 +0000
+@@ -102,7 +102,7 @@
+        struct tm stamp;
+        float time_left;
+        int days_left;
+-       char timestamp[17] = "";
++       char timestamp[128] = "";
+ 
+        certificate=SSL_get_peer_certificate(s);
+        if(! certificate){
+@@ -149,10 +149,9 @@
+ 
+        time_left = difftime(timegm(&stamp), time(NULL));
+        days_left = time_left / 86400;
+-       snprintf
+-               (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+-                stamp.tm_mon + 1,
+-                stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
++
++       stamp.tm_mon++;
++       strftime (timestamp, sizeof (timestamp), "%a, %d %b %Y %H:%M:%S %z", &stamp);
+ 
+        if (days_left > 0 && days_left <= days_till_exp) {
+                printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
diff --git a/web/attachments/39582-check_http_patch b/web/attachments/39582-check_http_patch
new file mode 100644
index 0000000..cb9f624
--- /dev/null
+++ b/web/attachments/39582-check_http_patch
@@ -0,0 +1,123 @@
+Index: plugins/check_http.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
+retrieving revision 1.13
+diff -c -r1.13 check_http.c
+*** plugins/check_http.c        19 Dec 2002 19:20:25 -0000      1.13
+--- plugins/check_http.c        13 Jan 2003 03:52:29 -0000
+***************
+*** 44,50 ****
+  \(-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
+              [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+              [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+!             [-s string] [-r <regex> | -R <case-insensitive regex>]\n\
+              [-P string]"
+  
+  #define LONGOPTIONS "\
+--- 44,50 ----
+  \(-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
+              [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+              [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+!             [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
+              [-P string]"
+  
+  #define LONGOPTIONS "\
+***************
+*** 75,80 ****
+--- 75,82 ----
+     Wrap output in HTML link (obsoleted by urlize)\n\
+   -f, --onredirect=<ok|warning|critical|follow>\n\
+     How to handle redirected pages\n%s\
++  -l, --linespan\n\
++     Allow regex to span newlines (must precede -r or -R)\n\
+   -v, --verbose\n\
+      Show details for command-line debugging (do not use with nagios server)\n\
+   -h, --help\n\
+***************
+*** 286,291 ****
+--- 288,294 ----
+                {"regex", required_argument, 0, 'r'},
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
++               {"linespan", no_argument, 0, 'l'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
+                {0, 0, 0, 0}
+***************
+*** 308,314 ****
+                        strcpy (argv[c], "-n");
+        }
+  
+! #define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nLS"
+  
+        while (1) {
+  #ifdef HAVE_GETOPT_H
+--- 311,317 ----
+                        strcpy (argv[c], "-n");
+        }
+  
+! #define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:lu:f:C:nLS"
+  
+        while (1) {
+  #ifdef HAVE_GETOPT_H
+***************
+*** 420,434 ****
+                        server_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        server_expect_yn = 1;
+                        break;
+                case 'R': /* regex */
+! #ifdef HAVE_REGEX_H
+!                       cflags = REG_ICASE;
+! #else
+                        usage ("check_http: call for regex which was not a compiled option\n");
+! #endif
+                case 'r': /* regex */
+! #ifdef HAVE_REGEX_H
+                        cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+                        strncpy (regexp, optarg, MAX_RE_SIZE - 1);
+                        regexp[MAX_RE_SIZE - 1] = 0;
+                        errcode = regcomp (&preg, regexp, cflags);
+--- 423,444 ----
+                        server_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        server_expect_yn = 1;
+                        break;
++ #ifndef HAVE_REGEX_H
++               case 'l': /* linespan */
+                case 'R': /* regex */
+!               case 'r': /* regex */
+                        usage ("check_http: call for regex which was not a compiled option\n");
+!                       break;
+! #else
+!               case 'l': /* linespan */
+!                       cflags &= ~REG_NEWLINE;
+!                       break;
+!               case 'R': /* regex */
+!                       cflags |= REG_ICASE;
+                case 'r': /* regex */
+!                       /* this is not required here, as it's initialized
+                        cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
++                       */
+                        strncpy (regexp, optarg, MAX_RE_SIZE - 1);
+                        regexp[MAX_RE_SIZE - 1] = 0;
+                        errcode = regcomp (&preg, regexp, cflags);
+***************
+*** 437,446 ****
+                                printf ("Could Not Compile Regular Expression: %s", errbuf);
+                                return ERROR;
+                        }
+- #else
+-                       usage ("check_http: call for regex which was not a compiled option\n");
+- #endif
+                        break;
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
+--- 447,454 ----
+                                printf ("Could Not Compile Regular Expression: %s", errbuf);
+                                return ERROR;
+                        }
+                        break;
++ #endif
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
diff --git a/web/attachments/396435-nagios-plugins-1.4.15-ssl-date-clarification.patch b/web/attachments/396435-nagios-plugins-1.4.15-ssl-date-clarification.patch
new file mode 100644
index 0000000..61cd623
--- /dev/null
+++ b/web/attachments/396435-nagios-plugins-1.4.15-ssl-date-clarification.patch
@@ -0,0 +1,11 @@
+--- nagios-plugins-1.4.15.orig/plugins/sslutils.c       2010-12-19 00:24:23.000000000 +0100
++++ nagios-plugins-1.4.15/plugins/sslutils.c    2010-12-19 00:34:57.000000000 +0100
+@@ -165,7 +165,7 @@
+                return STATE_WARNING;
+        }
+ 
+-       printf (_("OK - Certificate will expire on %s.\n"), timestamp);
++       printf (_("OK - Certificate will expire on %s (MM/DD/YYYY HH:MM).\n"), timestamp);
+        X509_free (certificate);
+        return STATE_OK;
+ #  else /* ifndef USE_OPENSSL */
diff --git a/web/attachments/396772-sslutils_proper_date.patch b/web/attachments/396772-sslutils_proper_date.patch
new file mode 100644
index 0000000..6e0ebe0
--- /dev/null
+++ b/web/attachments/396772-sslutils_proper_date.patch
@@ -0,0 +1,27 @@
+--- sslutils.c  2010-12-23 09:23:37.000000000 +1100
++++ sslutils.c.orig     2009-05-22 07:11:51.000000000 +1000
+@@ -102,8 +102,7 @@
+        struct tm stamp;
+        float time_left;
+        int days_left;
+-//     char timestamp[17] = "";
+-       char *timestamp;
++       char timestamp[17] = "";
+ 
+        certificate=SSL_get_peer_certificate(s);
+        if(! certificate){
+@@ -150,13 +149,10 @@
+ 
+        time_left = difftime(timegm(&stamp), time(NULL));
+        days_left = time_left / 86400;
+-/*
+        snprintf
+                (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+                 stamp.tm_mon + 1,
+                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+-*/
+-       timestamp = asctime(&stamp);
+ 
+        if (days_left > 0 && days_left <= days_till_exp) {
+                printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
+
diff --git a/web/attachments/39883-check_oracle.patch b/web/attachments/39883-check_oracle.patch
new file mode 100644
index 0000000..1978e30
--- /dev/null
+++ b/web/attachments/39883-check_oracle.patch
@@ -0,0 +1,95 @@
+*** check_oracle.original       Mon Dec  9 15:57:44 2002
+--- check_oracle        Mon Dec  9 16:24:28 2002
+***************
+*** 36,41 ****
+--- 36,42 ----
+    echo "Usage:"
+    echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+    echo "  $PROGNAME --db <ORACLE_SID>"
++   echo "  $PROGNAME --login <ORACLE_SID>"
+    echo "  $PROGNAME --oranames <Hostname>"
+    echo "  $PROGNAME --help"
+    echo "  $PROGNAME --version"
+***************
+*** 53,58 ****
+--- 54,61 ----
+    echo "--db=SID"
+    echo "   Check local database (search /bin/ps for PMON process and check"
+        echo "   filesystem for sgadefORACLE_SID.dbf"
++   echo "--login=SID"
++   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+    echo "--oranames=Hostname"
+    echo "   Check remote Oracle Names server"
+    echo "--help"
+***************
+*** 81,86 ****
+--- 84,109 ----
+      ;;
+  esac
+  
++ # Information options
++ case "$cmd" in
++ --help)
++               print_help
++     exit $STATE_OK
++     ;;
++ -h)
++               print_help
++     exit $STATE_OK
++     ;;
++ --version)
++               print_revision $PLUGIN $REVISION
++     exit $STATE_OK
++     ;;
++ -V)
++               print_revision $PLUGIN $REVISION
++     exit $STATE_OK
++     ;;
++ esac
++ 
+  # Hunt down a reasonable ORACLE_HOME
+  if [ -z "$ORACLE_HOME" ] ; then
+        # Adjust to taste
+***************
+*** 156,177 ****
+        exit $STATE_CRITICAL
+      fi
+      ;;
+! --help)
+!               print_help
+!     exit $STATE_OK
+      ;;
+- -h)
+-               print_help
+-     exit $STATE_OK
+-     ;;
+- --version)
+-               print_revision $PLUGIN $REVISION
+-     exit $STATE_OK
+-     ;;
+- -V)
+-               print_revision $PLUGIN $REVISION
+-     exit $STATE_OK
+-     ;;
+  *)
+      print_usage
+                exit $STATE_UNKNOWN
+--- 179,196 ----
+        exit $STATE_CRITICAL
+      fi
+      ;;
+! --login)
+!     loginchk=`sqlplus dummy/user@$2 < /dev/null`
+!     loginchk2=` echo  $loginchk | grep -c ORA-01017`
+!     if [ ${loginchk2} -eq 1 ] ; then 
+!       echo "OK - dummy login connected"
+!       exit $STATE_OK
+!     else
+!       loginchk3=` echo "$loginchk" | grep "ORA-" | head -1`
+!       echo "CRITICAL - $loginchk3"
+!       exit $STATE_CRITICAL
+!     fi
+      ;;
+  *)
+      print_usage
+                exit $STATE_UNKNOWN
diff --git a/web/attachments/39884-check_oracle.patch b/web/attachments/39884-check_oracle.patch
new file mode 100644
index 0000000..b52a536
--- /dev/null
+++ b/web/attachments/39884-check_oracle.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-6 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378818336" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378818336" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378818336" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378818336" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378818336');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=650970&group_id=29880&atid=397599&file_id=39884"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/39885-plugins-Makefile.am.patch b/web/attachments/39885-plugins-Makefile.am.patch
new file mode 100644
index 0000000..2ec6522
--- /dev/null
+++ b/web/attachments/39885-plugins-Makefile.am.patch
@@ -0,0 +1,51 @@
+*** Makefile.am.original        Fri Jan 17 14:43:26 2003
+--- Makefile.am Fri Jan 17 15:19:59 2003
+***************
+*** 12,18 ****
+  
+  EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
+        check_swap check_fping check_ldap check_game check_dig \
+!       check_nagios check_by_ssh check_dns
+  
+  check_tcp_programs = check_ftp check_imap check_nntp check_pop
+  
+--- 12,18 ----
+  
+  EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
+        check_swap check_fping check_ldap check_game check_dig \
+!       check_nagios check_by_ssh check_dns check_nt
+  
+  check_tcp_programs = check_ftp check_imap check_nntp check_pop
+  
+***************
+*** 19,24 ****
+--- 19,27 ----
+  EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c \
+        snprintf.c getloadavg.c
+  
++ # Find check_nt.c at http://nsclient.ready2run.nl/
++ nodist_check_nt_SOURCES = check_nt.c
++ 
+  PLUGINHDRS = common.h config.h
+  
+  BASEOBJS = utils.o
+***************
+*** 51,56 ****
+--- 54,60 ----
+  check_mrtgtraf_LDADD = $(BASEOBJS)
+  check_mysql_LDADD = $(BASEOBJS) $(MYSQLLIBS)
+  check_nagios_LDADD = $(BASEOBJS) popen.o
++ check_nt_LDADD = $(NETLIBS)
+  check_nwstat_LDADD = $(NETLIBS)
+  check_overcr_LDADD = $(NETLIBS)
+  check_pgsql_LDADD = $(BASEOBJS) $(PGLIBS)
+***************
+*** 86,91 ****
+--- 90,96 ----
+  check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c  $(DEPLIBS)
+  check_mysql_DEPENDENCIES = check_mysql.c  $(DEPLIBS)
+  check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
++ check_nt_DEPENDENCIES = check_nt.c $(BASEOBJS) $(DEPLIBS)
+  check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
+  check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
+  check_pgsql_DEPENDENCIES = check_pgsql.c  $(DEPLIBS)
diff --git a/web/attachments/39886-plugins-Makefile.am.patch b/web/attachments/39886-plugins-Makefile.am.patch
new file mode 100644
index 0000000..c5bceba
--- /dev/null
+++ b/web/attachments/39886-plugins-Makefile.am.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378818378" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378818378" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378818378" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378818378" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378818378');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=651369&group_id=29880&atid=397599&file_id=39886"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/399439-0001-Fix-bug-ID-2946553-Match-the-server-used-in-the-l.patch b/web/attachments/399439-0001-Fix-bug-ID-2946553-Match-the-server-used-in-the-l.patch
new file mode 100644
index 0000000..cf33a5a
--- /dev/null
+++ b/web/attachments/399439-0001-Fix-bug-ID-2946553-Match-the-server-used-in-the-l.patch
@@ -0,0 +1,45 @@
+From ab90d186ad54de0fe73304bae5771f10a167fd3f Mon Sep 17 00:00:00 2001
+From: Matthew Kent <matt@bravenet.com>
+Date: Fri, 21 Jan 2011 11:54:30 -0800
+Subject: [PATCH] Fix bug ID: 2946553 - Match the server used in the lookup for older versions of bind.
+
+---
+ plugins/check_dns.c |   22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/check_dns.c b/plugins/check_dns.c
+index 73b560c..04b8baf 100644
+--- a/plugins/check_dns.c
++++ b/plugins/check_dns.c
+@@ -136,6 +136,28 @@ main (int argc, char **argv)
+       }
+     }
+ 
++    /* bug ID: 2946553 - Older versions of bind will use all available dns 
++                         servers, we have to match the one specified */
++    if (strstr (chld_out.line[i], "Server:") && strlen(dns_server) > 0) {
++      temp_buffer = index (chld_out.line[i], ':');
++      temp_buffer++;
++
++      /* Strip leading tabs */
++      for (; *temp_buffer != '\0' && *temp_buffer == '\t'; temp_buffer++)
++        /* NOOP */;
++
++      strip(temp_buffer);
++      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
++        die (STATE_CRITICAL,
++             _("DNS CRITICAL - '%s' returned empty server string\n"),
++             NSLOOKUP_COMMAND);
++      }
++
++      if (strcmp(temp_buffer, dns_server) != 0) {
++        die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
++      }
++    }
++
+     /* the server is responding, we just got the host name... */
+     if (strstr (chld_out.line[i], "Name:"))
+       parse_address = TRUE;
+-- 
+1.5.5.6
+
diff --git a/web/attachments/399715-check_disk.patch b/web/attachments/399715-check_disk.patch
new file mode 100644
index 0000000..7f8a4f3
--- /dev/null
+++ b/web/attachments/399715-check_disk.patch
@@ -0,0 +1,31 @@
+161a162
+>   char *flag_header;
+222d222
+< 
+357d356
+< 
+391,393c390,397
+< 
+<       asprintf (&output, "%s %s %.0f %s (%.0f%%",
+<                 output,
+---
+>       
+>       if(disk_result && verbose >= 1) {
+>          asprintf(&flag_header, " %s [", state_text (disk_result));
+>       } else {
+>          asprintf(&flag_header, "");
+>       }
+>       asprintf (&output, "%s%s %s %.0f %s (%.0f%%",
+>                 output, flag_header,
+399c403
+<         asprintf(&output, "%s inode=-);", output);
+---
+>         asprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : ""));
+401c405
+<         asprintf(&output, "%s inode=%.0f%%);", output, dfree_inodes_percent );
+---
+>         asprintf(&output, "%s inode=%.0f%%)%s;", output, dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : ""));
+403c407
+< 
+---
+>       free(flag_header);
diff --git a/web/attachments/401743-check_smtp.patch b/web/attachments/401743-check_smtp.patch
new file mode 100644
index 0000000..bf9811e
--- /dev/null
+++ b/web/attachments/401743-check_smtp.patch
@@ -0,0 +1,31 @@
+diff -ru nagios-plugins-1.4.15/plugins/check_smtp.c mine/plugins/check_smtp.c
+--- nagios-plugins-1.4.15/plugins/check_smtp.c  2010-07-27 21:47:16.000000000 +0100
++++ mine/plugins/check_smtp.c   2011-02-03 16:17:29.000000000 +0000
+@@ -190,14 +190,19 @@
+                                printf ("%s", buffer);
+                        /* strip the buffer of carriage returns */
+                        strip (buffer);
+-                       /* make sure we find the response we are looking for */
+-                       if (!strstr (buffer, server_expect)) {
+-                               if (server_port == SMTP_PORT)
+-                                       printf (_("Invalid SMTP response received from host: %s\n"), buffer);
+-                               else
+-                                       printf (_("Invalid SMTP response received from host on port %d: %s\n"),
+-                                                                       server_port, buffer);
+-                               result = STATE_WARNING;
++                       /* make sure we got a valid connect response */
++                       if (!strstr (buffer, "220")) {
++                               /* make sure we find the response we are looking for */
++                               if (!strstr (buffer, server_expect)) {
++                                       if (server_port == SMTP_PORT)
++                                               printf (_("Invalid SMTP response received from host: %s\n"), buffer);
++                                       else
++                                               printf (_("Invalid SMTP response received from host on port %d: %s\n"),
++                                                                               server_port, buffer);
++                                       result = STATE_WARNING;
++                               }
++                               /* Failed to connect, so bail */
++                               return result;
+                        }
+                }
+ 
diff --git a/web/attachments/40409-utils.pm.in.diff b/web/attachments/40409-utils.pm.in.diff
new file mode 100644
index 0000000..cb2ea12
--- /dev/null
+++ b/web/attachments/40409-utils.pm.in.diff
@@ -0,0 +1,86 @@
+*** utils.pm.in.orig    Wed Jan 22 15:39:22 2003
+--- utils.pm.in Wed Jan 22 16:39:06 2003
+***************
+*** 19,25 ****
+  
+  require Exporter;
+  @ISA = qw(Exporter);
+! @EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage);
+  
+  #use strict;
+  #use vars($TIMEOUT %ERRORS);
+--- 19,25 ----
+  
+  require Exporter;
+  @ISA = qw(Exporter);
+! @EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage &config_value &config_values);
+  
+  #use strict;
+  #use vars($TIMEOUT %ERRORS);
+***************
+*** 27,34 ****
+--- 27,38 ----
+  sub usage;
+  sub support();
+  sub is_hostname;
++ sub config_value ($);
++ sub config_values ($);
+  
+  ## updated by autoconf
++ $prefix = "@prefix@";
++ $sysconfdir  = "@sysconfdir@";
+  $PATH_TO_RPCINFO = "@PATH_TO_RPCINFO@" ;
+  $PATH_TO_NTPDATE = "@PATH_TO_NTPDATE@" ;
+  $PATH_TO_NTPDC   = "@PATH_TO_NTPDC@" ;
+***************
+*** 72,75 ****
+--- 76,124 ----
+        }
+  }
+  
++ ## subroutines to read nagios.cfg and return values of config items.
++ $parsedConfig = 0;
++ %configItems = {};
++ 
++ sub read_config {
++       my $configFile = "$sysconfdir/nagios.cfg";
++ 
++       return 1 if $parsedConfig;
++ 
++       if (! open CONFIG, "<$configFile") {
++               print "$configFile: $!\n";
++               return 0;
++       }
++ 
++       while (<CONFIG>) {
++               next unless /^\s*([^=\s]+)=(.*)$/;
++ 
++               if (defined(@{$configItems{$1}})) {
++                       $configItems{$1} = [@{$configItems{$1}}, $2];
++               } else {
++                       $configItems{$1} = [$2];
++               }
++       }
++       close CONFIG;
++ 
++       $parsedConfig = 1;
++       return 1;
++ }
++ 
++ ## Returns the value/values of a config item. If called in array context,
++ ## a list of values is returned, otherwise the first value of the item
++ ## is returned.  (Most Nagios config items have only one value, but some
++ ## such as cfg_file can be specified more than once.)
++ ##
++ ## ex: @cfg_files = &config_value('cfg_file');
++ ## ex: $resource_file = &config_value('resource_file');
++ sub config_value ($) {
++       my $key = shift;
++       return undef unless &read_config;
++       if (wantarray) {
++               return @{$configItems{$key}};
++       }
++       return $configItems{$key}->[0];
++ }
++ 
+  1;
diff --git a/web/attachments/40514-check_file_age b/web/attachments/40514-check_file_age
new file mode 100644
index 0000000..498c650
--- /dev/null
+++ b/web/attachments/40514-check_file_age
@@ -0,0 +1,112 @@
+#!/bin/perl -w
+# $Id$
+
+# check_file.pl Copyright (C) 2003 Steven Grimm <koreth-nagios@midwinter.com>
+#
+# Checks a file's size and modification time to make sure it's not empty
+# and that it's sufficiently recent.
+#
+#
+# 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 2
+# 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 (or with Nagios);  if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA
+
+use strict;
+use English;
+use Getopt::Long;
+use File::stat;
+use vars qw($PROGNAME);
+use utils qw (%ERRORS &print_revision &support);
+
+sub print_help ();
+sub print_usage ();
+
+my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
+my ($result, $message, $age, $size, $st);
+
+$PROGNAME="check_file";
+
+$opt_w = 240;
+$opt_c = 600;
+$opt_W = 0;
+$opt_C = 0;
+$opt_f = "";
+
+Getopt::Long::Configure('bundling');
+GetOptions(
+        "V"   => \$opt_V, "version"     => \$opt_V,
+        "h"   => \$opt_h, "help"        => \$opt_h,
+        "f=s" => \$opt_f, "file"        => \$opt_f,
+        "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
+        "W=f" => \$opt_W, "warning-size=f" => \$opt_W,
+        "c=f" => \$opt_c, "critical-age=f" => \$opt_c,
+        "C=f" => \$opt_C, "critical-size=f" => \$opt_C);
+
+if ($opt_V) {
+        print_revision($PROGNAME, '$Id$');
+        exit $ERRORS{'OK'};
+}
+
+if ($opt_h) {
+        print_help();
+        exit $ERRORS{'OK'};
+}
+
+$opt_f = shift unless ($opt_f);
+
+if (! $opt_f) {
+        print "No file specified\n";
+        exit $ERRORS{'UNKNOWN'};
+}
+
+# Examine the file.
+unless (-f $opt_f) {
+        print "$opt_f: File not found\n";
+        exit $ERRORS{'UNKNOWN'};
+}
+
+$st = File::stat::stat($opt_f);
+$age = time - $st->mtime;
+$size = $st->size;
+
+
+$result = 'OK';
+
+if (($opt_c and $age > $opt_c) or ($opt_C and $size < $opt_C)) {
+        $result = 'CRITICAL';
+}
+elsif (($opt_w and $age > $opt_w) or ($opt_W and $size < $opt_W)) {
+        $result = 'WARNING';
+}
+
+print "$result - $opt_f is $age seconds old and $size bytes\n";
+exit $ERRORS{$result};
+
+sub print_usage () {
+        print "Usage:\n";
+        print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] -f <file>\n";
+        print "  $PROGNAME [-h | --help]\n";
+        print "  $PROGNAME [-V | --version]\n";
+}
+
+sub print_help () {
+        print_revision($PROGNAME, '$Id$');
+        print "Copyright (c) 2003 Steven Grimm\n\n";
+        print_usage();
+        print "\n";
+        print "  <secs>  File must be no more than this many seconds old\n";
+        print "  <size>  File must be at least this many bytes long\n";
+        print "\n";
+        support();
+}
diff --git a/web/attachments/40524-check_by_ssh.diff b/web/attachments/40524-check_by_ssh.diff
new file mode 100644
index 0000000..7ed93fe
--- /dev/null
+++ b/web/attachments/40524-check_by_ssh.diff
@@ -0,0 +1,19 @@
+*** check_by_ssh.c.orig Thu Jan 23 23:16:08 2003
+--- check_by_ssh.c      Thu Jan 23 23:36:15 2003
+***************
+*** 256,262 ****
+                        while (p2 = index (p1, ':')) {
+                                *p2 = '\0';
+                                asprintf (&service[services-1], "%s", p1);
+!                               service = realloc (service, ++services);
+                                p1 = p2 + 1;
+                        }
+                        asprintf (&service[services-1], "%s", p1);
+--- 256,262 ----
+                        while (p2 = index (p1, ':')) {
+                                *p2 = '\0';
+                                asprintf (&service[services-1], "%s", p1);
+!                               service = realloc (service, sizeof(char *) * ++services);
+                                p1 = p2 + 1;
+                        }
+                        asprintf (&service[services-1], "%s", p1);
diff --git a/web/attachments/405293-check_file_age-diff b/web/attachments/405293-check_file_age-diff
new file mode 100644
index 0000000..6b32f0d
--- /dev/null
+++ b/web/attachments/405293-check_file_age-diff
@@ -0,0 +1,54 @@
+--- /usr/libexec/nagios/plugins/check_file_age  2011-03-23 12:17:55.000000000 -0400
++++ /home/vargo/tmp/excavate/check_file_age     2011-03-23 12:18:49.000000000 -0400
+@@ -32,7 +32,7 @@
+ sub print_help ();
+ sub print_usage ();
+ 
+-my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
++my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V, $opt_i);
+ my ($result, $message, $age, $size, $st);
+ 
+ $PROGNAME="check_file_age";
+@@ -47,6 +47,7 @@
+ GetOptions(
+        "V"   => \$opt_V, "version"     => \$opt_V,
+        "h"   => \$opt_h, "help"        => \$opt_h,
++       "i"   => \$opt_i, "ignore-missing"      => \$opt_i,
+        "f=s" => \$opt_f, "file"        => \$opt_f,
+        "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
+        "W=f" => \$opt_W, "warning-size=f" => \$opt_W,
+@@ -72,8 +73,15 @@
+ 
+ # Check that file exists (can be directory or link)
+ unless (-e $opt_f) {
+-       print "FILE_AGE CRITICAL: File not found - $opt_f\n";
+-       exit $ERRORS{'CRITICAL'};
++       if ($opt_i) {
++               $result = 'OK';
++               print "FILE_AGE $result: $opt_f doesn't exist, but ignore-missing was set\n";
++               exit $ERRORS{$result};
++
++       } else {
++               print "FILE_AGE CRITICAL: File not found - $opt_f\n";
++               exit $ERRORS{'CRITICAL'};
++       }
+ }
+ 
+ $st = File::stat::stat($opt_f);
+@@ -95,7 +103,7 @@
+ 
+ sub print_usage () {
+        print "Usage:\n";
+-       print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] -f <file>\n";
++       print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] [-i] -f <file>\n";
+        print "  $PROGNAME [-h | --help]\n";
+        print "  $PROGNAME [-V | --version]\n";
+ }
+@@ -105,6 +113,7 @@
+        print "Copyright (c) 2003 Steven Grimm\n\n";
+        print_usage();
+        print "\n";
++       print "  -i | --ignore-missing :  return OK if the file does not exist\n";
+        print "  <secs>  File must be no more than this many seconds old (default: warn 240 secs, crit 600)\n";
+        print "  <size>  File must be at least this many bytes long (default: crit 0 bytes)\n";
+        print "\n";
diff --git a/web/attachments/405415-0001-check_ssh-add-perfdata.patch b/web/attachments/405415-0001-check_ssh-add-perfdata.patch
new file mode 100644
index 0000000..a724a29
--- /dev/null
+++ b/web/attachments/405415-0001-check_ssh-add-perfdata.patch
@@ -0,0 +1,42 @@
+From 9e3ec39e4388677d2b4fdf7730384e49778aeee9 Mon Sep 17 00:00:00 2001
+From: Marco Beck <mbeck@miamod.de>
+Date: Mon, 7 Feb 2011 16:21:07 +0100
+Subject: [PATCH] check_ssh: add perfdata
+
+---
+ plugins/check_ssh.c |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
+index 2509b86..20e3f16 100644
+--- a/plugins/check_ssh.c
++++ b/plugins/check_ssh.c
+@@ -215,6 +215,10 @@ ssh_connect (char *haddr, int hport, char *remote_version)
+        char *ssh_proto = NULL;
+        char *ssh_server = NULL;
+        static char *rev_no = VERSION;
++       struct timeval tv;
++       double elapsed_time;
++
++       gettimeofday(&tv, NULL);
+ 
+        result = my_tcp_connect (haddr, hport, &sd);
+ 
+@@ -250,9 +254,12 @@ ssh_connect (char *haddr, int hport, char *remote_version)
+                        exit (STATE_WARNING);
+                }
+ 
++               elapsed_time = (double)deltime(tv) / 1.0e6;
++               
+                printf
+-                       (_("SSH OK - %s (protocol %s)\n"),
+-                        ssh_server, ssh_proto);
++                       (_("SSH OK - %s (protocol %s) | %s\n"),
++                        ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
++                        FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                close(sd);
+                exit (STATE_OK);
+        }
+-- 
+1.7.3.5
+
diff --git a/web/attachments/406534-nagiosplug_mysql.diff b/web/attachments/406534-nagiosplug_mysql.diff
new file mode 100644
index 0000000..991ce1a
--- /dev/null
+++ b/web/attachments/406534-nagiosplug_mysql.diff
@@ -0,0 +1,74 @@
+diff --git a/REQUIREMENTS b/REQUIREMENTS
+index fd41ded..33c5eb9 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)
+-               RPMS from www.mysql.org work better
++               Redhat Source (RHEL6, YUM): mysql-devel, mysql-libs
+          Must have mysql_config in PATH or specified with --with-mysql=DIR for DIR/bin/mysql_config
+ 
+ check_pqsql:
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index d9b4e53..0dfb1fd 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
+@@ -157,7 +157,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;
+ 
+@@ -178,13 +178,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);
+@@ -199,6 +203,7 @@ 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;
diff --git a/web/attachments/407004-timeout-lowercase.patch b/web/attachments/407004-timeout-lowercase.patch
new file mode 100644
index 0000000..1cbce5f
--- /dev/null
+++ b/web/attachments/407004-timeout-lowercase.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
+index 9a8fc51..17e6d33 100755
+--- a/plugins-scripts/check_mssql.pl
++++ b/plugins-scripts/check_mssql.pl
+@@ -49,7 +49,7 @@ $SIG{'ALRM'} = sub {
+      print ("SQL UNKNOWN: ERROR connection $server (alarm timeout)\n");
+      exit $ERRORS{"UNKNOWN"};
+ };
+-alarm($TIMEOUT);
++alarm($timeout);
+ 
+ unless ($dbh = DBI->connect("dbi:Sybase:server=".uc($server), "$username", "$password")) {
+        printf "SQL CRITICAL: Can't connect to mssql server $DBI::errstr\n";
diff --git a/web/attachments/407261-check_sensors-fault b/web/attachments/407261-check_sensors-fault
new file mode 100644
index 0000000..64b5201
--- /dev/null
+++ b/web/attachments/407261-check_sensors-fault
@@ -0,0 +1,16 @@
+Description: check for lmsensors 'FAULT' status as well as 'ALARM'
+Author: Jonathan Wiltshire <jmw@debian.org>
+Last-Update: 2011-02-25
+
+--- nagios-plugins-1.4.15.orig/plugins-scripts/check_sensors.sh
++++ nagios-plugins-1.4.15/plugins-scripts/check_sensors.sh
+@@ -57,6 +57,9 @@
+                if echo ${sensordata} | egrep ALARM > /dev/null; then
+                        echo SENSOR CRITICAL - Sensor alarm detected!
+                        exit 2
++               elif echo ${sensordata} | egrep FAULT > /dev/null; then
++                       echo SENSOR CRITICAL - Sensor reported fault
++                       exit 2
+                else
+                        echo sensor ok
+                        exit 0
diff --git a/web/attachments/408370-ssl_version.patch b/web/attachments/408370-ssl_version.patch
new file mode 100644
index 0000000..dde90e8
--- /dev/null
+++ b/web/attachments/408370-ssl_version.patch
@@ -0,0 +1,130 @@
+--- nagios-plugins-1.4.15/plugins/sslutils.c    2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-patched/plugins/sslutils.c    2011-04-12 14:13:29.035426121 +0000
+@@ -40,6 +40,28 @@
+ }
+ 
+ int np_net_ssl_init_with_hostname (int sd, char *host_name) {
++                return  np_net_ssl_init_with_hostname_and_version (sd, host_name, 0);
++}
++
++int np_net_ssl_init_with_hostname_and_version (int sd, char *host_name, int version) {
++                const SSL_METHOD * method = NULL;
++                switch ( version ) {
++                  case 0: /* Deafult to auto negotiation */
++                    method = SSLv23_client_method();
++                    break;
++                  case 1: /* TLSv1 protocol */
++                    method = TLSv1_client_method();
++                    break;
++                  case 2: /* SSLv2 protocol */
++                    method = SSLv2_client_method();
++                    break;
++                  case 3: /* SSLv3 protocol */
++                    method = SSLv3_client_method();
++                    break;
++                  default: /* Unsupported */
++                    printf ("%s\n", _("CRITICAL - Unsupported SSL Protocol Version."));
++                    return STATE_CRITICAL;
++                } 
+                if (!initialized) {
+                        /* Initialize SSL context */
+                        SSLeay_add_ssl_algorithms ();
+@@ -47,7 +69,7 @@
+                        OpenSSL_add_all_algorithms ();
+                        initialized = 1;
+                }
+-               if ((c = SSL_CTX_new (SSLv23_client_method ())) == NULL) {
++               if ((c = SSL_CTX_new (method)) == NULL) {
+                                printf ("%s\n", _("CRITICAL - Cannot create SSL context."));
+                                return STATE_CRITICAL;
+                }
+
+
+--- nagios-plugins-1.4.15/plugins/check_http.c  2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-patched/plugins/check_http.c  2011-04-12 14:14:58.426446596 +0000
+@@ -34,7 +34,7 @@
+ /* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
+ 
+ const char *progname = "check_http";
+-const char *copyright = "1999-2008";
++const char *copyright = "1999-2011";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+@@ -59,6 +59,7 @@
+ #ifdef HAVE_SSL
+ int check_cert = FALSE;
+ int days_till_exp;
++int ssl_version;
+ char *randbuff;
+ X509 *server_cert;
+ #  define my_recv(buf, len) ((use_ssl) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
+@@ -189,7 +190,7 @@
+     STD_LONG_OPTS,
+     {"link", no_argument, 0, 'L'},
+     {"nohtml", no_argument, 0, 'n'},
+-    {"ssl", no_argument, 0, 'S'},
++    {"ssl", optional_argument, 0, 'S'},
+     {"sni", no_argument, 0, SNI_OPTION},
+     {"post", required_argument, 0, 'P'},
+     {"method", required_argument, 0, 'j'},
+@@ -235,7 +236,7 @@
+   }
+ 
+   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:nlLSm:M:N", longopts, &option);
++    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);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -305,6 +306,21 @@
+       usage4 (_("Invalid option - SSL is not available"));
+ #endif
+       use_ssl = TRUE;
++      if (optarg == NULL)
++        ssl_version = 0;
++      else if (!is_intnonneg (optarg))
++        usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));
++      else {
++        ssl_version = atoi( optarg );
++        switch ( ssl_version ) {
++          case 1:
++          case 2:
++          case 3: break;
++          default:
++            usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));
++            break;
++        }
++      }
+       if (specify_port == FALSE)
+         server_port = HTTPS_PORT;
+       break;
+@@ -807,7 +823,7 @@
+     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+ #ifdef HAVE_SSL
+   if (use_ssl == TRUE) {
+-    np_net_ssl_init_with_hostname(sd, (use_sni ? host_name : NULL));
++    np_net_ssl_init_with_hostname_and_version(sd, (use_sni ? host_name : NULL), ssl_version);
+     if (check_cert == TRUE) {
+       result = np_net_ssl_check_cert(days_till_exp);
+       np_net_ssl_cleanup();
+@@ -1335,8 +1351,10 @@
+   printf (UT_IPv46);
+ 
+ #ifdef HAVE_SSL
+-  printf (" %s\n", "-S, --ssl");
++  printf (" %s\n", "-S, --ssl=VERSION");
+   printf ("   %s\n", _("Connect via SSL. Port defaults to 443"));
++  printf ("   %s\n", _("VERSION is optional, and prevents auto negotiation."));
++  printf ("   %s\n", _("1 = TLSv1, 2 = SSLv2, 3 = SSLv3."));
+   printf (" %s\n", "--sni");
+   printf ("   %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+   printf (" %s\n", "-C, --certificate=INTEGER");
+@@ -1441,6 +1459,6 @@
+   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 ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
+-  printf ("       [-A string] [-k string] [-S] [--sni] [-C <age>] [-T <content-type>]\n");
++  printf ("       [-A string] [-k string] [-S <version>] [--sni] [-C <age>] [-T <content-type>]\n");
+   printf ("       [-j method]\n");
+ }
diff --git a/web/attachments/40985-check_oracle.patch b/web/attachments/40985-check_oracle.patch
new file mode 100644
index 0000000..384d33e
--- /dev/null
+++ b/web/attachments/40985-check_oracle.patch
@@ -0,0 +1,104 @@
+--- new/check_oracle.sh Wed Jan 29 14:38:44 2003
++++ jjm/check_oracle.sh Wed Jan 29 15:17:01 2003
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # latigid010@yahoo.com
+ # 01/06/2000
+@@ -37,6 +37,8 @@
+   echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+   echo "  $PROGNAME --db <ORACLE_SID>"
+   echo "  $PROGNAME --login <ORACLE_SID>"
++  echo "  $PROGNAME --cache <USER> <PASS> <INST> <CRITICAL> <WARNING>"
++  echo "  $PROGNAME --tablespace <USER> <PASS> <INST> <TABLESPACE> <CRITICAL> <WARNING>"
+   echo "  $PROGNAME --oranames <Hostname>"
+   echo "  $PROGNAME --help"
+   echo "  $PROGNAME --version"
+@@ -56,6 +58,14 @@
+        echo "   filesystem for sgadefORACLE_SID.dbf"
+   echo "--login=SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
++  echo "--cache"
++  echo "   Check local database for library and buffer cache hit ratios"
++  echo "       --->  Requires Oracle user/password and SID  specified."
++  echo "                       --->  Requires select on v_$sysstat and v_$librarycache"
++  echo "--tablespace"
++  echo "   Check local database for tablespace capacity in ORACLE_SID"
++  echo "       --->  Requires Oracle user/password specified."
++  echo "                       --->  Requires select on dba_data_files and dba_free_space"
+   echo "--oranames=Hostname"
+   echo "   Check remote Oracle Names server"
+   echo "--help"
+@@ -191,6 +201,71 @@
+        exit $STATE_CRITICAL
+     fi
+     ;;
++--cache)
++    if [ ${5} -gt ${6} ] ; then
++       echo "UNKNOWN - Warning level is less then Crit"
++       exit $STATE_UNKNOWN
++    fi
++    result=`sqlplus -s ${2}/${3}@${4} << EOF
++      set pagesize 0
++     
++select (1-(pr.value/(dbg.value+cg.value)))*100 \
++from v\\$sysstat pr, v\\$sysstat dbg, v\\$sysstat cg \
++where pr.name = 'physical reads'  \
++        and dbg.name='db block gets' \
++        and cg.name='consistent gets'; `
++
++    buf_hr=`echo $result | awk '{print int($1)}'` 
++    result=`sqlplus -s ${2}/${3}@${4} << EOF
++      set pagesize 0
++
++select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100 \
++from v\\$librarycache lc ; `
++       
++    lib_hr=`echo $result | awk '{print int($1)}'`
++
++    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
++       echo "${3} : ${4} CRITICAL - Cache Hit Rates: $lib_hr % Lib -- $buf_hr % Buff"
++       exit $STATE_CRITICAL
++    fi
++    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
++       echo "${3} : ${4} WARNING  - Cache Hit Rates: $lib_hr % Lib -- $buf_hr % Buff"
++       exit $STATE_WARNING
++    fi
++    echo "${3} : ${4} OK - Cache Hit Rates: $lib_hr % Lib -- $buf_hr % Buff"
++
++    exit $STATE_OK
++    ;;
++--tablespace)
++    if [ ${6} -lt ${7} ] ; then
++       echo "UNKNOWN - Warning level is more then Crit"
++       exit $STATE_UNKNOWN
++    fi
++    result=`sqlplus -s ${2}/${3}@${4} << EOF
++      set pagesize 0
++     
++select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc \
++from ( \
++select tablespace_name,sum(bytes)/1024/1024 total \
++from dba_data_files group by tablespace_name) A, \
++( select tablespace_name,sum(bytes)/1024/1024 free \
++from dba_Free_space group by tablespace_name) B \
++where a.tablespace_name=b.tablespace_name and a.tablespace_name='${5}';  ` 
++
++    ts_free=`echo $result | awk '{print int($1)}'` 
++    ts_total=`echo $result | awk '{print int($2)}'` 
++    ts_pct=`echo $result | awk '{print int($3)}'` 
++    if [ $ts_pct -ge ${6} ] ; then
++       echo "${4} : ${5} CRITICAL - $ts_pct% used [ $ts_free / $ts_total MB available ]"
++       exit $STATE_CRITICAL
++    fi
++    if [ $ts_pct -ge ${7} ] ; then
++       echo "${4} : ${5} WARNING  - $ts_pct% used [ $ts_free / $ts_total MB available ]"
++       exit $STATE_WARNING
++    fi
++    echo "${4} : ${5} OK - $ts_pct% used [ $ts_free / $ts_total MB available ]"
++    exit $STATE_OK
++    ;;
+ *)
+     print_usage
+                exit $STATE_UNKNOWN
diff --git a/web/attachments/410030-checkhttpgzipdeflate.patch b/web/attachments/410030-checkhttpgzipdeflate.patch
new file mode 100644
index 0000000..0850a70
--- /dev/null
+++ b/web/attachments/410030-checkhttpgzipdeflate.patch
@@ -0,0 +1,328 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 433c28e..a71cfe6 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -41,7 +41,9 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ #include "netutils.h"
+ #include "utils.h"
+ #include "base64.h"
++#include "zlib.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ #define INPUT_DELIMITER ";"
+ #define STICKY_NONE 0
+@@ -114,6 +116,8 @@ int followsticky = STICKY_NONE;
+ int use_ssl = FALSE;
+ int use_sni = FALSE;
+ int verbose = FALSE;
++int decompress = FALSE;
++int chunked = FALSE;
+ int sd;
+ int min_page_len = 0;
+ int max_page_len = 0;
+@@ -134,6 +138,14 @@ char *perfd_size (int page_len);
+ void print_help (void);
+ void print_usage (void);
+ 
++int page_content_decompress(const char *in_buf,int in_size,
++               char **data,int *out_size,int type);
++int find_header_info(const char* header,
++               char* content,const char* keyword);
++int get_content_encoding(const char* header); 
++int get_transfer_encoding(const char* header);
++char* decodechunked(char * chunked, unsigned int *inputlen);
++       
+ int
+ main (int argc, char **argv)
+ {
+@@ -214,6 +226,8 @@ 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'},
++    {"decompress",no_argument,0,'d'},
++    {"chunked",no_argument,0,'X'},
+     {0, 0, 0, 0}
+   };
+ 
+@@ -234,7 +248,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:nlLSm:M:N", longopts, &option);
++    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:nlLSm:M:NdX", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -406,6 +420,12 @@ process_arguments (int argc, char **argv)
+     case 'v': /* verbose */
+       verbose = TRUE;
+       break;
++    case 'd': /* decompress */
++      decompress = TRUE;
++      break;
++    case 'X': /*chunked*/
++      chunked = TRUE;
++      break;
+     case 'm': /* min_page_length */
+       {
+       char *tmp;
+@@ -793,6 +813,9 @@ check_http (void)
+   int page_len = 0;
+   int result = STATE_OK;
+ 
++  char *uncompress_page;
++  int uncompress_page_size;
++
+   /* try to connect to the host at the given port number */
+   if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
+     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+@@ -870,18 +893,15 @@ check_http (void)
+   my_send (buf, strlen (buf));
+ 
+   /* fetch the page */
+-  full_page = strdup("");
++  full_page =(char*)malloc(sizeof(char)*4096); 
+   while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
+-    buffer[i] = '\0';
+-    asprintf (&full_page_new, "%s%s", full_page, buffer);
+-    free (full_page);
+-    full_page = full_page_new;
++    full_page = realloc(full_page, pagesize + i);
++    memcpy(full_page + pagesize, buffer, i);
+     pagesize += i;
+-
+-                if (no_body && document_headers_done (full_page)) {
+-                  i = 0;
+-                  break;
+-                }
++    if (no_body && document_headers_done (full_page)) {
++      i = 0;
++      break;
++    }
+   }
+ 
+   if (i < 0 && errno != ECONNRESET) {
+@@ -951,6 +971,28 @@ check_http (void)
+   }
+   page += (size_t) strspn (page, "\r\n");
+   header[pos - header] = 0;
++
++  /*deal chunked data*/
++  if(get_transfer_encoding(header)==1 && chunked) {
++    pagesize = pagesize - (page-header);
++    page = decodechunked(page,&pagesize);
++  }
++  else {
++    pagesize = get_content_length(header);
++  }
++
++  /*decompress the page content*/
++  int content_encoding = get_content_encoding(header);
++  if(decompress && (content_encoding == 1 || content_encoding == 2)) {
++    result = page_content_decompress(page,pagesize,&uncompress_page,
++               &uncompress_page_size,content_encoding);
++  
++    if(result == 0) {
++      page = uncompress_page;
++      pagesize = uncompress_page_size;
++    }
++  }
++
+   if (verbose)
+     printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
+                 (no_body ? "  [[ skipped ]]" : page));
+@@ -1384,6 +1426,8 @@ print_help (void)
+   printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+ 
+   printf (UT_VERBOSE);
++  printf (UT_DECOMPRESS);
++  printf (UT_CHUNKED);
+ 
+   printf ("\n");
+   printf ("%s\n", _("Notes:"));
+@@ -1432,3 +1476,167 @@ print_usage (void)
+   printf ("       [-A string] [-k string] [-S] [--sni] [-C <age>] [-T <content-type>]\n");
+   printf ("       [-j method]\n");
+ }
++
++/* HTTP gzip or deflate decompress;
++ * type = 1 represent gzip format
++ * type = 2 represent deflate format */
++int page_content_decompress(const char *in_buf,int in_size,                 
++        char **out_buf_ptr, int *out_size,int type)
++{
++  z_stream stream = {0}; /* decompression stream */
++  char *out_buf = NULL;
++  int out_buf_bytes = 0;
++  char tmp_buf[4096];
++  int result;
++  int new_bytes;
++
++  stream.zalloc = (alloc_func)0;
++  stream.zfree = (free_func)0;
++  stream.opaque = (voidpf)0;
++  stream.next_in  = (void*) in_buf;
++  stream.avail_in = in_size;
++  stream.next_out = tmp_buf;
++  stream.avail_out = sizeof tmp_buf;
++
++  switch (type) {
++    case 1:  /*gzip*/
++      if(inflateInit2(&stream,MAX_WBITS+32) != Z_OK)
++       return -1;
++      break;
++    case 2:  /*deflate*/
++      if(inflateInit2(&stream,-MAX_WBITS) != Z_OK) 
++        return -1;
++  }
++  
++  do {
++    result = inflate(&stream,Z_NO_FLUSH);
++    switch (result) {
++      case Z_BUF_ERROR:
++        if(stream.avail_in == 0)
++          goto DONE; /*zlib bug */
++      case Z_ERRNO:
++      case Z_NEED_DICT:
++      case Z_MEM_ERROR:
++      case Z_DATA_ERROR:
++        inflateEnd(&stream);
++        free(out_buf);
++        return -1;
++    }
++    if(stream.avail_out < sizeof tmp_buf) {
++      new_bytes = sizeof tmp_buf - stream.avail_out;
++      out_buf = realloc(out_buf,out_buf_bytes + new_bytes);
++      memcpy (out_buf + out_buf_bytes,tmp_buf,new_bytes);
++      out_buf_bytes += new_bytes;
++      stream.next_out = tmp_buf;
++      stream.avail_out = sizeof tmp_buf;
++    }
++    else {
++      inflateEnd(&stream);
++      free(out_buf);
++      return -1;
++    }
++  }
++  while(result != Z_STREAM_END);
++
++DONE:
++
++  if(inflateEnd(&stream) != Z_OK) {
++    free(out_buf);
++    return -1;
++  }
++  
++  *out_size = out_buf_bytes;
++  out_buf = realloc(out_buf,out_buf_bytes + 1);
++  out_buf[out_buf_bytes] = 0;
++  *out_buf_ptr = out_buf;
++
++  return 0;
++}
++
++/*find content from header data by keyword*/
++int find_header_info(const char* header,char* content,const char* keyword) {
++  char* start  = strstr(header,keyword);
++  if(start != 0) {
++    start = start + strcspn(start,": ");
++    start += strspn(start,": ");
++    char* end = start + strcspn(start," \r\n");
++    if( content != NULL) {
++      memcpy(content,start,end-start);
++    }
++    return 1;
++  }
++  else{
++    return 0;
++  }
++}
++
++/*find Content-Encoding from the header info;
++ *if Content-Encoding equal 'gzip' return 1,or return 0.
++ */
++int get_content_encoding(const char* header) {
++  int result = 0;
++  int ret = 0;
++  char* content_encoding = (char*)malloc(sizeof(char)*10);
++  result = find_header_info(header,content_encoding,"Content-Encoding");
++
++  if(result && strncmp(content_encoding,"gzip",4)==0) {
++    ret = 1;
++  }
++  else if(result && strncmp(content_encoding,"deflate",7)==0) {
++    ret = 2;
++  }
++  else {
++    ret = 0;
++  }
++  if(content_encoding != NULL) {
++    free(content_encoding);
++  }
++  return ret;
++}
++
++/*find Transfer-Encoding from the header info;
++ * if Content-Encoding equal 'chunked' return 1,or return 0.
++ */
++int get_transfer_encoding(const char* header) {
++  int result = 0;
++  int ret = 0;
++  char *transfer_encoding = (char*)malloc(sizeof(char)*10);
++  result = find_header_info(header,transfer_encoding,"Transfer-Encoding");
++
++  if(result && strncmp(transfer_encoding,"chunked",7)==0){
++    ret = 1;
++  }
++  else {
++    ret = 0;
++  }
++       
++  if(transfer_encoding != NULL) {
++    free(transfer_encoding);
++  }
++  return ret;
++}
++
++/* Returns NULL on invalid input */
++char* decodechunked(char * chunked, unsigned int *inputlen) {
++  char *orig = chunked, *dest = chunked;
++  unsigned long chunklen;
++  while((chunklen = strtoul(orig, &orig, 16))) {
++    /* process one more chunk: */
++    /* skip chunk-extension part */
++    while(*orig && (*orig != '\r'))
++      orig++;
++      /* skip '\r\n' after chunk length */
++    orig += 2;
++    if(( chunklen > (chunked + *inputlen - orig)))
++      /* insane chunk length. Well... */
++      return NULL;
++    memmove(dest, orig, chunklen);
++    dest += chunklen;
++    orig += chunklen;
++    /* and go to the next chunk */
++  }
++  *dest = '\0';
++  *inputlen = dest - chunked;
++       
++  return chunked;
++}
+diff --git a/plugins/utils.h b/plugins/utils.h
+index 3c3f189..78a74aa 100644
+--- a/plugins/utils.h
++++ b/plugins/utils.h
+@@ -204,4 +204,12 @@ The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
+ copies of the plugins under the terms of the GNU General Public License.\n\
+ For more information about these matters, see the file named COPYING.\n")
+ 
++#define UT_DECOMPRESS _("\
++ -d, --decompress\n\
++    Decompress the contents of page which were compressed by gzip or deflate.\n")
++
++#define UT_CHUNKED _("\
++ -X, --chunked\n\
++    Deal with the data which was transferred by chunked encoding.")
++
+ #endif /* NP_UTILS_H */
diff --git a/web/attachments/41141-check_procs.c.patch b/web/attachments/41141-check_procs.c.patch
new file mode 100644
index 0000000..c152d1b
--- /dev/null
+++ b/web/attachments/41141-check_procs.c.patch
@@ -0,0 +1,70 @@
+*** check_procs.c.original      Fri Jan 31 10:44:15 2003
+--- check_procs.c       Fri Jan 31 10:44:27 2003
+***************
+*** 77,82 ****
+--- 77,83 ----
+  char *args = "";
+  char *fmt = "";
+  char tmp[MAX_INPUT_BUFFER];
++ const char *zombie = "Z";
+  
+  int
+  main (int argc, char **argv)
+***************
+*** 93,98 ****
+--- 94,100 ----
+        int found = 0; /* counter for number of lines returned in `ps` output */
+        int procs = 0; /* counter for number of processes meeting filter criteria */
+        int pos; /* number of spaces before 'args' in `ps` output */
++       int cols; /* number of columns in ps output */
+  
+        int result = STATE_UNKNOWN;
+  
+***************
+*** 115,128 ****
+        fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+  
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-               if (
+  #ifdef USE_PS_VARS
+!                                sscanf (input_buffer, PS_FORMAT, PS_VARLIST) >= 4
+  #else
+!                                sscanf (input_buffer, PS_FORMAT, procstat, &procuid, &procppid, &pos,
+!                                                                procprog) >= 4
+  #endif
+!                       ) {
+                        found++;
+                        resultsum = 0;
+                        asprintf (&procargs, "%s", input_buffer + pos);
+--- 117,134 ----
+        fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+  
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+  #ifdef USE_PS_VARS
+!               cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST);
+  #else
+!               cols = sscanf (input_buffer, PS_FORMAT, procstat, &procuid, 
+!                                                       &procppid, &pos, procprog);
+  #endif
+!               /* Zombie processes do not give a procprog command */
+!               if ( cols == 3 && strstr(procstat, zombie) ) {
+!                       strcpy(procprog, "");
+!                       cols = 4;
+!               }
+!               if ( cols >= 4 ) {
+                        found++;
+                        resultsum = 0;
+                        asprintf (&procargs, "%s", input_buffer + pos);
+***************
+*** 147,152 ****
+--- 153,162 ----
+  #endif
+                        if (options == resultsum)
+                                procs++;
++               } 
++               /* This should not happen */
++               else if (verbose) {
++                       printf("Not parseable: %s", input_buffer);
+                }
+        }
+  
diff --git a/web/attachments/41142-check_procs.c.patch b/web/attachments/41142-check_procs.c.patch
new file mode 100644
index 0000000..efbdfe4
--- /dev/null
+++ b/web/attachments/41142-check_procs.c.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-7 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378818434" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378818434" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378818434" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378818434" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378818434');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=677803&group_id=29880&atid=397597&file_id=41142"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/411426-check_mysql_query.diff b/web/attachments/411426-check_mysql_query.diff
new file mode 100644
index 0000000..c635d34
--- /dev/null
+++ b/web/attachments/411426-check_mysql_query.diff
@@ -0,0 +1,57 @@
+--- check_mysql_query.c 2010-07-27 22:47:16.000000000 +0200
++++ /home/psy/check_mysql_query_psy.c   2011-05-12 17:01:19.000000000 +0200
+@@ -67,8 +67,9 @@
+        MYSQL_ROW row;
+        
+        double value;
++       char perfmin[20],perfmax[20];
+        char *error = NULL;
+-       int status;
++       int status,cols;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -128,6 +129,7 @@
+                die (STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
+        }
+ 
++       cols =  mysql_num_fields(res);
+        /* free the result */
+        mysql_free_result (res);
+ 
+@@ -140,20 +142,31 @@
+ 
+        value = strtod(row[0], NULL);
+ 
++       if ( (cols >= 2) && (is_numeric(row[1])) ) 
++               sprintf(perfmin,"%g",strtod(row[1],NULL));
++       else
++               sprintf(perfmin, "");
++
++       if ( (cols >= 3) && (is_numeric(row[2])) ) 
++               sprintf(perfmax,"%g",strtod(row[2],NULL));
++       else
++               sprintf(perfmax, "");
++
+        if (verbose >= 3)
+                printf("mysql result: %f\n", value);
+ 
+        status = get_status(value, my_thresholds);
+ 
+        if (status == STATE_OK) {
+-               printf("QUERY %s: ", _("OK"));
++               printf("QUERY %s: returned %g", _("OK"),value);
+        } else if (status == STATE_WARNING) {
+-               printf("QUERY %s: ", _("WARNING"));
++               printf("QUERY %s: returned %g", _("WARNING"),value);
+        } else if (status == STATE_CRITICAL) {
+-               printf("QUERY %s: ", _("CRITICAL"));
++               printf("QUERY %s: returned %g", _("CRITICAL"),value);
+        }
+-       printf(_("'%s' returned %f"), sql_query, value);
+        printf("\n");
++       printf(_("'%s'\n"), sql_query);
++       printf("| value=%g;;;%s;%s\n",value,perfmin,perfmax);
+ 
+        return status;
+ }
diff --git a/web/attachments/412453-check_disk.diff b/web/attachments/412453-check_disk.diff
new file mode 100644
index 0000000..0d72272
--- /dev/null
+++ b/web/attachments/412453-check_disk.diff
@@ -0,0 +1,59 @@
+commit 81feafc3746e7e63d9dea923d56b327b7d134f3b
+Author: Alex Dehnert <adehnert@mit.edu>
+Date:   Mon May 23 03:50:26 2011 -0400
+
+    check_disk: Use multiline output format
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index f889764..f6e9e5b 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -159,6 +159,8 @@ main (int argc, char **argv)
+   int result = STATE_UNKNOWN;
+   int disk_result = STATE_UNKNOWN;
+   char *output;
++  char *output_long;
++  char *line;
+   char *details;
+   char *perf;
+   char *preamble;
+@@ -173,6 +175,7 @@ main (int argc, char **argv)
+ 
+   preamble = strdup (" - free space:");
+   output = strdup ("");
++  output_long = strdup ("");
+   details = strdup ("");
+   perf = strdup ("");
+   stat_buf = malloc(sizeof *stat_buf);
+@@ -331,17 +334,19 @@ main (int argc, char **argv)
+       if (disk_result==STATE_OK && erronly && !verbose)
+         continue;
+ 
+-      asprintf (&output, "%s %s %.0f %s (%.0f%%",
+-                output,
++      line = strdup ("");
++      asprintf (&line, "%s %.0f %s (%.0f%%",
+                 (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                 path->dfree_units,
+                 units,
+                 path->dfree_pct);
+       if (path->dused_inodes_percent < 0) {
+-        asprintf(&output, "%s inode=-);", output);
++        asprintf(&line, "%s inode=-)", line);
+       } else {
+-        asprintf(&output, "%s inode=%.0f%%);", output, path->dfree_inodes_percent );
++        asprintf(&line, "%s inode=%.0f%%)", line, path->dfree_inodes_percent );
+       }
++      asprintf(&output, "%s %s:", output, line);
++      asprintf(&output_long, "%s%s\n", output_long, line);
+ 
+       /* TODO: Need to do a similar debug line
+       asprintf (&details, _("%s\n\
+@@ -360,6 +365,7 @@ main (int argc, char **argv)
+ 
+ 
+   printf ("DISK %s%s%s|%s\n", state_text (result), (erronly && result==STATE_OK) ? "" : preamble, output, perf);
++  printf ("%s", output_long);
+   return result;
+ }
+ 
diff --git a/web/attachments/41358-check_snmp.c.diff b/web/attachments/41358-check_snmp.c.diff
new file mode 100644
index 0000000..c5d28be
--- /dev/null
+++ b/web/attachments/41358-check_snmp.c.diff
@@ -0,0 +1,10 @@
+--- check_snmp.c.orig   2002-11-16 06:06:02.000000000 +0100
++++ check_snmp.c        2003-02-03 11:12:38.000000000 +0100
+@@ -319,6 +319,7 @@
+                    eval_method[i] & WARN_EQ ||
+                    eval_method[i] & WARN_NE) {
+                        p2 = strpbrk (p2, "0123456789");
++                       if (p2 == NULL) terminate (STATE_UNKNOWN,"No valid data returned");
+                        response_value[i] = strtoul (p2, NULL, 10);
+                        iresult = check_num (i);
+                        asprintf (&show, "%lu", response_value[i]);
diff --git a/web/attachments/41359-check_snmp.c.diff b/web/attachments/41359-check_snmp.c.diff
new file mode 100644
index 0000000..98cb017
--- /dev/null
+++ b/web/attachments/41359-check_snmp.c.diff
@@ -0,0 +1,11 @@
+--- plugins/check_snmp.c.orig   2002-11-16 06:06:02.000000000 +0100
++++ plugins/check_snmp.c        2003-01-31 11:47:23.000000000 +0100
+@@ -299,6 +299,8 @@
+                        show = strstr (response, "Gauge32: ") + 9;
+                else if (strstr (response, "INTEGER: "))
+                        show = strstr (response, "INTEGER: ") + 9;
++               else if (strstr (response, "STRING: "))
++                       show = strstr (response, "STRING: ") + 8;
+                else
+                        show = response;
+                p2 = show;
\ No newline at end of file
diff --git a/web/attachments/41389-plugins-scripts-Makefile.am.patch b/web/attachments/41389-plugins-scripts-Makefile.am.patch
new file mode 100644
index 0000000..7b08f2b
--- /dev/null
+++ b/web/attachments/41389-plugins-scripts-Makefile.am.patch
@@ -0,0 +1,15 @@
+--- Makefile.am.original        2002-10-30 19:49:19.000000000 +0100

++++ Makefile.am 2003-02-03 19:21:01.000000000 +0100

+@@ -14,10 +14,12 @@

+

+ TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)

+

+ TESTS = @SCRIPT_TEST@

+

++AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@

++

+ test:

+        perl -I $(top_builddir) -I $(top_srcdir) ../test.pl

+

+ CLEANFILES=$(libexec_SCRIPTS)

+

diff --git a/web/attachments/41390-plugins-scripts-Makefile.am.patch b/web/attachments/41390-plugins-scripts-Makefile.am.patch
new file mode 100644
index 0000000..a09c02a
--- /dev/null
+++ b/web/attachments/41390-plugins-scripts-Makefile.am.patch
@@ -0,0 +1,15 @@
+--- Makefile.am.original        2002-10-30 19:49:19.000000000 +0100

++++ Makefile.am 2003-02-03 19:45:17.000000000 +0100

+@@ -19,10 +19,12 @@

+ test:

+        perl -I $(top_builddir) -I $(top_srcdir) ../test.pl

+

+ CLEANFILES=$(libexec_SCRIPTS)

+

++AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@

++

+ .pl :

+        $(AWK) -f ./subst $< > $@

+        chmod +x $@

+

+ .sh :

diff --git a/web/attachments/414810-check_http.c.patch b/web/attachments/414810-check_http.c.patch
new file mode 100644
index 0000000..6a189b5
--- /dev/null
+++ b/web/attachments/414810-check_http.c.patch
@@ -0,0 +1,135 @@
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 433c28e..6a8a90a 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -84,6 +84,7 @@ int errcode;
+ int invert_regex = 0;
+ 
+ struct timeval tv;
++struct timeval tv_temp;
+ 
+ #define HTTP_URL "/"
+ #define CRLF "\r\n"
+@@ -130,6 +131,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);
+@@ -790,15 +796,31 @@ 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);
+     np_net_ssl_init_with_hostname(sd, (use_sni ? host_name : NULL));
++    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);
+       np_net_ssl_cleanup();
+@@ -867,11 +889,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';
+     asprintf (&full_page_new, "%s%s", full_page, buffer);
+     free (full_page);
+@@ -883,6 +913,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
+@@ -1085,10 +1117,16 @@ check_http (void)
+ 
+   /* check elapsed time */
+   asprintf (&msg,
+-            _("%s - %d bytes in %.3f second response time %s|%s %s"),
++            _("%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"),
+             msg, page_len, elapsed_time,
+             (display_html ? "</A>" : ""),
+-            perfd_time (elapsed_time), perfd_size (page_len));
++            perfd_time (elapsed_time), 
++            perfd_size (page_len),
++            perfd_time_connect (elapsed_time_connect), 
++            perfd_time_ssl (elapsed_time_ssl), 
++            perfd_time_headers (elapsed_time_headers), 
++            perfd_time_firstbyte (elapsed_time_firstbyte), 
++            perfd_time_transfer (elapsed_time_transfer));
+ 
+   result = max_state_alt(get_status(elapsed_time, thlds), result);
+ 
+@@ -1277,7 +1315,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)
+ {
diff --git a/web/attachments/41493-http.patch b/web/attachments/41493-http.patch
new file mode 100644
index 0000000..8492cb2
--- /dev/null
+++ b/web/attachments/41493-http.patch
@@ -0,0 +1,82 @@
+Index: check_http.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
+retrieving revision 1.15
+diff -u -p -r1.15 check_http.c
+--- check_http.c        16 Jan 2003 06:29:02 -0000      1.15
++++ check_http.c        22 Jan 2003 17:53:43 -0000
+@@ -45,7 +45,7 @@ certificate expiration times.\n"
+             [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+             [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+             [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
+-            [-P string]"
++            [-P string] [-m min_pg_size]"
+ 
+ #define LONGOPTIONS "\
+  -H, --hostname=ADDRESS\n\
+@@ -75,6 +75,8 @@ certificate expiration times.\n"
+    Wrap output in HTML link (obsoleted by urlize)\n\
+  -f, --onredirect=<ok|warning|critical|follow>\n\
+    How to handle redirected pages\n%s%s\
++ -m, --min=INTEGER\n\
++   Minimum page size required (bytes)\n\
+  -v, --verbose\n\
+     Show details for command-line debugging (do not use with nagios server)\n\
+  -h, --help\n\
+@@ -212,6 +214,7 @@ int onredirect = STATE_OK;
+ int use_ssl = FALSE;
+ int verbose = FALSE;
+ int sd;
++int min_page_len = 0;
+ /*@null@*/ char *http_method = NULL;
+ /*@null@*/ char *http_post_data = NULL;
+ char buffer[MAX_INPUT_BUFFER];
+@@ -301,6 +304,7 @@ process_arguments (int argc, char **argv
+                {"linespan", no_argument, 0, 'l'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
++               {"min",required_argument,0,'m'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -321,7 +325,7 @@ process_arguments (int argc, char **argv
+                        strcpy (argv[c], "-n");
+        }
+ 
+-#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLS"
++#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLSm:"
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+@@ -459,6 +463,9 @@ process_arguments (int argc, char **argv
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
++               case 'm': /* min_page_length */
++                       min_page_len = atoi (optarg);
++                       break;
+                }
+        }
+ 
+@@ -548,6 +555,7 @@ check_http (void)
+        char *x = NULL;
+        char *orig_url = NULL;
+        double elapsed_time;
++       int page_len = 0;
+ 
+        /* try to connect to the host at the given port number */
+ #ifdef HAVE_SSL
+@@ -895,6 +903,13 @@ check_http (void)
+        }
+ #endif
+ 
++       /* make sure the page is of an appropriate size */
++       page_len = strlen (page);
++       if ((min_page_len > 0) && (page_len < min_page_len)) {
++               printf ("HTTP WARNING: page size too small%s|size=%i\n",
++                               (display_html ? "</A>" : ""), page_len );
++               exit (STATE_WARNING);
++       }
+        /* We only get here if all tests have been passed */
+        asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
+                        status_line, (float)elapsed_time,
diff --git a/web/attachments/415177-check_icmp.patch b/web/attachments/415177-check_icmp.patch
new file mode 100644
index 0000000..570e4f7
--- /dev/null
+++ b/web/attachments/415177-check_icmp.patch
@@ -0,0 +1,57 @@
+--- check_icmp.c.orig   2011-06-12 13:05:39.000000000 +0200
++++ check_icmp.c        2011-06-12 13:21:28.000000000 +0200
+@@ -204,7 +204,7 @@
+ /** global variables **/
+ static struct rta_host **table, *cursor, *list;
+ static threshold crit = {80, 500000}, warn = {40, 200000};
+-static int mode, protocols, sockets, debug = 0, timeout = 10;
++static int mode, protocols, sockets, debug = 0, timeout = 10, allperf = 1;
+ static unsigned short icmp_data_size = DEFAULT_PING_DATA_SIZE;
+ static unsigned short icmp_pkt_size = DEFAULT_PING_DATA_SIZE + ICMP_MINLEN;
+ 
+@@ -456,7 +456,7 @@
+ 
+        /* parse the arguments */
+        for(i = 1; i < argc; i++) {
+-               while((arg = getopt(argc, argv, "vhVw:c:n:p:t:H:s:i:b:I:l:m:")) != EOF) {
++               while((arg = getopt(argc, argv, "vhVaw:c:n:p:t:H:s:i:b:I:l:m:")) != EOF) {
+                        long size;
+                        switch(arg) {
+                        case 'v':
+@@ -512,6 +512,9 @@
+                        case 's': /* specify source IP address */
+                                set_source_ip(optarg);
+                                break;
++                       case 'a':
++                               allperf = 0;
++                               break;
+       case 'V':                 /* version */
+         print_revision (progname, NP_VERSION);
+         exit (STATE_OK);
+@@ -1002,12 +1005,16 @@
+        host = list;
+        while(host) {
+                if(debug) puts("");
+-               printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
++               if(allperf) printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
+                           (targets > 1) ? host->name : "",
+                           host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
+                           (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl,
+                           (targets > 1) ? host->name : "", (float)host->rtmax / 1000,
+                           (targets > 1) ? host->name : "", (host->rtmin < DBL_MAX) ? (float)host->rtmin / 1000 : (float)0);
++               else printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; ",
++                          (targets > 1) ? host->name : "",
++                          host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
++                          (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl);
+ 
+                host = host->next;
+        }
+@@ -1315,6 +1322,8 @@
+   printf (" %s\n", "-b");
+   printf ("    %s\n", _("Number of icmp data bytes to send"));
+   printf ("    %s %u + %d)\n", _("Packet size will be data bytes + icmp header (currently"),icmp_data_size, ICMP_MINLEN);
++  printf (" %s\n", "-a");
++  printf ("    %s\n",_("no rtmin/rtmax performance data"));
+   printf (" %s\n", "-v");
+   printf ("    %s\n", _("verbose"));
+ 
diff --git a/web/attachments/41661-check_disk.patch b/web/attachments/41661-check_disk.patch
new file mode 100644
index 0000000..ef6ce3e
--- /dev/null
+++ b/web/attachments/41661-check_disk.patch
@@ -0,0 +1,30 @@
+Index: check_disk.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
+retrieving revision 1.7
+diff -r1.7 check_disk.c
+30a31,32
+>  *  - Modification by www.datux.nl 2003-01-24
+>  *     added performance data output
+66a69,71
+>       int perf_total_disk = 0;
+>       int perf_free_disk = 0;
+>       int perf_used_disk = 0;
+98a104
+>               /* did we get some usefull output from the 'df' process? */
+120a127,129
+>                       perf_total_disk+=total_disk;
+>                       perf_free_disk+=free_disk;
+>                       perf_used_disk+=used_disk;
+150,151c159,166
+<               printf ("DISK %s%s\n", state_text (result), output);
+< 
+---
+>               printf ("DISK %s%s|total=%d,used=%d,free=%d,used_perc=%f,free_perc=%f\n", 
+>                   state_text (result), 
+>                   output, 
+>                   perf_total_disk, 
+>                   perf_used_disk, 
+>                   perf_free_disk, 
+>                   100-((float)perf_free_disk*100/(float)perf_total_disk),
+>                   ((float)perf_free_disk*100/(float)perf_total_disk));
diff --git a/web/attachments/41662-check_load.patch b/web/attachments/41662-check_load.patch
new file mode 100644
index 0000000..93311be
--- /dev/null
+++ b/web/attachments/41662-check_load.patch
@@ -0,0 +1,14 @@
+Index: check_load.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_load.c,v
+retrieving revision 1.5
+diff -r1.5 check_load.c
+21a22,24
+>  * 20/01/2003 - Now returns performance data 
+>  *               mods by Edwin Eefting (www.DatuX.nl)
+>  *
+141a145,148
+> 
+>       /* performance data */
+>       printf ("|load1=%.2f,load5=%.2f,load15=%.2f", la1, la5, la15);
+> 
diff --git a/web/attachments/41663-check_load.patch b/web/attachments/41663-check_load.patch
new file mode 100644
index 0000000..93311be
--- /dev/null
+++ b/web/attachments/41663-check_load.patch
@@ -0,0 +1,14 @@
+Index: check_load.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_load.c,v
+retrieving revision 1.5
+diff -r1.5 check_load.c
+21a22,24
+>  * 20/01/2003 - Now returns performance data 
+>  *               mods by Edwin Eefting (www.DatuX.nl)
+>  *
+141a145,148
+> 
+>       /* performance data */
+>       printf ("|load1=%.2f,load5=%.2f,load15=%.2f", la1, la5, la15);
+> 
diff --git a/web/attachments/41664-check_ping.patch b/web/attachments/41664-check_ping.patch
new file mode 100644
index 0000000..a65f132
--- /dev/null
+++ b/web/attachments/41664-check_ping.patch
@@ -0,0 +1,31 @@
+Index: check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.11
+diff -r1.11 check_ping.c
+10a11,14
+> * updated Mon Jan 20 19:03:57 CET 2003 by Edwin Eefting (DatuX.nl)
+> *  -minor bugfixes
+> *  -now returns performance data
+> *
+21c25
+< -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
+---
+> -H <host_address> -w <wrta>,<wpl>% -c <crta>,<cpl>%\n\
+138c142,147
+<       printf ("\n");
+---
+> 
+>       /* print performance data */
+>       printf("|loss=%d",pl);
+>       if (pl != 100)
+>           printf(",rta=%f",rta);
+>       printf("\n");
+145c154
+< 
+---
+> 
+343c352
+<       max_seconds = crta / 1000.0 * max_packets + max_packets;
+---
+>       max_seconds = crta / 1000.0 * max_packets + max_packets + 10;
diff --git a/web/attachments/416883-check_mysql.patch b/web/attachments/416883-check_mysql.patch
new file mode 100644
index 0000000..9643a98
--- /dev/null
+++ b/web/attachments/416883-check_mysql.patch
@@ -0,0 +1,70 @@
+--- a/nagios-plugins-1.4.15/plugins/check_mysql.c       2010-07-27 22:47:16.000000000 +0200
++++ b/nagios-plugins-1.4.15/plugins/check_mysql.c       2011-06-30 11:12:09.000000000 +0200
+@@ -34,7 +34,7 @@
+ const char *copyright = "1999-2007";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+-#define SLAVERESULTSIZE 70
++#define SLAVERESULTSIZE 120
+ 
+ #include "common.h"
+ #include "utils.h"
+@@ -158,7 +158,7 @@
+ 
+                } else {
+                        /* mysql 4.x.x */
+-                       int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, i, num_fields;
++                       int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, until_cond_field = -1, last_errno_field = -1, i, num_fields;
+                        MYSQL_FIELD* fields;
+ 
+                        num_fields = mysql_num_fields(res);
+@@ -176,16 +176,25 @@
+                                        seconds_behind_field = i;
+                                        continue;
+                                }
++                               if (strcmp(fields[i].name, "Until_Condition") == 0) {
++                                       until_cond_field = i;
++                                       continue;
++                               }
++                               if (strcmp(fields[i].name, "Last_Errno") == 0) {
++                                       last_errno_field = i;
++                                       continue;
++                               }
+                        }
+ 
+-                       if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) {
++                       if ((slave_io_field < 0) || (slave_sql_field < 0) || (last_errno_field < 0) || (num_fields == 0)) {
+                                mysql_free_result (res);
+                                mysql_close (&mysql);
+                                die (STATE_CRITICAL, "Slave status unavailable\n");
+                        }
+ 
+-                       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");
+-                       if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
++                       snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s Until Condition: %s Last Errno: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown", row[until_cond_field], last_errno_field!=-1?row[last_errno_field]:"No Error");
++
++                       if ((strcmp(row[until_cond_field], "None") == 0 && (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) ) || (strcmp(row[last_errno_field], "0") != 0)) {
+                                mysql_free_result (res);
+                                mysql_close (&mysql);
+                                die (STATE_CRITICAL, "%s\n", slaveresult);
+@@ -197,9 +206,19 @@
+                                } else {
+                                        printf ("seconds_behind_field(index %d)=%s\n", seconds_behind_field, row[seconds_behind_field]);
+                                }
++                               if (until_cond_field == -1) {
++                                        printf("until_cond_field not found\n");
++                                } else {
++                                        printf ("until_cond_field(index %d)=%s\n", until_cond_field, row[until_cond_field]);
++                                }
++                                if (last_errno_field == -1) {
++                                        printf("last_errno_field not found\n");
++                                } else {
++                                        printf("last_errno_field(index %d)=%s\n", last_errno_field, row[last_errno_field]);
++                                }
+                        }
+ 
+-                       if ((seconds_behind_field != -1) && (strcmp (row[seconds_behind_field], "NULL") != 0)) {
++                       if ((seconds_behind_field != -1) && (row[seconds_behind_field] != NULL && (strcmp (row[seconds_behind_field], "NULL") != 0)) && (strcmp(row[until_cond_field], "None") == 0)) {
+                                double value = atof(row[seconds_behind_field]);
+                                int status;
+
diff --git a/web/attachments/417469-check_smtp.c.patch b/web/attachments/417469-check_smtp.c.patch
new file mode 100644
index 0000000..3c6a812
--- /dev/null
+++ b/web/attachments/417469-check_smtp.c.patch
@@ -0,0 +1,36 @@
+diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
+index ed49163..80cc0eb 100644
+--- a/plugins/check_smtp.c
++++ b/plugins/check_smtp.c
+@@ -129,6 +129,9 @@ main (int argc, char **argv)
+        char *error_msg = "";
+        struct timeval tv;
+ 
++       /* catch pipe errors in read.write */
++       (void) signal (SIGPIPE, SIG_IGN);
++
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+@@ -662,8 +665,20 @@ void
+ smtp_quit(void)
+ {
+        int bytes;
++    int n;
++
++       n = my_send(SMTP_QUIT, strlen(SMTP_QUIT));
++       if(n != 0) {
++               if(verbose) {
++                       /* Not sure this is really an unknown state so just print out instead
++                       die (STATE_UNKNOWN,
++                       */
++                       printf(
++                               _("Connection was closed by server before we could send QUIT command\n"));
++               }
++               return;
++       }
+ 
+-       my_send(SMTP_QUIT, strlen(SMTP_QUIT));
+        if (verbose)
+                printf(_("sent %s\n"), "QUIT");
+ 
diff --git a/web/attachments/418216-check_smtp.c.reworked.patch b/web/attachments/418216-check_smtp.c.reworked.patch
new file mode 100644
index 0000000..729986c
--- /dev/null
+++ b/web/attachments/418216-check_smtp.c.reworked.patch
@@ -0,0 +1,90 @@
+diff -ru nagios-plugins-1.4.15.orig/plugins/check_smtp.c nagios-plugins-1.4.15/plugins/check_smtp.c
+--- nagios-plugins-1.4.15.orig/plugins/check_smtp.c     2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15/plugins/check_smtp.c  2011-07-15 10:51:11.000000000 +0000
+@@ -114,6 +114,7 @@
+   TCP_PROTOCOL = 1,
+   UDP_PROTOCOL = 2,
+ };
++int ignore_send_quit_failure = FALSE;
+ 
+ 
+ int
+@@ -129,6 +130,9 @@
+        char *error_msg = "";
+        struct timeval tv;
+ 
++       /* catch pipe errors in read.write */
++       (void) signal (SIGPIPE, SIG_IGN);
++
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+@@ -476,6 +480,7 @@
+                {"help", no_argument, 0, 'h'},
+                {"starttls",no_argument,0,'S'},
+                {"certificate",required_argument,0,'D'},
++               {"ignore-quit-failure",no_argument,0,'q'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -492,7 +497,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:",
++               c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:q",
+                                 longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+@@ -579,6 +584,9 @@
+                case 'v':                                                                       /* verbose */
+                        verbose++;
+                        break;
++        case 'q':
++            ignore_send_quit_failure++;             /* ignore problem sending QUIT */
++            break;
+                case 't':                                                                       /* timeout */
+                        if (is_intnonneg (optarg)) {
+                                socket_timeout = atoi (optarg);
+@@ -662,8 +670,21 @@
+ smtp_quit(void)
+ {
+        int bytes;
++    int n;
++
++       n = my_send(SMTP_QUIT, strlen(SMTP_QUIT));
++       if(n != 0) {
++               if(ignore_send_quit_failure) {
++                       if(verbose) {
++                               printf(
++                                       _("Connection closed by server before sending QUIT command\n"));
++                       }
++                       return;
++               }
++               die (STATE_UNKNOWN,
++                       _("Connection closed by server before sending QUIT command\n"));
++       }
+ 
+-       my_send(SMTP_QUIT, strlen(SMTP_QUIT));
+        if (verbose)
+                printf(_("sent %s\n"), "QUIT");
+ 
+@@ -797,7 +818,9 @@
+   printf ("    %s\n", _("SMTP AUTH username"));
+   printf (" %s\n", "-P, --authpass=STRING");
+   printf ("    %s\n", _("SMTP AUTH password"));
+-
++  printf (" %s\n", "-q, --ignore-quit-failure");
++  printf ("    %s\n", _("Ignore failure when sending QUIT command to server"));
++   
+        printf (UT_WARN_CRIT);
+ 
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+@@ -821,6 +844,6 @@
+   printf ("%s\n", _("Usage:"));
+   printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
+   printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
+-  printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
++  printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6] [-q]\n");
+ }
+ 
diff --git a/web/attachments/418908-0001-check_users-use-utxent-functions-to-get-data.patch b/web/attachments/418908-0001-check_users-use-utxent-functions-to-get-data.patch
new file mode 100644
index 0000000..84043bd
--- /dev/null
+++ b/web/attachments/418908-0001-check_users-use-utxent-functions-to-get-data.patch
@@ -0,0 +1,98 @@
+From 10d9e2aadb3f7db0ab784a1843abcea570adf9ec Mon Sep 17 00:00:00 2001
+From: Marc Remy <mremy@gmx.ch>
+Date: Wed, 20 Jul 2011 21:18:42 +0200
+Subject: [PATCH] check_users: use utxent functions to get data
+
+---
+ plugins/Makefile.am   |    2 +-
+ plugins/check_users.c |   38 ++++++++------------------------------
+ 2 files changed, 9 insertions(+), 31 deletions(-)
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 36a28b0..3a2afc1 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -101,7 +101,7 @@ check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+ check_time_LDADD = $(NETLIBS)
+ check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
+ check_ups_LDADD = $(NETLIBS)
+-check_users_LDADD = $(BASEOBJS) popen.o
++check_users_LDADD = $(BASEOBJS)
+ check_by_ssh_LDADD = $(NETLIBS)
+ check_ide_smart_LDADD = $(BASEOBJS)
+ negate_LDADD = $(BASEOBJS)
+diff --git a/plugins/check_users.c b/plugins/check_users.c
+index 8368612..fb8bcca 100644
+--- a/plugins/check_users.c
++++ b/plugins/check_users.c
+@@ -35,8 +35,8 @@ const char *copyright = "2000-2007";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+ #include "common.h"
+-#include "popen.h"
+ #include "utils.h"
++#include <utmpx.h>
+ 
+ #define possibly_set(a,b) ((a) == 0 ? (b) : 0)
+ 
+@@ -54,6 +54,7 @@ main (int argc, char **argv)
+        int result = STATE_UNKNOWN;
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *perf;
++       struct utmpx *putmpx;
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -67,43 +68,20 @@ main (int argc, char **argv)
+        if (process_arguments (argc, argv) == ERROR)
+                usage4 (_("Could not parse arguments"));
+ 
+-       /* run the command */
+-       child_process = spopen (WHO_COMMAND);
+-       if (child_process == NULL) {
+-               printf (_("Could not open pipe: %s\n"), WHO_COMMAND);
+-               return STATE_UNKNOWN;
+-       }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf (_("Could not open stderr for %s\n"), WHO_COMMAND);
+-
+        users = 0;
+ 
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++       /* get currently logged users from utmpx */
++       setutxent();
+ 
+-               /* increment 'users' on all lines except total user count */
+-               if (input_buffer[0] != '#') {
++       while( (putmpx=getutxent()) ) {
++               if( (putmpx->ut_type==USER_PROCESS) ) {
+                        users++;
+-                       continue;
+                }
+-
+-               /* get total logged in users */
+-               if (sscanf (input_buffer, _("# users=%d"), &users) == 1)
+-                       break;
+-
+        }
+ 
+-       /* check STDERR */
+-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+-               result = possibly_set (result, STATE_UNKNOWN);
+-       (void) fclose (child_stderr);
+-
+-       /* close the pipe */
+-       if (spclose (child_process))
+-               result = possibly_set (result, STATE_UNKNOWN);
++       endutxent();
+ 
+-       /* else check the user count against warning and critical thresholds */
++       /* check the user count against warning and critical thresholds */
+        if (users > cusers)
+                result = STATE_CRITICAL;
+        else if (users > wusers)
+-- 
+1.7.2.5
+
diff --git a/web/attachments/419185-check_oracle_1.4.15_tsmax.patch b/web/attachments/419185-check_oracle_1.4.15_tsmax.patch
new file mode 100644
index 0000000..86a3232
--- /dev/null
+++ b/web/attachments/419185-check_oracle_1.4.15_tsmax.patch
@@ -0,0 +1,95 @@
+--- check_oracle        2010-10-07 17:11:31.000000000 +0200
++++ check_oracle_tsmax  2011-07-22 15:12:42.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ PROGNAME=`basename $0`
+ PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+-REVISION="1.4.15"
++REVISION="1.4.15-tsmax"
+ 
+ . $PROGPATH/utils.sh
+ 
+@@ -19,7 +19,7 @@
+   echo "  $PROGNAME --db <ORACLE_SID>"
+   echo "  $PROGNAME --login <ORACLE_SID>"
+   echo "  $PROGNAME --cache <ORACLE_SID> <USER> <PASS> <CRITICAL> <WARNING>"
+-  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
++  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING> [maxbytes]"
+   echo "  $PROGNAME --oranames <Hostname>"
+   echo "  $PROGNAME --help"
+   echo "  $PROGNAME --version"
+@@ -42,7 +42,7 @@
+   echo "--cache"
+   echo "   Check local database for library and buffer cache hit ratios"
+   echo "       --->  Requires Oracle user/password and SID specified."
+-  echo "                       --->  Requires select on v_$sysstat and v_$librarycache"
++  echo "                       --->  Requires select on v_\$sysstat and v_\$librarycache"
+   echo "--tablespace"
+   echo "   Check local database for tablespace capacity in ORACLE_SID"
+   echo "       --->  Requires Oracle user/password specified."
+@@ -246,12 +246,12 @@
+     result=`sqlplus -s ${3}/${4}@${2} << EOF
+ set pagesize 0
+ set numf '9999999.99'
+-select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
++select ROUND(a.maxi,0) MAXI, ROUND(a.total,0) ALLOCATED, ROUND(a.total-b.free,0) USED, ROUND(b.free,0) FREE, ROUND(a.maxi-a.total+b.free,0) FREEMAXI
+ from (
+-select tablespace_name,sum(bytes)/1024/1024 total
++select tablespace_name,sum(NVL(bytes,0))/1024/1024 total,sum(NVL(maxbytes,0))/1024/1024 maxi
+ from dba_data_files group by tablespace_name) A
+ LEFT OUTER JOIN
+-( select tablespace_name,sum(bytes)/1024/1024 free
++( select tablespace_name,sum(NVL(bytes,0))/1024/1024 free
+ from dba_free_space group by tablespace_name) B
+ ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';
+ EOF`
+@@ -262,23 +262,42 @@
+       exit $STATE_CRITICAL
+     fi
+ 
+-    ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
+-    ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
+-    ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
+-    ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
++    ts_total=
++    ts_used=
++    ts_free=
++    if [ "${8}" = "max" ]; then
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($5)}'`
++    else
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'`
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'`
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($4)}'`
++    fi
++
++    compwarn=$7;       compcrit=$6
++
++    if [ "$ts_total" = "" ]; then
++      echo "${2} : ${5} UNKNOWN - no data was returned|${5}=0%;$compwarn%;$compcrit%;0;100"
++      exit $STATE_UNKNOWN
++    fi
++
++    ts_pctx=`echo "scale=2; $ts_used/$ts_total * 100" | bc -l`
++    ts_pct=`echo "scale=0; $ts_used/$ts_total * 100" | bc -l`
++
+     if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+         echo "No data returned by Oracle - tablespace $5 not found?"
+         exit $STATE_UNKNOWN
+     fi
+     if [ "$ts_pct" -ge ${6} ] ; then
+-       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;$compwarn%;$compcrit%;0;100"
+        exit $STATE_CRITICAL
+     fi
+     if [ "$ts_pct" -ge ${7} ] ; then
+-       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;$compwarn%;$compcrit%;0;100"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;$compwarn%;$compcrit%;0;100"
+     exit $STATE_OK
+     ;;
+ *)
diff --git a/web/attachments/419186-check_oracle_1.4.15_easylogin.patch b/web/attachments/419186-check_oracle_1.4.15_easylogin.patch
new file mode 100644
index 0000000..445161a
--- /dev/null
+++ b/web/attachments/419186-check_oracle_1.4.15_easylogin.patch
@@ -0,0 +1,42 @@
+--- check_oracle        2010-10-07 17:11:31.000000000 +0200
++++ check_oracle_easylogin      2011-07-22 15:23:13.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ PROGNAME=`basename $0`
+ PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+-REVISION="1.4.15"
++REVISION="1.4.15-easylogin"
+ 
+ . $PROGPATH/utils.sh
+ 
+@@ -54,6 +54,8 @@
+   echo "--version"
+   echo "   Print version and license information"
+   echo ""
++  echo "If <USER> and <PASS> are left blank, ie. \"\", \`sqlplus -s / as sysdba\` is tried instead."
++  echo ""
+   echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+   echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+   echo "tnsnames.ora file is locatable and is properly configured."
+@@ -192,7 +194,9 @@
+        echo "UNKNOWN - Warning level is less then Crit"
+        exit $STATE_UNKNOWN
+     fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select (1-(pr.value/(dbg.value+cg.value)))*100
+@@ -243,7 +247,9 @@
+        echo "UNKNOWN - Warning level is more then Crit"
+        exit $STATE_UNKNOWN
+     fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
diff --git a/web/attachments/419187-check_oracle_negativewarncrit.patch b/web/attachments/419187-check_oracle_negativewarncrit.patch
new file mode 100644
index 0000000..2319b8b
--- /dev/null
+++ b/web/attachments/419187-check_oracle_negativewarncrit.patch
@@ -0,0 +1,201 @@
+--- check_oracle        2010-10-07 17:11:31.000000000 +0200
++++ check_oracle_negativewarncrit       2011-07-22 19:28:28.000000000 +0200
+@@ -8,10 +8,15 @@
+ 
+ PROGNAME=`basename $0`
+ PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+-REVISION="1.4.15"
++REVISION="1.4.15-negativewarncrit"
+ 
+ . $PROGPATH/utils.sh
+ 
++dflt_cachwarn="85%"
++dflt_cachcrit="95%"
++dflt_tswarn="85%"
++dflt_tscrit="95%"
++
+ 
+ print_usage() {
+   echo "Usage:"
+@@ -40,11 +45,11 @@
+   echo "--login SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+   echo "--cache"
+-  echo "   Check local database for library and buffer cache hit ratios"
++  echo "   Check local database for library and buffer cache hit ratios (default warn:$dflt_cachwarn,crit:$dflt_cachcrit)"
+   echo "       --->  Requires Oracle user/password and SID specified."
+   echo "                       --->  Requires select on v_$sysstat and v_$librarycache"
+   echo "--tablespace"
+-  echo "   Check local database for tablespace capacity in ORACLE_SID"
++  echo "   Check local database for tablespace capacity in ORACLE_SID (default warn:$dflt_tswarn,crit:$dflt_tscrit)"
+   echo "       --->  Requires Oracle user/password specified."
+   echo "                       --->  Requires select on dba_data_files and dba_free_space"
+   echo "--oranames Hostname"
+@@ -54,6 +59,10 @@
+   echo "--version"
+   echo "   Print version and license information"
+   echo ""
++  echo " <WARNING>/<CRITICAL> can either be a percentage (ie. '15%') or a size in Mega/Giga/Terabyte (ie. '2G'; dflt: M)"
++  echo " Prepend the size with minus to be notified for a certain level below the maximum value,"
++  echo " ie. '-2G' to be warned 2G before 'SIZE' (-t) or 'MAXBYTES' (-T) tablespace runs out."
++  echo ""
+   echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+   echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+   echo "tnsnames.ora file is locatable and is properly configured."
+@@ -66,6 +75,54 @@
+   support
+ }
+ 
++
++# convert_warncrit_val( warnlevel/critlevel ): returns in either % or units of M, no matter what input the user provided
++ReturnVal=
++ReturnUnit=
++convert_warncrit_val() {
++    input=$1;  totalsize=$2
++    tmp="";    tmpunit=""
++    [ `expr index "$input" "%"` -gt 1 ] && tmp=`echo "scale=0; ${input%*%} * $totalsize" | bc | sed 's/\.[0-9]*$//g'` && tmpunit="%"
++    if [ "$tmp" = "" ]; then
++      [ `expr index "$input" "G"` -gt 1 ] && tmp=$[ ${input%*G}*1000 ] && tmpunit="M"
++      [ `expr index "$input" "T"` -gt 1 ] && tmp=$[ ${input%*T}*1000*1000 ] && tmpunit="M"
++      if [ "$tmp" = "" ]; then                 # default: M
++        foo=$input
++        [ `expr index "$input" "M"` -gt 1 ] && foo=$[ ${input%*M} ] && tmpunit="M"
++        tmp=$foo
++      fi
++    fi
++
++    [ $tmp -lt 0 ] && tmp=$[ $totalsize + $tmp ]       # ie. -2G
++    [ $tmp -lt 0 ] && tmp=0                            # ie. the result of the line before was below zero => set to zero.
++
++    ReturnVal=$tmp
++    ReturnUnit=$tmpunit
++    return
++}
++
++
++# do_warncrit_test(warnlevel, critlevel)
++do_warncrit_test() {
++    convert_warncrit_val $1 100;   tmpwarn=$ReturnVal  # use "100" as "size" for percentile checks, since we don't have that already
++    convert_warncrit_val $2 100;   tmpcrit=$ReturnVal
++    
++    if [ $tmpwarn -lt 0 ]; then                                # ie. -2G
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is less than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    else
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is more than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    fi
++}
++
++
++
++
+ case "$1" in
+ 1)
+     cmd='--tns'
+@@ -188,10 +245,14 @@
+     fi
+     ;;
+ --cache)
+-    if [ ${5} -gt ${6} ] ; then
+-       echo "UNKNOWN - Warning level is less then Crit"
+-       exit $STATE_UNKNOWN
++
++    do_warncrit_test "$6" "$5"
++
++    if [ `expr index "$6" "%"` -lt 1 ]; then
++      echo "${2} UNKNOWN - cache check can only use % value for warn/crit level."
++      exit $STATE_UNKNOWN
+     fi
++
+     result=`sqlplus -s ${3}/${4}@${2} << EOF
+ set pagesize 0
+ set numf '9999999.99'
+@@ -226,23 +287,32 @@
+     lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'`
+     lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'`
+ 
+-    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
+-       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    # for actually usable warn/crit levels with higher precision number
++    convert_warncrit_val "$6" 10000;  compwarn=$ReturnVal  # $ReturnUnit is being used directly, should be of same type.
++    convert_warncrit_val "$5" 10000;  compcrit=$ReturnVal
++    # just snip of the % of the input to get perfdata
++    perfwarn=${6%*%}
++    perfcrit=${5%*%}
++
++    newbufhr=`echo "$buf_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++    newlibhr=`echo "$lib_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++
++    if [ $newbufhr -le $compcrit -o $newlibhr -le $compcrit ] ; then
++       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;100 buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;100"
+        exit $STATE_CRITICAL
+     fi
+-    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
+-       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    if [ $newbufhr -le $compwarn -o $newlibhr -le $compwarn ] ; then
++       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;100 buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;100"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;100 buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;100"
+ 
+     exit $STATE_OK
+     ;;
+ --tablespace)
+-    if [ ${6} -lt ${7} ] ; then
+-       echo "UNKNOWN - Warning level is more then Crit"
+-       exit $STATE_UNKNOWN
+-    fi
++
++    do_warncrit_test "$7" "$6"
++
+     result=`sqlplus -s ${3}/${4}@${2} << EOF
+ set pagesize 0
+ set numf '9999999.99'
+@@ -258,7 +328,7 @@
+ 
+     if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
+-      echo "CRITICAL - $error"
++      echo "${2} : ${5} CRITICAL - $error"
+       exit $STATE_CRITICAL
+     fi
+ 
+@@ -266,19 +336,26 @@
+     ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
+     ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
+     ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
++
++    convert_warncrit_val "$7" $ts_total;   compwarn=$ReturnVal # $ReturnUnit is either % or M for the perfdata
++    convert_warncrit_val "$6" $ts_total;   compcrit=$ReturnVal
++
++    perfused=$ts_pctx
++    [ "$ReturnUnit" != "%" ] && perfused=$[ $ts_total - $ts_free ] && ReturnUnit="M"
++
+     if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+-        echo "No data returned by Oracle - tablespace $5 not found?"
++        echo "${2} : ${5} UNKNOWN - No data returned by Oracle - tablespace $5 not found?"
+         exit $STATE_UNKNOWN
+     fi
+-    if [ "$ts_pct" -ge ${6} ] ; then
+-       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compcrit" ] ; then
++       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;100"
+        exit $STATE_CRITICAL
+     fi
+-    if [ "$ts_pct" -ge ${7} ] ; then
+-       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compwarn" ] ; then
++       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;100"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;100"
+     exit $STATE_OK
+     ;;
+ *)
diff --git a/web/attachments/41928-check_ssh.diff b/web/attachments/41928-check_ssh.diff
new file mode 100644
index 0000000..fce5ad2
--- /dev/null
+++ b/web/attachments/41928-check_ssh.diff
@@ -0,0 +1,139 @@
+Index: plugins/check_ssh.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ssh.c,v
+retrieving revision 1.4
+diff -u -r1.4 check_ssh.c
+--- plugins/check_ssh.c 13 Jan 2003 12:15:16 -0000      1.4
++++ plugins/check_ssh.c 9 Feb 2003 19:32:30 -0000
+@@ -34,7 +34,6 @@
+ void print_help (void);
+ void print_usage (void);
+ 
+-char *ssh_resolve (char *hostname);
+ int ssh_connect (char *haddr, short hport);
+ 
+ int
+@@ -49,7 +48,7 @@
+        alarm (socket_timeout);
+ 
+        /* ssh_connect exits if error is found */
+-       ssh_connect (ssh_resolve (server_name), port);
++       ssh_connect (server_name, port);
+ 
+        alarm (0);
+ 
+@@ -62,6 +61,7 @@
+ process_arguments (int argc, char **argv)
+ {
+        int c;
++       char *tmp = NULL;
+ 
+ #ifdef HAVE_GETOPT_H
+        int option_index = 0;
+@@ -109,6 +109,8 @@
+                        socket_timeout = atoi (optarg);
+                        break;
+                case 'H':                                                                       /* host */
++                       if (is_host (optarg) == FALSE)
++                               usage ("Invalid hostname/address\n");
+                        server_name = optarg;
+                        break;
+                case 'p':                                                                       /* port */
+@@ -125,9 +127,12 @@
+ 
+        c = optind;
+        if (server_name == NULL && argv[c]) {
+-               server_name = argv[c++];
++               if (is_host (argv[c])) {
++                       server_name = argv[c++];
++               }
+        }
+-       else if (port == -1 && argv[c]) {
++
++       if (port == -1 && argv[c]) {
+                if (is_intpos (argv[c])) {
+                        port = atoi (argv[c++]);
+                }
+@@ -153,26 +158,6 @@
+ 
+ /************************************************************************
+ *
+-* Resolve hostname into IP address
+-*
+-*-----------------------------------------------------------------------*/
+-
+-char *
+-ssh_resolve (char *hostname)
+-{
+-       struct hostent *host;
+-
+-       host = gethostbyname (hostname);
+-       if (!host) {
+-               herror (hostname);
+-               exit (STATE_CRITICAL);
+-       }
+-       return (host->h_addr);
+-}
+-
+-
+-/************************************************************************
+-*
+ * Try to connect to SSH server at specified server and port
+ *
+ *-----------------------------------------------------------------------*/
+@@ -180,39 +165,24 @@
+ int
+ ssh_connect (char *haddr, short hport)
+ {
+-       int s;
+-       struct sockaddr_in addr;
+-       int addrlen;
+-       int len;
++       int sock;
++       int result;
+        char *output = NULL;
+        char *buffer = NULL;
+        char *ssh_proto = NULL;
+        char *ssh_server = NULL;
+        char revision[20];
+ 
+-       sscanf ("$Revision: 1.4 $", "$Revision: %[0123456789.]", revision);
++       sscanf ("$Revision: 1.4 $", "$Revision: %[0-9.]", revision);
+ 
+-       addrlen = sizeof (addr);
+-       memset (&addr, 0, addrlen);
+-       addr.sin_port = htons (hport);
+-       addr.sin_family = AF_INET;
+-       bcopy (haddr, (void *) &addr.sin_addr.s_addr, 4);
+-
+-       s = socket (AF_INET, SOCK_STREAM, 0);
+-       if (!s) {
+-               printf ("socket(): %s for %s:%d\n", strerror (errno), server_name, hport);
+-               exit (STATE_CRITICAL);
+-       }
++       result = my_tcp_connect (haddr, hport, &sock);
+ 
+-       if (connect (s, (struct sockaddr *) &addr, addrlen)) {
+-               printf ("connect(): %s for %s:%d\n", strerror (errno), server_name,
+-                                               hport);
+-               exit (STATE_CRITICAL);
+-       }
++       if (result != STATE_OK)
++               return result;
+ 
+        output = (char *) malloc (BUFF_SZ + 1);
+        memset (output, 0, BUFF_SZ + 1);
+-       recv (s, output, BUFF_SZ, 0);
++       recv (sock, output, BUFF_SZ, 0);
+        if (strncmp (output, "SSH", 3)) {
+                printf ("Server answer: %s", output);
+                exit (STATE_CRITICAL);
+@@ -228,7 +198,7 @@
+                        ("SSH ok - %s (protocol %s)\n",
+                         ssh_server, ssh_proto);
+                asprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, revision);
+-               send (s, buffer, strlen (buffer), MSG_DONTWAIT);
++               send (sock, buffer, strlen (buffer), MSG_DONTWAIT);
+                if (verbose)
+                        printf ("%s\n", buffer);
+                exit (STATE_OK);
diff --git a/web/attachments/420073-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch b/web/attachments/420073-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch
new file mode 100644
index 0000000..c4b1b19
--- /dev/null
+++ b/web/attachments/420073-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch
@@ -0,0 +1,298 @@
+--- check_oracle        2010-10-07 17:11:31.000000000 +0200
++++ co  2011-08-02 18:23:37.000000000 +0200
+@@ -8,18 +8,24 @@
+ 
+ PROGNAME=`basename $0`
+ PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+-REVISION="1.4.15"
++REVISION="1.4.15-negativewarncrit"
+ 
+ . $PROGPATH/utils.sh
+ 
++dflt_cachwarn="95%"
++dflt_cachcrit="97%"
++dflt_tswarn="85%"
++dflt_tscrit="95%"
++dflt_tsname="SYSTEM"
++
+ 
+ print_usage() {
+   echo "Usage:"
+   echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+   echo "  $PROGNAME --db <ORACLE_SID>"
+   echo "  $PROGNAME --login <ORACLE_SID>"
+-  echo "  $PROGNAME --cache <ORACLE_SID> <USER> <PASS> <CRITICAL> <WARNING>"
+-  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
++  echo "  $PROGNAME --cache <ORACLE_SID> [USER] [PASS] [CRITICAL] [WARNING]"
++  echo "  $PROGNAME --tablespace <ORACLE_SID> [USER] [PASS] [TABLESPACE] [CRITICAL] [WARNING] [maxbytes]"
+   echo "  $PROGNAME --oranames <Hostname>"
+   echo "  $PROGNAME --help"
+   echo "  $PROGNAME --version"
+@@ -40,11 +46,11 @@
+   echo "--login SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+   echo "--cache"
+-  echo "   Check local database for library and buffer cache hit ratios"
++  echo "   Check local database for library and buffer cache hit ratios (default warn:$dflt_cachwarn,crit:$dflt_cachcrit)"
+   echo "       --->  Requires Oracle user/password and SID specified."
+-  echo "                       --->  Requires select on v_$sysstat and v_$librarycache"
++  echo "                       --->  Requires select on v_\$sysstat and v_\$librarycache"
+   echo "--tablespace"
+-  echo "   Check local database for tablespace capacity in ORACLE_SID"
++  echo "   Check local database for tablespace capacity in ORACLE_SID (default warn:$dflt_tswarn,crit:$dflt_tscrit,ts:$dflt_tsname)"
+   echo "       --->  Requires Oracle user/password specified."
+   echo "                       --->  Requires select on dba_data_files and dba_free_space"
+   echo "--oranames Hostname"
+@@ -54,6 +60,12 @@
+   echo "--version"
+   echo "   Print version and license information"
+   echo ""
++  echo " <WARNING>/<CRITICAL> can either be a percentage (ie. '15%') or a size in Mega/Giga/Terabyte (ie. '2G'; dflt: M)"
++  echo " Prepend the size with minus to be notified for a certain level below the maximum value,"
++  echo " ie. '-2G' to be warned 2G before 'SIZE' (-t) or 'MAXBYTES' (-T) tablespace runs out."
++  echo ""
++  echo "If <USER> and <PASS> are left blank, ie. \"\", \`sqlplus -s / as sysdba\` is tried instead."
++  echo ""
+   echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+   echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+   echo "tnsnames.ora file is locatable and is properly configured."
+@@ -66,6 +78,54 @@
+   support
+ }
+ 
++
++# convert_warncrit_val( warnlevel/critlevel ): returns in either % or units of M, no matter what input the user provided
++ReturnVal=
++ReturnUnit=
++convert_warncrit_val() {
++    input=$1;  totalsize=$2
++    tmp=0;     tmpunit=""
++    [ `expr index "$input" "%"` -gt 1 ] && tmp=`echo "scale=0; ${input%*%} * $totalsize" | bc | sed 's/\.[0-9]*$//g'` && tmpunit="%"
++    if [ "$tmp" = "0" ]; then
++      [ `expr index "$input" "G"` -gt 1 ] && tmp=$[ ${input%*G}*1000 ] && tmpunit="M"
++      [ `expr index "$input" "T"` -gt 1 ] && tmp=$[ ${input%*T}*1000*1000 ] && tmpunit="M"
++      if [ "$tmp" = "0" ]; then                        # default: M
++        foo=$input
++        [ `expr index "$input" "M"` -gt 1 ] && foo=$[ ${input%*M} ] && tmpunit="M"
++        tmp=$foo
++      fi
++    fi
++
++    [ $tmp -lt 0 ] && tmp=$[ $totalsize + $tmp ]       # ie. -2G
++    [ $tmp -lt 0 ] && tmp=0                            # ie. the result of the line before was below zero => set to zero.
++
++    ReturnVal=$tmp
++    ReturnUnit=$tmpunit
++    return
++}
++
++
++# do_warncrit_test(warnlevel, critlevel)
++do_warncrit_test() {
++    convert_warncrit_val $1 100;   tmpwarn=$ReturnVal  # use "100" as "size" for percentile checks, since we don't have that already
++    convert_warncrit_val $2 100;   tmpcrit=$ReturnVal
++    
++    if [ $tmpwarn -lt 0 ]; then                                # ie. -2G
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is less than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    else
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is more than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    fi
++}
++
++
++
++
+ case "$1" in
+ 1)
+     cmd='--tns'
+@@ -171,8 +231,13 @@
+            #exit $STATE_OK
+        #fi
+     else
+-       echo "${2} Database is DOWN"
+-       exit $STATE_CRITICAL
++       if [ "${2}" != "" ]; then
++         echo "${2} - Database is DOWN (or doesn't exist)"
++         exit $STATE_CRITICAL
++       else
++          echo "UNKNOWN - Please supply a database name"
++          exit $STATE_UNKNOWN
++       fi
+     fi
+     ;;
+ --login)
+@@ -188,11 +253,24 @@
+     fi
+     ;;
+ --cache)
+-    if [ ${5} -gt ${6} ] ; then
+-       echo "UNKNOWN - Warning level is less then Crit"
+-       exit $STATE_UNKNOWN
++
++    [ "$#" -lt 2 ] && print_usage && exit      # use empty user/pass for default connection / as sysdba, use empty warncrit for dflt-warncrit
++
++    realwarn=$dflt_cachwarn
++    realcrit=$dflt_cachcrit
++    [ "$6" != "" ] && realwarn=$6
++    [ "$5" != "" ] && realcrit=$5
++
++    do_warncrit_test "$realwarn" "$realcrit"
++
++    if [ `expr index "$realwarn" "%"` -lt 1 ]; then
++      echo "${2} UNKNOWN - cache check can only use % value for warn/crit level."
++      exit $STATE_UNKNOWN
+     fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select (1-(pr.value/(dbg.value+cg.value)))*100
+@@ -210,7 +288,7 @@
+ 
+     buf_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` 
+     buf_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` 
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
+@@ -226,59 +304,105 @@
+     lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'`
+     lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'`
+ 
+-    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
+-       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    # for actually usable warn/crit levels with higher precision number
++    convert_warncrit_val "$realwarn" 10000;  compwarn=$ReturnVal  # $ReturnUnit is being used directly, should be of same type.
++    convert_warncrit_val "$realcrit" 10000;  compcrit=$ReturnVal
++    # just snip of the % of the input to get perfdata
++    perfwarn=${realwarn%*%}
++    perfcrit=${realcrit%*%}
++
++    newbufhr=`echo "$buf_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++    newlibhr=`echo "$lib_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++
++    if [ $newbufhr -le $compcrit -o $newlibhr -le $compcrit ] ; then
++       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+        exit $STATE_CRITICAL
+     fi
+-    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
+-       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    if [ $newbufhr -le $compwarn -o $newlibhr -le $compwarn ] ; then
++       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+ 
+     exit $STATE_OK
+     ;;
+ --tablespace)
+-    if [ ${6} -lt ${7} ] ; then
+-       echo "UNKNOWN - Warning level is more then Crit"
+-       exit $STATE_UNKNOWN
+-    fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++
++    [ "$#" -lt 2 ] && print_usage && exit      # use empty user/pass for default connection / as sysdba, use empty warncrit for dflt-warncrit...
++
++    tsname="$dflt_tsname"
++    [ -n "$5" ] && tsname="$5"
++
++    realwarn="$dflt_tswarn"
++    realcrit="$dflt_tscrit"
++    [ "$7" != "" ] && realwarn="$7"
++    [ "$6" != "" ] && realcrit="$6"
++    do_warncrit_test "$realwarn" "$realcrit"
++
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+-select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
++select ROUND(a.maxi,0) MAXI, ROUND(a.total,0) ALLOCATED, ROUND(a.total-b.free,0) USED, ROUND(b.free,0) FREE, ROUND(a.maxi-a.total+b.free,0) FREEMAXI
+ from (
+-select tablespace_name,sum(bytes)/1024/1024 total
++select tablespace_name,sum(NVL(bytes,0))/1024/1024 total,sum(NVL(maxbytes,0))/1024/1024 maxi
+ from dba_data_files group by tablespace_name) A
+ LEFT OUTER JOIN
+-( select tablespace_name,sum(bytes)/1024/1024 free
++( select tablespace_name,sum(NVL(bytes,0))/1024/1024 free
+ from dba_free_space group by tablespace_name) B
+-ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';
++ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${tsname}';
+ EOF`
+ 
+     if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
+-      echo "CRITICAL - $error"
++      echo "${2} : ${tsname} CRITICAL - $error"
+       exit $STATE_CRITICAL
+     fi
+ 
+-    ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
+-    ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
+-    ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
+-    ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
++    ts_total=
++    ts_used=
++    ts_free=
++    if [ "${8}" = "max" ]; then
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($5)}'`
++    else
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'`
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'`
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($4)}'`
++    fi
++ 
++    if [ "$ts_total" = "" ]; then
++      echo "${2} : ${tsname} UNKNOWN - no data was returned"
++      exit $STATE_UNKNOWN
++    fi
++ 
++    ts_pctx=`echo "scale=2; $ts_used/$ts_total * 100" | bc -l`
++    ts_pct=`echo "scale=0; $ts_used/$ts_total * 100" | bc -l`
++
++    # if percentage supplied, use percentage in perfdata
++    [ `expr index "%" "$realwarn"` -gt 0 ] && ts_total=1
++
++    convert_warncrit_val "$realwarn" $ts_total;   compwarn=$ReturnVal # $ReturnUnit is either % or M for the perfdata
++    convert_warncrit_val "$realcrit" $ts_total;   compcrit=$ReturnVal
++
++    perfused=$ts_pctx
++    [ "$ReturnUnit" != "%" ] && perfused=$[ $ts_total - $ts_free ] && ReturnUnit="M"
++
+     if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+-        echo "No data returned by Oracle - tablespace $5 not found?"
++        echo "${2} : ${tsname} UNKNOWN - No data returned by Oracle - tablespace ${tsname} not found?"
+         exit $STATE_UNKNOWN
+     fi
+-    if [ "$ts_pct" -ge ${6} ] ; then
+-       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compcrit" ] ; then
++       echo "${2} : ${tsname} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+        exit $STATE_CRITICAL
+     fi
+-    if [ "$ts_pct" -ge ${7} ] ; then
+-       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compwarn" ] ; then
++       echo "${2} : ${tsname} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    echo "${2} : ${tsname} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+     exit $STATE_OK
+     ;;
+ *)
diff --git a/web/attachments/420074-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch b/web/attachments/420074-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch
new file mode 100644
index 0000000..c4b1b19
--- /dev/null
+++ b/web/attachments/420074-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch
@@ -0,0 +1,298 @@
+--- check_oracle        2010-10-07 17:11:31.000000000 +0200
++++ co  2011-08-02 18:23:37.000000000 +0200
+@@ -8,18 +8,24 @@
+ 
+ PROGNAME=`basename $0`
+ PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+-REVISION="1.4.15"
++REVISION="1.4.15-negativewarncrit"
+ 
+ . $PROGPATH/utils.sh
+ 
++dflt_cachwarn="95%"
++dflt_cachcrit="97%"
++dflt_tswarn="85%"
++dflt_tscrit="95%"
++dflt_tsname="SYSTEM"
++
+ 
+ print_usage() {
+   echo "Usage:"
+   echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+   echo "  $PROGNAME --db <ORACLE_SID>"
+   echo "  $PROGNAME --login <ORACLE_SID>"
+-  echo "  $PROGNAME --cache <ORACLE_SID> <USER> <PASS> <CRITICAL> <WARNING>"
+-  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
++  echo "  $PROGNAME --cache <ORACLE_SID> [USER] [PASS] [CRITICAL] [WARNING]"
++  echo "  $PROGNAME --tablespace <ORACLE_SID> [USER] [PASS] [TABLESPACE] [CRITICAL] [WARNING] [maxbytes]"
+   echo "  $PROGNAME --oranames <Hostname>"
+   echo "  $PROGNAME --help"
+   echo "  $PROGNAME --version"
+@@ -40,11 +46,11 @@
+   echo "--login SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+   echo "--cache"
+-  echo "   Check local database for library and buffer cache hit ratios"
++  echo "   Check local database for library and buffer cache hit ratios (default warn:$dflt_cachwarn,crit:$dflt_cachcrit)"
+   echo "       --->  Requires Oracle user/password and SID specified."
+-  echo "                       --->  Requires select on v_$sysstat and v_$librarycache"
++  echo "                       --->  Requires select on v_\$sysstat and v_\$librarycache"
+   echo "--tablespace"
+-  echo "   Check local database for tablespace capacity in ORACLE_SID"
++  echo "   Check local database for tablespace capacity in ORACLE_SID (default warn:$dflt_tswarn,crit:$dflt_tscrit,ts:$dflt_tsname)"
+   echo "       --->  Requires Oracle user/password specified."
+   echo "                       --->  Requires select on dba_data_files and dba_free_space"
+   echo "--oranames Hostname"
+@@ -54,6 +60,12 @@
+   echo "--version"
+   echo "   Print version and license information"
+   echo ""
++  echo " <WARNING>/<CRITICAL> can either be a percentage (ie. '15%') or a size in Mega/Giga/Terabyte (ie. '2G'; dflt: M)"
++  echo " Prepend the size with minus to be notified for a certain level below the maximum value,"
++  echo " ie. '-2G' to be warned 2G before 'SIZE' (-t) or 'MAXBYTES' (-T) tablespace runs out."
++  echo ""
++  echo "If <USER> and <PASS> are left blank, ie. \"\", \`sqlplus -s / as sysdba\` is tried instead."
++  echo ""
+   echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+   echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+   echo "tnsnames.ora file is locatable and is properly configured."
+@@ -66,6 +78,54 @@
+   support
+ }
+ 
++
++# convert_warncrit_val( warnlevel/critlevel ): returns in either % or units of M, no matter what input the user provided
++ReturnVal=
++ReturnUnit=
++convert_warncrit_val() {
++    input=$1;  totalsize=$2
++    tmp=0;     tmpunit=""
++    [ `expr index "$input" "%"` -gt 1 ] && tmp=`echo "scale=0; ${input%*%} * $totalsize" | bc | sed 's/\.[0-9]*$//g'` && tmpunit="%"
++    if [ "$tmp" = "0" ]; then
++      [ `expr index "$input" "G"` -gt 1 ] && tmp=$[ ${input%*G}*1000 ] && tmpunit="M"
++      [ `expr index "$input" "T"` -gt 1 ] && tmp=$[ ${input%*T}*1000*1000 ] && tmpunit="M"
++      if [ "$tmp" = "0" ]; then                        # default: M
++        foo=$input
++        [ `expr index "$input" "M"` -gt 1 ] && foo=$[ ${input%*M} ] && tmpunit="M"
++        tmp=$foo
++      fi
++    fi
++
++    [ $tmp -lt 0 ] && tmp=$[ $totalsize + $tmp ]       # ie. -2G
++    [ $tmp -lt 0 ] && tmp=0                            # ie. the result of the line before was below zero => set to zero.
++
++    ReturnVal=$tmp
++    ReturnUnit=$tmpunit
++    return
++}
++
++
++# do_warncrit_test(warnlevel, critlevel)
++do_warncrit_test() {
++    convert_warncrit_val $1 100;   tmpwarn=$ReturnVal  # use "100" as "size" for percentile checks, since we don't have that already
++    convert_warncrit_val $2 100;   tmpcrit=$ReturnVal
++    
++    if [ $tmpwarn -lt 0 ]; then                                # ie. -2G
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is less than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    else
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is more than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    fi
++}
++
++
++
++
+ case "$1" in
+ 1)
+     cmd='--tns'
+@@ -171,8 +231,13 @@
+            #exit $STATE_OK
+        #fi
+     else
+-       echo "${2} Database is DOWN"
+-       exit $STATE_CRITICAL
++       if [ "${2}" != "" ]; then
++         echo "${2} - Database is DOWN (or doesn't exist)"
++         exit $STATE_CRITICAL
++       else
++          echo "UNKNOWN - Please supply a database name"
++          exit $STATE_UNKNOWN
++       fi
+     fi
+     ;;
+ --login)
+@@ -188,11 +253,24 @@
+     fi
+     ;;
+ --cache)
+-    if [ ${5} -gt ${6} ] ; then
+-       echo "UNKNOWN - Warning level is less then Crit"
+-       exit $STATE_UNKNOWN
++
++    [ "$#" -lt 2 ] && print_usage && exit      # use empty user/pass for default connection / as sysdba, use empty warncrit for dflt-warncrit
++
++    realwarn=$dflt_cachwarn
++    realcrit=$dflt_cachcrit
++    [ "$6" != "" ] && realwarn=$6
++    [ "$5" != "" ] && realcrit=$5
++
++    do_warncrit_test "$realwarn" "$realcrit"
++
++    if [ `expr index "$realwarn" "%"` -lt 1 ]; then
++      echo "${2} UNKNOWN - cache check can only use % value for warn/crit level."
++      exit $STATE_UNKNOWN
+     fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select (1-(pr.value/(dbg.value+cg.value)))*100
+@@ -210,7 +288,7 @@
+ 
+     buf_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` 
+     buf_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` 
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
+@@ -226,59 +304,105 @@
+     lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'`
+     lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'`
+ 
+-    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
+-       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    # for actually usable warn/crit levels with higher precision number
++    convert_warncrit_val "$realwarn" 10000;  compwarn=$ReturnVal  # $ReturnUnit is being used directly, should be of same type.
++    convert_warncrit_val "$realcrit" 10000;  compcrit=$ReturnVal
++    # just snip of the % of the input to get perfdata
++    perfwarn=${realwarn%*%}
++    perfcrit=${realcrit%*%}
++
++    newbufhr=`echo "$buf_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++    newlibhr=`echo "$lib_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++
++    if [ $newbufhr -le $compcrit -o $newlibhr -le $compcrit ] ; then
++       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+        exit $STATE_CRITICAL
+     fi
+-    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
+-       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    if [ $newbufhr -le $compwarn -o $newlibhr -le $compwarn ] ; then
++       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+ 
+     exit $STATE_OK
+     ;;
+ --tablespace)
+-    if [ ${6} -lt ${7} ] ; then
+-       echo "UNKNOWN - Warning level is more then Crit"
+-       exit $STATE_UNKNOWN
+-    fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++
++    [ "$#" -lt 2 ] && print_usage && exit      # use empty user/pass for default connection / as sysdba, use empty warncrit for dflt-warncrit...
++
++    tsname="$dflt_tsname"
++    [ -n "$5" ] && tsname="$5"
++
++    realwarn="$dflt_tswarn"
++    realcrit="$dflt_tscrit"
++    [ "$7" != "" ] && realwarn="$7"
++    [ "$6" != "" ] && realcrit="$6"
++    do_warncrit_test "$realwarn" "$realcrit"
++
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+-select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
++select ROUND(a.maxi,0) MAXI, ROUND(a.total,0) ALLOCATED, ROUND(a.total-b.free,0) USED, ROUND(b.free,0) FREE, ROUND(a.maxi-a.total+b.free,0) FREEMAXI
+ from (
+-select tablespace_name,sum(bytes)/1024/1024 total
++select tablespace_name,sum(NVL(bytes,0))/1024/1024 total,sum(NVL(maxbytes,0))/1024/1024 maxi
+ from dba_data_files group by tablespace_name) A
+ LEFT OUTER JOIN
+-( select tablespace_name,sum(bytes)/1024/1024 free
++( select tablespace_name,sum(NVL(bytes,0))/1024/1024 free
+ from dba_free_space group by tablespace_name) B
+-ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';
++ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${tsname}';
+ EOF`
+ 
+     if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
+-      echo "CRITICAL - $error"
++      echo "${2} : ${tsname} CRITICAL - $error"
+       exit $STATE_CRITICAL
+     fi
+ 
+-    ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
+-    ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
+-    ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
+-    ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
++    ts_total=
++    ts_used=
++    ts_free=
++    if [ "${8}" = "max" ]; then
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($5)}'`
++    else
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'`
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'`
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($4)}'`
++    fi
++ 
++    if [ "$ts_total" = "" ]; then
++      echo "${2} : ${tsname} UNKNOWN - no data was returned"
++      exit $STATE_UNKNOWN
++    fi
++ 
++    ts_pctx=`echo "scale=2; $ts_used/$ts_total * 100" | bc -l`
++    ts_pct=`echo "scale=0; $ts_used/$ts_total * 100" | bc -l`
++
++    # if percentage supplied, use percentage in perfdata
++    [ `expr index "%" "$realwarn"` -gt 0 ] && ts_total=1
++
++    convert_warncrit_val "$realwarn" $ts_total;   compwarn=$ReturnVal # $ReturnUnit is either % or M for the perfdata
++    convert_warncrit_val "$realcrit" $ts_total;   compcrit=$ReturnVal
++
++    perfused=$ts_pctx
++    [ "$ReturnUnit" != "%" ] && perfused=$[ $ts_total - $ts_free ] && ReturnUnit="M"
++
+     if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+-        echo "No data returned by Oracle - tablespace $5 not found?"
++        echo "${2} : ${tsname} UNKNOWN - No data returned by Oracle - tablespace ${tsname} not found?"
+         exit $STATE_UNKNOWN
+     fi
+-    if [ "$ts_pct" -ge ${6} ] ; then
+-       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compcrit" ] ; then
++       echo "${2} : ${tsname} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+        exit $STATE_CRITICAL
+     fi
+-    if [ "$ts_pct" -ge ${7} ] ; then
+-       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compwarn" ] ; then
++       echo "${2} : ${tsname} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    echo "${2} : ${tsname} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+     exit $STATE_OK
+     ;;
+ *)
diff --git a/web/attachments/420075-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch b/web/attachments/420075-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch
new file mode 100644
index 0000000..c4b1b19
--- /dev/null
+++ b/web/attachments/420075-check_oracle_1.4.15_tsmax_negwarncritlev_easymode_bugfixcache_bugfixperfdatatsmax.patch
@@ -0,0 +1,298 @@
+--- check_oracle        2010-10-07 17:11:31.000000000 +0200
++++ co  2011-08-02 18:23:37.000000000 +0200
+@@ -8,18 +8,24 @@
+ 
+ PROGNAME=`basename $0`
+ PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+-REVISION="1.4.15"
++REVISION="1.4.15-negativewarncrit"
+ 
+ . $PROGPATH/utils.sh
+ 
++dflt_cachwarn="95%"
++dflt_cachcrit="97%"
++dflt_tswarn="85%"
++dflt_tscrit="95%"
++dflt_tsname="SYSTEM"
++
+ 
+ print_usage() {
+   echo "Usage:"
+   echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+   echo "  $PROGNAME --db <ORACLE_SID>"
+   echo "  $PROGNAME --login <ORACLE_SID>"
+-  echo "  $PROGNAME --cache <ORACLE_SID> <USER> <PASS> <CRITICAL> <WARNING>"
+-  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
++  echo "  $PROGNAME --cache <ORACLE_SID> [USER] [PASS] [CRITICAL] [WARNING]"
++  echo "  $PROGNAME --tablespace <ORACLE_SID> [USER] [PASS] [TABLESPACE] [CRITICAL] [WARNING] [maxbytes]"
+   echo "  $PROGNAME --oranames <Hostname>"
+   echo "  $PROGNAME --help"
+   echo "  $PROGNAME --version"
+@@ -40,11 +46,11 @@
+   echo "--login SID"
+   echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+   echo "--cache"
+-  echo "   Check local database for library and buffer cache hit ratios"
++  echo "   Check local database for library and buffer cache hit ratios (default warn:$dflt_cachwarn,crit:$dflt_cachcrit)"
+   echo "       --->  Requires Oracle user/password and SID specified."
+-  echo "                       --->  Requires select on v_$sysstat and v_$librarycache"
++  echo "                       --->  Requires select on v_\$sysstat and v_\$librarycache"
+   echo "--tablespace"
+-  echo "   Check local database for tablespace capacity in ORACLE_SID"
++  echo "   Check local database for tablespace capacity in ORACLE_SID (default warn:$dflt_tswarn,crit:$dflt_tscrit,ts:$dflt_tsname)"
+   echo "       --->  Requires Oracle user/password specified."
+   echo "                       --->  Requires select on dba_data_files and dba_free_space"
+   echo "--oranames Hostname"
+@@ -54,6 +60,12 @@
+   echo "--version"
+   echo "   Print version and license information"
+   echo ""
++  echo " <WARNING>/<CRITICAL> can either be a percentage (ie. '15%') or a size in Mega/Giga/Terabyte (ie. '2G'; dflt: M)"
++  echo " Prepend the size with minus to be notified for a certain level below the maximum value,"
++  echo " ie. '-2G' to be warned 2G before 'SIZE' (-t) or 'MAXBYTES' (-T) tablespace runs out."
++  echo ""
++  echo "If <USER> and <PASS> are left blank, ie. \"\", \`sqlplus -s / as sysdba\` is tried instead."
++  echo ""
+   echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+   echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+   echo "tnsnames.ora file is locatable and is properly configured."
+@@ -66,6 +78,54 @@
+   support
+ }
+ 
++
++# convert_warncrit_val( warnlevel/critlevel ): returns in either % or units of M, no matter what input the user provided
++ReturnVal=
++ReturnUnit=
++convert_warncrit_val() {
++    input=$1;  totalsize=$2
++    tmp=0;     tmpunit=""
++    [ `expr index "$input" "%"` -gt 1 ] && tmp=`echo "scale=0; ${input%*%} * $totalsize" | bc | sed 's/\.[0-9]*$//g'` && tmpunit="%"
++    if [ "$tmp" = "0" ]; then
++      [ `expr index "$input" "G"` -gt 1 ] && tmp=$[ ${input%*G}*1000 ] && tmpunit="M"
++      [ `expr index "$input" "T"` -gt 1 ] && tmp=$[ ${input%*T}*1000*1000 ] && tmpunit="M"
++      if [ "$tmp" = "0" ]; then                        # default: M
++        foo=$input
++        [ `expr index "$input" "M"` -gt 1 ] && foo=$[ ${input%*M} ] && tmpunit="M"
++        tmp=$foo
++      fi
++    fi
++
++    [ $tmp -lt 0 ] && tmp=$[ $totalsize + $tmp ]       # ie. -2G
++    [ $tmp -lt 0 ] && tmp=0                            # ie. the result of the line before was below zero => set to zero.
++
++    ReturnVal=$tmp
++    ReturnUnit=$tmpunit
++    return
++}
++
++
++# do_warncrit_test(warnlevel, critlevel)
++do_warncrit_test() {
++    convert_warncrit_val $1 100;   tmpwarn=$ReturnVal  # use "100" as "size" for percentile checks, since we don't have that already
++    convert_warncrit_val $2 100;   tmpcrit=$ReturnVal
++    
++    if [ $tmpwarn -lt 0 ]; then                                # ie. -2G
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is less than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    else
++      if [ $tmpwarn -gt $tmpcrit ]; then
++        echo "UNKNOWN - Warning level is more than Crit"
++        exit $STATE_UNKNOWN
++      fi
++    fi
++}
++
++
++
++
+ case "$1" in
+ 1)
+     cmd='--tns'
+@@ -171,8 +231,13 @@
+            #exit $STATE_OK
+        #fi
+     else
+-       echo "${2} Database is DOWN"
+-       exit $STATE_CRITICAL
++       if [ "${2}" != "" ]; then
++         echo "${2} - Database is DOWN (or doesn't exist)"
++         exit $STATE_CRITICAL
++       else
++          echo "UNKNOWN - Please supply a database name"
++          exit $STATE_UNKNOWN
++       fi
+     fi
+     ;;
+ --login)
+@@ -188,11 +253,24 @@
+     fi
+     ;;
+ --cache)
+-    if [ ${5} -gt ${6} ] ; then
+-       echo "UNKNOWN - Warning level is less then Crit"
+-       exit $STATE_UNKNOWN
++
++    [ "$#" -lt 2 ] && print_usage && exit      # use empty user/pass for default connection / as sysdba, use empty warncrit for dflt-warncrit
++
++    realwarn=$dflt_cachwarn
++    realcrit=$dflt_cachcrit
++    [ "$6" != "" ] && realwarn=$6
++    [ "$5" != "" ] && realcrit=$5
++
++    do_warncrit_test "$realwarn" "$realcrit"
++
++    if [ `expr index "$realwarn" "%"` -lt 1 ]; then
++      echo "${2} UNKNOWN - cache check can only use % value for warn/crit level."
++      exit $STATE_UNKNOWN
+     fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select (1-(pr.value/(dbg.value+cg.value)))*100
+@@ -210,7 +288,7 @@
+ 
+     buf_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` 
+     buf_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` 
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+ select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
+@@ -226,59 +304,105 @@
+     lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'`
+     lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'`
+ 
+-    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
+-       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    # for actually usable warn/crit levels with higher precision number
++    convert_warncrit_val "$realwarn" 10000;  compwarn=$ReturnVal  # $ReturnUnit is being used directly, should be of same type.
++    convert_warncrit_val "$realcrit" 10000;  compcrit=$ReturnVal
++    # just snip of the % of the input to get perfdata
++    perfwarn=${realwarn%*%}
++    perfcrit=${realcrit%*%}
++
++    newbufhr=`echo "$buf_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++    newlibhr=`echo "$lib_hrx * 10000" | bc -l | sed 's/\.[0-9]*$//g'`
++
++    if [ $newbufhr -le $compcrit -o $newlibhr -le $compcrit ] ; then
++       echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+        exit $STATE_CRITICAL
+     fi
+-    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
+-       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    if [ $newbufhr -le $compwarn -o $newlibhr -le $compwarn ] ; then
++       echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
++    echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0; buffer=$buf_hrx$ReturnUnit;$perfwarn$ReturnUnit;$perfcrit$ReturnUnit;0;"
+ 
+     exit $STATE_OK
+     ;;
+ --tablespace)
+-    if [ ${6} -lt ${7} ] ; then
+-       echo "UNKNOWN - Warning level is more then Crit"
+-       exit $STATE_UNKNOWN
+-    fi
+-    result=`sqlplus -s ${3}/${4}@${2} << EOF
++
++    [ "$#" -lt 2 ] && print_usage && exit      # use empty user/pass for default connection / as sysdba, use empty warncrit for dflt-warncrit...
++
++    tsname="$dflt_tsname"
++    [ -n "$5" ] && tsname="$5"
++
++    realwarn="$dflt_tswarn"
++    realcrit="$dflt_tscrit"
++    [ "$7" != "" ] && realwarn="$7"
++    [ "$6" != "" ] && realcrit="$6"
++    do_warncrit_test "$realwarn" "$realcrit"
++
++    cmdsqlplus="sqlplus -s / as sysdba"
++    [ "$3" != "" ] && [ "$4" != "" ] && cmdsqlplus="sqlplus -s ${3}/${4}@${2}"
++    result=`$cmdsqlplus << EOF
+ set pagesize 0
+ set numf '9999999.99'
+-select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
++select ROUND(a.maxi,0) MAXI, ROUND(a.total,0) ALLOCATED, ROUND(a.total-b.free,0) USED, ROUND(b.free,0) FREE, ROUND(a.maxi-a.total+b.free,0) FREEMAXI
+ from (
+-select tablespace_name,sum(bytes)/1024/1024 total
++select tablespace_name,sum(NVL(bytes,0))/1024/1024 total,sum(NVL(maxbytes,0))/1024/1024 maxi
+ from dba_data_files group by tablespace_name) A
+ LEFT OUTER JOIN
+-( select tablespace_name,sum(bytes)/1024/1024 free
++( select tablespace_name,sum(NVL(bytes,0))/1024/1024 free
+ from dba_free_space group by tablespace_name) B
+-ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';
++ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${tsname}';
+ EOF`
+ 
+     if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
+-      echo "CRITICAL - $error"
++      echo "${2} : ${tsname} CRITICAL - $error"
+       exit $STATE_CRITICAL
+     fi
+ 
+-    ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
+-    ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
+-    ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
+-    ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
++    ts_total=
++    ts_used=
++    ts_free=
++    if [ "${8}" = "max" ]; then
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($5)}'`
++    else
++      ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'`
++      ts_used=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'`
++      ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($4)}'`
++    fi
++ 
++    if [ "$ts_total" = "" ]; then
++      echo "${2} : ${tsname} UNKNOWN - no data was returned"
++      exit $STATE_UNKNOWN
++    fi
++ 
++    ts_pctx=`echo "scale=2; $ts_used/$ts_total * 100" | bc -l`
++    ts_pct=`echo "scale=0; $ts_used/$ts_total * 100" | bc -l`
++
++    # if percentage supplied, use percentage in perfdata
++    [ `expr index "%" "$realwarn"` -gt 0 ] && ts_total=1
++
++    convert_warncrit_val "$realwarn" $ts_total;   compwarn=$ReturnVal # $ReturnUnit is either % or M for the perfdata
++    convert_warncrit_val "$realcrit" $ts_total;   compcrit=$ReturnVal
++
++    perfused=$ts_pctx
++    [ "$ReturnUnit" != "%" ] && perfused=$[ $ts_total - $ts_free ] && ReturnUnit="M"
++
+     if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+-        echo "No data returned by Oracle - tablespace $5 not found?"
++        echo "${2} : ${tsname} UNKNOWN - No data returned by Oracle - tablespace ${tsname} not found?"
+         exit $STATE_UNKNOWN
+     fi
+-    if [ "$ts_pct" -ge ${6} ] ; then
+-       echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compcrit" ] ; then
++       echo "${2} : ${tsname} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+        exit $STATE_CRITICAL
+     fi
+-    if [ "$ts_pct" -ge ${7} ] ; then
+-       echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    if [ "$ts_pct" -ge "$compwarn" ] ; then
++       echo "${2} : ${tsname} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+        exit $STATE_WARNING
+     fi
+-    echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
++    echo "${2} : ${tsname} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${tsname}=$perfused$ReturnUnit;$compwarn$ReturnUnit;$compcrit$ReturnUnit;0;"
+     exit $STATE_OK
+     ;;
+ *)
diff --git a/web/attachments/420256-check_snmp_64bit_fix.diff b/web/attachments/420256-check_snmp_64bit_fix.diff
new file mode 100644
index 0000000..78bf767
--- /dev/null
+++ b/web/attachments/420256-check_snmp_64bit_fix.diff
@@ -0,0 +1,155 @@
+*** check_snmp.c        Thu Aug  4 14:33:54 2011
+--- check_snmp_64bit_fix.c      Thu Aug  4 14:17:49 2011
+***************
+*** 85,91 ****
+  
+  int process_arguments (int, char **);
+  int validate_arguments (void);
+! char *thisarg (char *str);
+  char *nextarg (char *str);
+  void print_usage (void);
+  void print_help (void);
+--- 85,91 ----
+  
+  int process_arguments (int, char **);
+  int validate_arguments (void);
+! char *trimstring (char *str);
+  char *nextarg (char *str);
+  void print_usage (void);
+  void print_help (void);
+***************
+*** 180,187 ****
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+  
+!       labels = malloc (labels_size);
+!       unitv = malloc (unitv_size);
+        for (i = 0; i < MAX_OIDS; i++)
+                eval_method[i] = CHECK_UNDEF;
+  
+--- 180,187 ----
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+  
+!       labels = malloc (sizeof(char *) * labels_size);
+!       unitv = malloc (sizeof(char *) * unitv_size);
+        for (i = 0; i < MAX_OIDS; i++)
+                eval_method[i] = CHECK_UNDEF;
+  
+***************
+*** 737,760 ****
+                        nlabels++;
+                        if (nlabels >= labels_size) {
+                                labels_size += 8;
+!                               labels = realloc (labels, labels_size);
+                                if (labels == NULL)
+                                        die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
+                        }
+!                       labels[nlabels - 1] = optarg;
+!                       ptr = thisarg (optarg);
+                        labels[nlabels - 1] = ptr;
+                        if (strstr (ptr, "'") == ptr)
+                                labels[nlabels - 1] = ptr + 1;
+                        while (ptr && (ptr = nextarg (ptr))) {
+                                if (nlabels >= labels_size) {
+                                        labels_size += 8;
+!                                       labels = realloc (labels, labels_size);
+                                        if (labels == NULL)
+                                                die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
+                                }
+                                labels++;
+!                               ptr = thisarg (ptr);
+                                if (strstr (ptr, "'") == ptr)
+                                        labels[nlabels - 1] = ptr + 1;
+                                else
+--- 738,760 ----
+                        nlabels++;
+                        if (nlabels >= labels_size) {
+                                labels_size += 8;
+!                               labels = realloc (labels, sizeof(char *) * labels_size);
+                                if (labels == NULL)
+                                        die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
+                        }
+!                       ptr = trimstring (optarg);
+                        labels[nlabels - 1] = ptr;
+                        if (strstr (ptr, "'") == ptr)
+                                labels[nlabels - 1] = ptr + 1;
+                        while (ptr && (ptr = nextarg (ptr))) {
+                                if (nlabels >= labels_size) {
+                                        labels_size += 8;
+!                                       labels = realloc (labels, sizeof(char *) * labels_size);
+                                        if (labels == NULL)
+                                                die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
+                                }
+                                labels++;
+!                               ptr = trimstring (ptr);
+                                if (strstr (ptr, "'") == ptr)
+                                        labels[nlabels - 1] = ptr + 1;
+                                else
+***************
+*** 766,789 ****
+                        nunits++;
+                        if (nunits >= unitv_size) {
+                                unitv_size += 8;
+!                               unitv = realloc (unitv, unitv_size);
+                                if (unitv == NULL)
+                                        die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
+                        }
+!                       unitv[nunits - 1] = optarg;
+!                       ptr = thisarg (optarg);
+                        unitv[nunits - 1] = ptr;
+                        if (strstr (ptr, "'") == ptr)
+                                unitv[nunits - 1] = ptr + 1;
+                        while (ptr && (ptr = nextarg (ptr))) {
+                                if (nunits >= unitv_size) {
+                                        unitv_size += 8;
+!                                       unitv = realloc (unitv, unitv_size);
+                                        if (units == NULL)
+                                                die (STATE_UNKNOWN, _("Could not realloc() units\n"));
+                                }
+                                nunits++;
+!                               ptr = thisarg (ptr);
+                                if (strstr (ptr, "'") == ptr)
+                                        unitv[nunits - 1] = ptr + 1;
+                                else
+--- 766,788 ----
+                        nunits++;
+                        if (nunits >= unitv_size) {
+                                unitv_size += 8;
+!                               unitv = realloc (unitv, sizeof(char *) * unitv_size);
+                                if (unitv == NULL)
+                                        die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
+                        }
+!                       ptr = trimstring (optarg);
+                        unitv[nunits - 1] = ptr;
+                        if (strstr (ptr, "'") == ptr)
+                                unitv[nunits - 1] = ptr + 1;
+                        while (ptr && (ptr = nextarg (ptr))) {
+                                if (nunits >= unitv_size) {
+                                        unitv_size += 8;
+!                                       unitv = realloc (unitv, sizeof(char *) * unitv_size);
+                                        if (units == NULL)
+                                                die (STATE_UNKNOWN, _("Could not realloc() units\n"));
+                                }
+                                nunits++;
+!                               ptr = trimstring (ptr);
+                                if (strstr (ptr, "'") == ptr)
+                                        unitv[nunits - 1] = ptr + 1;
+                                else
+***************
+*** 936,942 ****
+         if there is a leading quote, make sure it balances */
+  
+  char *
+! thisarg (char *str)
+  {
+        str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+        if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+--- 935,941 ----
+         if there is a leading quote, make sure it balances */
+  
+  char *
+! trimstring (char *str)
+  {
+        str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+        if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
diff --git a/web/attachments/420257-check_snmp_numeric_fix.diff b/web/attachments/420257-check_snmp_numeric_fix.diff
new file mode 100644
index 0000000..8c645e1
--- /dev/null
+++ b/web/attachments/420257-check_snmp_numeric_fix.diff
@@ -0,0 +1,20 @@
+*** check_snmp.c        Thu Aug  4 14:33:54 2011
+--- check_snmp_numeric_fix.c    Thu Aug  4 14:33:13 2011
+***************
+*** 331,337 ****
+                /* Clean up type array - Sol10 does not necessarily zero it out */
+                bzero(type, sizeof(type));
+  
+!               is_counter=0;
+                /* We strip out the datatype indicator for PHBs */
+                if (strstr (response, "Gauge: ")) {
+                        show = strstr (response, "Gauge: ") + 7;
+--- 331,338 ----
+                /* Clean up type array - Sol10 does not necessarily zero it out */
+                bzero(type, sizeof(type));
+  
+!               is_counter = 0;
+!               is_numeric = 0;
+                /* We strip out the datatype indicator for PHBs */
+                if (strstr (response, "Gauge: ")) {
+                        show = strstr (response, "Gauge: ") + 7;
diff --git a/web/attachments/420708-check_oracle_1.4.15_tnsstringmatchfix.patch b/web/attachments/420708-check_oracle_1.4.15_tnsstringmatchfix.patch
new file mode 100644
index 0000000..47d42c6
--- /dev/null
+++ b/web/attachments/420708-check_oracle_1.4.15_tnsstringmatchfix.patch
@@ -0,0 +1,11 @@
+--- check_oracle        2011-08-09 20:28:19.000000000 +0200
++++ /check_oracle_tns_stringmatchfixed  2011-08-09 20:28:14.000000000 +0200
+@@ -133,7 +133,7 @@
+     tnschk=` tnsping $2`
+     tnschk2=` echo  $tnschk | grep -c OK`
+     if [ ${tnschk2} -eq 1 ] ; then 
+-       tnschk3=` echo $tnschk | sed -e 's/.*(//' -e 's/).*//'`
++        tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*}
+        echo "OK - reply time ${tnschk3} from $2"
+        exit $STATE_OK
+     else
diff --git a/web/attachments/42131-check_ntp.diff b/web/attachments/42131-check_ntp.diff
new file mode 100644
index 0000000..43fdd6a
--- /dev/null
+++ b/web/attachments/42131-check_ntp.diff
@@ -0,0 +1,16 @@
+Index: plugins-scripts/check_ntp.pl
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-scripts/check_ntp.pl,v
+retrieving revision 1.12
+diff -u -r1.12 check_ntp.pl
+--- plugins-scripts/check_ntp.pl        4 Feb 2003 05:54:39 -0000       1.12
++++ plugins-scripts/check_ntp.pl        11 Feb 2003 21:10:26 -0000
+@@ -249,7 +249,7 @@
+                        }
+ 
+                        # match sys.peer or pps.peer
+-                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([lumb]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
++                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9WVGPS.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
+                                $syspeer = $2;                          
+                                $jitter = $11;
+                                print "match $_ \n" if $verbose;
diff --git a/web/attachments/42137-typescript b/web/attachments/42137-typescript
new file mode 100644
index 0000000..85c6751
--- /dev/null
+++ b/web/attachments/42137-typescript
@@ -0,0 +1,39 @@
+Script started on Tue Feb 11 17:09:58 2003
+

bash-2.05b$ 
bash-2.05b$ 
bash-2.05b$ s
bash-2.05b$ s
bash-2.05b$ st
bash-2.05b$ st
bash-2.05b$ str
bash-2.05b$ str
bash-2.05b$ stra
bash-2.05b$ stra
bash-2.05b$ strac
bash-2.05b$ strac
bash-2.05b$ strace
bash-2.05b$ strace
bash-2.05b$ strace 
bash-2.05b$ strace 
bash-2.05b$ strace /
bash-2.05b$ strace /
bash-2.05b$ strace /u
bash-2.05b$ strace /u
bash-2.05b$ strace /us
bash-2.05b$ strace /us
bash-2.05b$ strace /usr/
bash-2.05b$ strace /usr/
bash-2.05b$ strace /usr/l
bash-2.05b$ strace /usr/l
bash-2.05b$ strace /usr/lo
bash-2.05b$ strace /usr/lo
bash-2.05b$ strace /usr/loc
bash-2.05b$ strace /usr/loc
bash-2.05b$ strace /usr/local/
bash-2.05b$ strace /usr/local/
bash-2.05b$ strace /usr/local/n
bash-2.05b$ strace /usr/local/n
bash-2.05b$ strace /usr/local/nagios/
bash-2.05b$ strace /usr/local/nagios/
bash-2.05b$ strace /usr/local/nagios/l
bash-2.05b$ strace /usr/local/nagios/l
bash-2.05b$ strace /usr/local/nagios/li
bash-2.05b$ strace /usr/local/nagios/li
bash-2.05b$ strace /usr/local/nagios/libexec/
bash-2.05b$ strace /usr/local/nagios/libexec/
bash-2.05b$ strace /usr/local/nagios/libexec/c
bash-2.05b$ strace /usr/local/nagios/libexec/c
bash-2.05b$ strace /usr/local/nagios/libexec/ch
bash-2.05b$ strace /usr/local/nagios/libexec/ch
bash-2.05b$ strace /usr/local/nagios/libexec/check_
bash-2.05b$ strace /usr/local/nagios/libexec/check_
bash-2.05b$ strace /usr/local/nagios/libexec/check_m
bash-2.05b$ strace /usr/local/nagios/libexec/check_m
bash-2.05b$ strace /usr/local/nagios/libexec/check_my
bash-2.05b$ strace /usr/local/nagios/libexec/check_my
bash-2.05b$ strace /usr/local/nagios/libexec/check_mys
bash-2.05b$ strace /usr/local/nagios/libexec/check_mys
bash-2.05b$ strace /usr/local/nagios/libexec/check_mysq
bash-2.05b$ strace /usr/local/nagios/libexec/check_mysq
bash-2.05b$ strace /usr/local/nagios/libexec/check_mysql
bash-2.05b$ strace /usr/local/nagios/libexec/check_mysql

+execve("/usr/local/nagios/libexec/check_mysql", ["/usr/local/nagios/libexec/check_mysql"], [/* 21 vars */]) = 0

+uname({sys="Linux", node="foo", ...})   = 0

+brk(0)                                  = 0x806c5e0

+open("/etc/ld.so.preload", O_RDONLY)    = -1 ENOENT (No such file or directory)

+open("/etc/ld.so.cache", O_RDONLY)      = 3

+fstat64(3, {st_mode=S_IFREG|0644, st_size=38234, ...}) = 0

+old_mmap(NULL, 38234, PROT_READ, MAP_PRIVATE, 3, 0) = 0x40013000

+close(3)                                = 0

+open("/usr/lib/libz.so.1", O_RDONLY)    = 3

+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\320\30"..., 1024) = 1024

+fstat64(3, {st_mode=S_IFREG|0755, st_size=60805, ...}) = 0

+old_mmap(NULL, 55308, PROT_READ|PROT_EXEC, MAP_PRIVATE, 3, 0) = 0x4001d000

+mprotect(0x40029000, 6156, PROT_NONE)   = 0

+old_mmap(0x40029000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED, 3, 0xb000) = 0x40029000

+close(3)                                = 0

+open("/lib/libutil.so.1", O_RDONLY)     = 3

+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0`\16\0\000"..., 1024) = 1024

+fstat64(3, {st_mode=S_IFREG|0755, st_size=10421, ...}) = 0

+old_mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x4002b000

+old_mmap(NULL, 10704, PROT_READ|PROT_EXEC, MAP_PRIVATE, 3, 0) = 0x4002c000

+mprotect(0x4002e000, 2512, PROT_NONE)   = 0

+old_mmap(0x4002e000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED, 3, 0x1000) = 0x4002e000

+close(3)                                = 0

+open("/lib/i686/libc.so.6", O_RDONLY)   = 3

+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\220Y\1"..., 1024) = 1024

+fstat64(3, {st_mode=S_IFREG|0755, st_size=1395734, ...}) = 0

+old_mmap(0x42000000, 1239844, PROT_READ|PROT_EXEC, MAP_PRIVATE, 3, 0) = 0x42000000

+mprotect(0x42126000, 35620, PROT_NONE)  = 0

+old_mmap(0x42126000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED, 3, 0x126000) = 0x42126000

+old_mmap(0x4212b000, 15140, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x4212b000

+close(3)                                = 0

+munmap(0x40013000, 38234)               = 0

+--- SIGSEGV (Segmentation fault) ---

++++ killed by SIGSEGV +++

+

bash-2.05b$ 
bash-2.05b$ exit

+
+Script done on Tue Feb 11 17:10:08 2003
diff --git a/web/attachments/421612-check_mysql_performance.patch b/web/attachments/421612-check_mysql_performance.patch
new file mode 100644
index 0000000..79945e5
--- /dev/null
+++ b/web/attachments/421612-check_mysql_performance.patch
@@ -0,0 +1,111 @@
+diff --git a/libexec/check_mysql_performance b/libexec/check_mysql_performance
+index 9a7e0a5..0e59d35 100755
+--- a/libexec/check_mysql_performance
++++ b/libexec/check_mysql_performance
+@@ -11,9 +11,9 @@ use Nagios::Plugin;
+ 
+ my $np = Nagios::Plugin->new(
+     'usage' => <<EOH,
+-Usage: %s [-H host] [-d DSN] -u -p --group
++Usage: %s [-H host] [-d DSN] [--perfdata ] [[-u] [-p]|--extra-opts=[section][\@file]]  --group
+ EOH
+-    'version' => '1.00',
++    'version' => '1.10',
+     'url'     => 'http://www.capside.com',
+     'extra'   => <<EOH,
+ 
+@@ -21,16 +21,15 @@ Threshold formats are specified at:
+     http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT
+ 
+     'blurb' => qq{Copyright (c) CAPSiDE.
+-
+-This plugin montitors the % use of CPU usage on Linux systems for various types of CPU usage.
+ EOH
+ );
+ 
+ $np->add_arg(
+     spec => 'perfdata=s',
+     help => <<EOH,
+---perfdata performance data to output
+-  Host to query
++--perfdata  performance data to check and output
++   e.g. metric[=warn_range;][critcal_range],metric,...
++   note semicolons will need escaping when entered in the UI
+ EOH
+     required => 0,
+ );
+@@ -108,7 +107,8 @@ $SIG{'ALRM'} = sub {
+     $np->nagios_exit( CRITICAL, 'ERROR: Timed out.' );
+ };
+ 
+-my ( $code, $message ) = ( OK, 'All parameters OK' );
++my ( $code, $message ) = ( undef, undef );
++$np->add_message( OK, "All parameters OK" );
+ 
+ my @fields;
+ if ( not $np->opts->perfdata ) {
+@@ -116,30 +116,50 @@ if ( not $np->opts->perfdata ) {
+ }
+ else {
+     @fields = split( /,/, $np->opts->perfdata );
+-
+-    # @fields = split /,/, join ',', @{$np->opts->perfdata};
+ }
+ 
+ # Add all performance data
++my $thresholds;
++my $value;
++my $warning;
++my $critical;
++my $minimum;
++my $maximum;
+ foreach my $key (@fields) {
++    if ( $key =~ /=/ ) {
++        ($key, $thresholds) = split( /=/, $key );
++        ($warning, $critical) = split ( /;/, $thresholds );
++    } else {
++        $thresholds = undef;
++        $warning = undef;
++        $critical = undef;
++    }
+     if ( $mysql->{'stats'}->{$key}->{'type'} eq 'ABS' ) {
+         next if ( not defined $read_data->{$key} );
+-        $np->add_perfdata(
+-            'label' => $key,
+-            'value' => $read_data->{$key},
+-            'uom'   => '',
+-        );
+-    }
+-    elsif ( $mysql->{'stats'}->{$key}->{'type'} eq 'DERIVE' ) {
++        $value = $read_data->{$key};
++    } elsif ( $mysql->{'stats'}->{$key}->{'type'} eq 'DERIVE' ) {
+         next if ( not defined $stat->{$key} );
+-        $np->add_perfdata(
+-            'label' => $key,
+-            'value' => $stat->{$key},
+-            'uom'   => '',
++        $value = $stat->{$key};
++    }
++    $np->add_perfdata(
++        'label' => $key,
++        'value' => $value,
++        'uom'   => '',
++        'warning' => $warning,
++        'critical' => $critical,
++    );
++    if ( $thresholds ) {
++        $code = $np->check_threshold(
++            'check' => $value,
++            'warning' => $warning,
++            'critical' => $critical,
+         );
++        if ( $code ) {
++            $np->add_message($code, "$key beyond thresholds,");
++        }
+     }
+ }
+-
++($code, $message) = $np->check_messages();
+ $np->nagios_exit( $code, $message );
+ 
+ package MySQL::Stats;
diff --git a/web/attachments/422303-check_oracle-1.4.15-bashprofile.patch b/web/attachments/422303-check_oracle-1.4.15-bashprofile.patch
new file mode 100644
index 0000000..dfa7cee
--- /dev/null
+++ b/web/attachments/422303-check_oracle-1.4.15-bashprofile.patch
@@ -0,0 +1,15 @@
+--- /usr/lib64/nagios/plugins/check_oracle      2011-08-29 15:39:13.000000000 +0200
++++ /usr/lib64/nagios/plugins/check_oracle-bashprofile  2011-08-29 15:49:30.000000000 +0200
+@@ -12,6 +12,12 @@
+ 
+ . $PROGPATH/utils.sh
+ 
++# workaround for sudo -u foo kinda calls and the ensueing env problem
++USERHOMEDIR=`grep "^$USER" /etc/passwd | cut -d: -f6`
++if [ -e $USERHOMEDIR/.bash_profile ]; then
++  . $USERHOMEDIR/.bash_profile 
++fi
++
+ 
+ print_usage() {
+   echo "Usage:"
diff --git a/web/attachments/423473-nagiosplug-HEAD-mysql_noauth.patch b/web/attachments/423473-nagiosplug-HEAD-mysql_noauth.patch
new file mode 100644
index 0000000..e414423
--- /dev/null
+++ b/web/attachments/423473-nagiosplug-HEAD-mysql_noauth.patch
@@ -0,0 +1,74 @@
+diff -Naur nagiosplug/plugins/check_mysql.c nagiosplug.new/plugins/check_mysql.c
+--- nagiosplug/plugins/check_mysql.c    2011-09-13 15:56:05.667051730 +0300
++++ nagiosplug.new/plugins/check_mysql.c        2011-09-13 15:57:08.786832084 +0300
+@@ -42,6 +42,7 @@
+ #include "netutils.h"
+ 
+ #include <mysql.h>
++#include <mysqld_error.h>
+ #include <errmsg.h>
+ 
+ char *db_user = NULL;
+@@ -51,6 +52,7 @@
+ char *db = NULL;
+ unsigned int db_port = MYSQL_PORT;
+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
++int ignore_auth = 0;
+ int verbose = 0;
+ 
+ thresholds *my_threshold = NULL;
+@@ -91,7 +93,16 @@
+ 
+        /* 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)
++               if (ignore_auth && mysql_errno (&mysql) == ER_ACCESS_DENIED_ERROR)
++               {
++                       printf("MySQL OK - Version: %s (protocol %d)\n",
++                               mysql_get_server_info(&mysql),
++                               mysql_get_proto_info(&mysql)
++                       );
++                       mysql_close (&mysql);
++                       return STATE_OK;
++               }
++               else if (mysql_errno (&mysql) == CR_UNKNOWN_HOST)
+                        die (STATE_WARNING, "%s\n", mysql_error (&mysql));
+                else if (mysql_errno (&mysql) == CR_VERSION_ERROR)
+                        die (STATE_WARNING, "%s\n", mysql_error (&mysql));
+@@ -252,6 +263,7 @@
+                {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},
+                {"check-slave", no_argument, 0, 'S'},
++               {"ignore-auth", no_argument, 0, 'n'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+@@ -262,7 +274,7 @@
+                return ERROR;
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:s:c:w:", longopts, &option);
++               c = getopt_long (argc, argv, "hvVSnP:p:u:d:H:s:c:w:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -300,6 +312,9 @@
+                case 'S':
+                        check_slave = 1;                                                        /* check-slave */
+                        break;
++               case 'n':
++                       ignore_auth = 1;                                                        /* ignore-auth */
++                       break;
+                case 'w':
+                        warning = optarg;
+                        break;
+@@ -385,6 +400,9 @@
+        printf (UT_EXTRA_OPTS);
+ 
+   printf (UT_HOST_PORT, 'P', myport);
++  printf (" %s\n", "-n, --ignore-auth");
++  printf ("    %s\n", _("Ignore authentication failure and check for mysql connectivity only"));
++
+   printf (" %s\n", "-s, --socket=STRING");
+   printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
+ 
diff --git a/web/attachments/424694-nagiosplug_check_http_connect_method.patch b/web/attachments/424694-nagiosplug_check_http_connect_method.patch
new file mode 100644
index 0000000..cbf0870
--- /dev/null
+++ b/web/attachments/424694-nagiosplug_check_http_connect_method.patch
@@ -0,0 +1,88 @@
+diff -ur nagios-plugins-1.4.15.orig/plugins/check_http.c nagios-plugins-1.4.15/plugins/check_http.c
+--- nagios-plugins-1.4.15.orig/plugins/check_http.c     2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15/plugins/check_http.c  2011-09-09 14:03:49.000000000 +0000
+@@ -805,9 +805,34 @@
+   /* try to connect to the host at the given port number */
+   if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
+     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
++
++  /* if we are called with the -I option, the -j method is CONNECT and */
++  /* we received -S for SSL, then we tunnel the request through a proxy*/
++  /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto  */
++
++  if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
++    && host_name != NULL && use_ssl == TRUE) {
++
++    if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address, server_port, host_name, HTTPS_PORT);
++    asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent);
++    asprintf (&buf, "%sProxy-Connection: keep-alive\r\n", buf);
++    asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
++    /* we finished our request, send empty line with CRLF */
++    asprintf (&buf, "%s%s", buf, CRLF);
++    if (verbose) printf ("%s\n", buf);
++    send(sd, buf, strlen (buf), 0);
++    buf[0]='\0';
++
++    if (verbose) printf ("Receive response from proxy\n");
++    read (sd, buffer, MAX_INPUT_BUFFER-1);
++    if (verbose) printf ("%s", buffer);
++    /* Here we should check if we got HTTP/1.1 200 Connection established */
++  }
++    
+ #ifdef HAVE_SSL
+   if (use_ssl == TRUE) {
+     np_net_ssl_init_with_hostname(sd, (use_sni ? host_name : NULL));
++    if (verbose) printf ("SSL initialized\n");
+     if (check_cert == TRUE) {
+       result = np_net_ssl_check_cert(days_till_exp);
+       np_net_ssl_cleanup();
+@@ -817,7 +842,11 @@
+   }
+ #endif /* HAVE_SSL */
+ 
+-  asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
++  if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
++      && host_name != NULL && use_ssl == TRUE)
++    asprintf (&buf, "%s %s %s\r\n%s\r\n", "GET", server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
++  else
++    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
+ 
+   /* tell HTTP/1.1 servers not to keep the connection alive */
+   asprintf (&buf, "%sConnection: close\r\n", buf);
+@@ -830,7 +859,9 @@
+      * (default) port is explicitly specified in the "Host:" header line.
+      */
+     if ((use_ssl == FALSE && server_port == HTTP_PORT) ||
+-        (use_ssl == TRUE && server_port == HTTPS_PORT))
++        (use_ssl == TRUE && server_port == HTTPS_PORT) ||
++        ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
++          && host_name != NULL && use_ssl == TRUE))
+       asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
+     else
+       asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port);
+@@ -1355,7 +1386,7 @@
+   printf ("    %s\n", _("URL to GET or POST (default: /)"));
+   printf (" %s\n", "-P, --post=STRING");
+   printf ("    %s\n", _("URL encoded http POST data"));
+-  printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE)");
++  printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");
+   printf ("    %s\n", _("Set HTTP method."));
+   printf (" %s\n", "-N, --no-body");
+   printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));
+@@ -1423,7 +1454,15 @@
+   printf (" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
+   printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+   printf (" %s\n", _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
+-  printf (" %s\n", _("the certificate is expired."));
++  printf (" %s\n\n", _("the certificate is expired."));
++
++  printf (" %s\n\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
++  printf (" %s\n\n", _("check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com "));
++  printf (" %s\n", _("All these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>"));
++  printf (" %s\n", _("A STATE_OK will be returned. When the server returns its content but exceeds"));
++  printf (" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
++  printf (" %s\n", _("a STATE_CRITICAL will be returned."));
++
+ #endif
+ 
+   printf (UT_SUPPORT);
diff --git a/web/attachments/426873-check_ide_smart-fix-threshold.patch b/web/attachments/426873-check_ide_smart-fix-threshold.patch
new file mode 100644
index 0000000..422ead1
--- /dev/null
+++ b/web/attachments/426873-check_ide_smart-fix-threshold.patch
@@ -0,0 +1,30 @@
+diff -r -u nagiosplug-2011-10-26/plugins/check_ide_smart.c nagiosplug/plugins/check_ide_smart.c
+--- nagiosplug-2011-10-26/plugins/check_ide_smart.c     2011-10-25 10:56:37.534927918 +0200
++++ nagiosplug/plugins/check_ide_smart.c        2011-10-25 11:01:51.867256194 +0200
+@@ -311,7 +311,7 @@
+        int i;
+        for (i = 0; i < NR_ATTRIBUTES; i++) {
+                if (value->id && threshold->id && value->id == threshold->id) {
+-                       if (value->value <= threshold->threshold) {
++                       if (value->value < threshold->threshold) {
+                                ++failed;
+                        }
+                        else {
+@@ -340,7 +340,7 @@
+        int i;
+        for (i = 0; i < NR_ATTRIBUTES; i++) {
+                if (value->id && threshold->id && value->id == threshold->id) {
+-                       if (value->value <= threshold->threshold) {
++                       if (value->value < threshold->threshold) {
+                                ++failed;
+                                if (value->status & 1) {
+                                        status = PREFAILURE;
+@@ -397,7 +397,7 @@
+        printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
+                                        p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
+                                        p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
+-                                       p->value > t->threshold ? "Passed" : "Failed");
++                                       p->value >= t->threshold ? "Passed" : "Failed");
+ }
+ 
+ 
diff --git a/web/attachments/427519-http-parser.bundle b/web/attachments/427519-http-parser.bundle
new file mode 100644
index 0000000..74ab9e4
--- /dev/null
+++ b/web/attachments/427519-http-parser.bundle
@@ -0,0 +1,1396 @@
+From 256d8d15acf98ee405f79b75a52692531d173f49 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Wed, 2 Nov 2011 10:03:38 +0100
+Subject: [PATCH 0/9] check_http: add support for chunked encoding via http-parser
+
+Hi,
+
+Here is an attempt to add support for chunked encoding in check_http
+by switching to the third-party HTTP parser from Joyent hosted at
+https://github.com/joyent/http-parser.  The switch makes much of the
+in-house ad-hoc parsing code redundant, and induces some changes in
+the semantics of the -e switch, but that should be regarded as a step
+forward, since the role of that switch was to verify HTTP correctness
+(at least in part) and now we have a much better mechanism for that:
+the parser itself.  The pagesize limits (-m switch) also gained a
+clearer semantics: they check the content size now, as that may be
+available even when -N is used, and does not depend on the transfer
+encoding.
+
+Ferenc Wagner (9):
+  check_http: do not print page length if body was not read
+  Add lib/http-parser submodule and adjust Makefile.am to use it in
+    check_http
+  check_http: move status code and redirect location parsing to
+    http-parser
+  check_http: whitespace change to fix up indentation by removing dummy
+    block
+  check_http: constify and rename the location argument for redir()
+  check_http: make list of parsed headers configurable
+  check_http: use header parsing machinery in check_document_dates()
+  check_http: also read the response content via http-parse
+  check_http: check content length instead of response length
+
+ .gitmodules          |    3 +
+ lib/Makefile.am      |   10 +-
+ lib/http-parser      |    1 +
+ plugins/Makefile.am  |    9 +-
+ plugins/check_http.c |  596 ++++++++++++++++++++------------------------------
+ 5 files changed, 256 insertions(+), 363 deletions(-)
+ create mode 100644 .gitmodules
+ create mode 160000 lib/http-parser
+
+-- 
+1.7.2.5
+
+From abc1d1c539376cb5531a9686e581ff62acf421e5 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Mon, 31 Oct 2011 15:10:54 +0100
+Subject: [PATCH 1/9] check_http: do not print page length if body was not read
+
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 433c28e..6df9d23 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -923,7 +923,7 @@ check_http (void)
+   /* leave full_page untouched so we can free it later */
+   page = full_page;
+ 
+-  if (verbose)
++  if (verbose && !no_body)
+     printf ("%s://%s:%d%s is %d characters\n",
+       use_ssl ? "https" : "http", server_address,
+       server_port, server_url, (int)pagesize);
+-- 
+1.7.2.5
+
+
+From 27536d84b73489308f129ff5623ffd1445dfc5fb Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Mon, 31 Oct 2011 15:14:38 +0100
+Subject: [PATCH 2/9] Add lib/http-parser submodule and adjust Makefile.am to use it in check_http
+
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ .gitmodules         |    3 +++
+ lib/Makefile.am     |   10 +++++++++-
+ lib/http-parser     |    1 +
+ plugins/Makefile.am |    9 +++++----
+ 4 files changed, 18 insertions(+), 5 deletions(-)
+ create mode 100644 .gitmodules
+ create mode 160000 lib/http-parser
+
+diff --git a/.gitmodules b/.gitmodules
+new file mode 100644
+index 0000000..5270743
+--- /dev/null
++++ b/.gitmodules
+@@ -0,0 +1,3 @@
++[submodule "lib/http-parser"]
++       path = lib/http-parser
++       url = git://github.com/joyent/http-parser.git
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 99fa591..561b7cf 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = . tests
+ 
+-noinst_LIBRARIES = libnagiosplug.a
++noinst_LIBRARIES = libnagiosplug.a http-parser/libhttp_parser.a
+ 
+ AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
+ 
+@@ -18,3 +18,11 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/p
+ test test-debug:
+        cd tests && make $@
+ 
++http-parser/libhttp_parser.a:
++       cd http-parser && $(MAKE) package
++
++mostlyclean-local:
++       cd http-parser && $(MAKE) clean
++
++check-local:
++       cd http-parser && $(MAKE) test
+diff --git a/lib/http-parser b/lib/http-parser
+new file mode 160000
+index 0000000..f1d48aa
+--- /dev/null
++++ b/lib/http-parser
+@@ -0,0 +1 @@
++Subproject commit f1d48aa31c932f80a64122a75a87bc909b4073f9
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 36a28b0..2df105e 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -13,7 +13,7 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
+ 
+ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+ 
+-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
++INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/lib/http-parser -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
+ 
+ localedir = $(datadir)/locale
+ # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this
+@@ -48,6 +48,7 @@ BASEOBJS = utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
+ NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
+ SSLOBJS = sslutils.o
+ NETLIBS = $(NETOBJS) $(SOCKETLIBS)
++HTTPPARSER = ../lib/http-parser/libhttp_parser.a
+ 
+ TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
+ 
+@@ -70,7 +71,7 @@ check_dns_LDADD = $(NETLIBS) runcmd.o
+ check_dummy_LDADD = $(BASEOBJS)
+ check_fping_LDADD = $(NETLIBS) popen.o
+ check_game_LDADD = $(BASEOBJS) runcmd.o
+-check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
++check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) $(HTTPPARSER)
+ check_hpjd_LDADD = $(NETLIBS) popen.o
+ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
+ check_load_LDADD = $(BASEOBJS) popen.o
+@@ -115,7 +116,7 @@ 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_http_DEPENDENCIES = check_http.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS) $(HTTPPARSER)
+ 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)
+@@ -170,7 +171,7 @@ install-exec-hook:
+        cd $(DESTDIR)$(libexecdir) && \
+        for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
+        if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
+-       
++
+ clean-local:
+        rm -f $(check_tcp_programs)
+        rm -f NP-VERSION-FILE
+-- 
+1.7.2.5
+
+
+From e8b35f17bf23515dc43233ebbde1c0ccb11d5ecb Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Mon, 31 Oct 2011 15:20:48 +0100
+Subject: [PATCH 3/9] check_http: move status code and redirect location parsing to http-parser
+
+This changes the semantics of the -e switch, as http-parser doesn't make
+the status string available.  But it does substantial HTTP verification,
+so much of the original functionality will be regained once HTTP parsing
+errors become CRITICAL.
+
+This introduces some new gettext strings.
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |  264 +++++++++++++++++++++++++-------------------------
+ 1 files changed, 131 insertions(+), 133 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 6df9d23..ada7a95 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -41,6 +41,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ #include "netutils.h"
+ #include "utils.h"
+ #include "base64.h"
++#include "http_parser.h"
+ #include <ctype.h>
+ 
+ #define INPUT_DELIMITER ";"
+@@ -48,7 +49,15 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ #define STICKY_HOST 1
+ #define STICKY_PORT 2
+ 
+-#define HTTP_EXPECT "HTTP/1."
++struct parser_data_t {
++  enum http_errno prev_callback; /* use HPE_CB_ macros for identifying callbacks */
++  char *current_header;
++  size_t current_header_length;
++  int parsing_location;
++  char *location;
++  size_t location_length;
++};
++
+ enum {
+   MAX_IPV4_HOSTLENGTH = 255,
+   HTTP_PORT = 80,
+@@ -97,8 +106,7 @@ char *host_name;
+ char *server_url;
+ char *user_agent;
+ int server_url_length;
+-int server_expect_yn = 0;
+-char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
++int status_expect = -1;
+ char string_expect[MAX_INPUT_BUFFER] = "";
+ char output_string_search[30] = "";
+ char *warning_thresholds = NULL;
+@@ -126,7 +134,7 @@ char buffer[MAX_INPUT_BUFFER];
+ 
+ int process_arguments (int, char **);
+ int check_http (void);
+-void redir (char *pos, char *status_line);
++void redir (char *pos);
+ int server_type_check(const char *type);
+ int server_port_check(int ssl_flag);
+ char *perfd_time (double microsec);
+@@ -367,10 +375,8 @@ process_arguments (int argc, char **argv)
+       strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
+       string_expect[MAX_INPUT_BUFFER - 1] = 0;
+       break;
+-    case 'e': /* string or substring */
+-      strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
+-      server_expect[MAX_INPUT_BUFFER - 1] = 0;
+-      server_expect_yn = 1;
++    case 'e': /* expected HTTP response code */
++      status_expect = atoi (optarg);
+       break;
+     case 'T': /* Content-type */
+       asprintf (&http_content_type, "%s", optarg);
+@@ -589,26 +595,6 @@ parse_time_string (const char *string)
+   }
+ }
+ 
+-/* Checks if the server 'reply' is one of the expected 'statuscodes' */
+-static int
+-expected_statuscode (const char *reply, const char *statuscodes)
+-{
+-  char *expected, *code;
+-  int result = 0;
+-
+-  if ((expected = strdup (statuscodes)) == NULL)
+-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+-
+-  for (code = strtok (expected, ","); code != NULL; code = strtok (NULL, ","))
+-    if (strstr (reply, code) != NULL) {
+-      result = 1;
+-      break;
+-    }
+-
+-  free (expected);
+-  return result;
+-}
+-
+ static int
+ check_document_dates (const char *headers, char **msg)
+ {
+@@ -772,16 +758,78 @@ prepend_slash (char *path)
+   return newpath;
+ }
+ 
++/*
++Returns 0 on success, 1 if allocation fails.
++Works on binary data, but also zero-terminates the result
++for easier string handling.
++*/
++int
++append (char **orig, size_t *orig_len, const char *extra, size_t len)
++{
++  *orig = realloc (*orig, *orig_len + len + 1);
++  if (!*orig) return 1;
++  memcpy (*orig + *orig_len, extra, len);
++  *orig_len += len;
++  (*orig)[*orig_len] = 0;
++  return 0;
++}
++
++int
++header_field_callback (http_parser *parser, const char *at, size_t length)
++{
++  struct parser_data_t *data = parser->data;
++  
++  switch (data->prev_callback) {
++  case HPE_CB_header_value:
++    data->current_header_length = 0;
++    /* fall through */
++  case 0:
++    data->prev_callback = HPE_CB_header_field;
++    /* fall through */
++  case HPE_CB_header_field:
++    return append (&data->current_header, &data->current_header_length, at, length);
++  default:
++    return 1;
++  }
++}
++
++int
++header_value_callback (http_parser *parser, const char *at, size_t length)
++{
++  struct parser_data_t *data = parser->data;
++
++  switch (data->prev_callback) {
++  case HPE_CB_header_field:
++    data->parsing_location = !strcasecmp (data->current_header, "location");
++    data->prev_callback = HPE_CB_header_value;
++    /* fall through */
++  case HPE_CB_header_value:
++    return data->parsing_location &&
++           append (&data->location, &data->location_length, at, length);
++  default:
++    return 1;
++  }
++}
++
++int
++headers_complete_callback (http_parser *parser)
++{
++  struct parser_data_t *data = parser->data;
++
++  data->prev_callback = HPE_CB_headers_complete;
++
++  if (no_body) /* Terminate parsing (thus reading) if the -N option is set */
++    return 2;  /* 1 means don't expect body in this callback */
++  return 0;
++}
++
+ int
+ check_http (void)
+ {
+   char *msg;
+-  char *status_line;
+-  char *status_code;
+   char *header;
+   char *page;
+   char *auth;
+-  int http_status;
+   int i = 0;
+   size_t pagesize = 0;
+   char *full_page;
+@@ -792,6 +840,9 @@ check_http (void)
+   double elapsed_time;
+   int page_len = 0;
+   int result = STATE_OK;
++  http_parser_settings settings;
++  http_parser parser;
++  struct parser_data_t parser_data;
+ 
+   /* try to connect to the host at the given port number */
+   if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
+@@ -869,9 +920,29 @@ check_http (void)
+   if (verbose) printf ("%s\n", buf);
+   my_send (buf, strlen (buf));
+ 
++  /* Initialize the HTTP parser */
++  http_parser_init (&parser, HTTP_RESPONSE);
++  memset (&parser_data, 0, sizeof parser_data);
++  parser.data = &parser_data;
++  memset (&settings, 0, sizeof settings);
++  settings.on_header_field = header_field_callback;
++  settings.on_header_value = header_value_callback;
++  settings.on_headers_complete = headers_complete_callback;
++
+   /* fetch the page */
+   full_page = strdup("");
+-  while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
++  while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) >= 0) {
++    int nparsed = http_parser_execute(&parser, &settings, buffer, i);
++    if (nparsed != i) {
++      enum http_errno code = HTTP_PARSER_ERRNO (&parser);
++      if (code == HPE_CB_headers_complete) { /* the -N check fired */
++        /* break; FIXME this would break the current header code */
++      } else {
++        printf ("http_parser_execute returned %d instead of %i: %s\n",
++                nparsed, i, http_errno_description (code));
++      }
++    }
++    if (i == 0) break;
+     buffer[i] = '\0';
+     asprintf (&full_page_new, "%s%s", full_page, buffer);
+     free (full_page);
+@@ -928,15 +999,9 @@ check_http (void)
+       use_ssl ? "https" : "http", server_address,
+       server_port, server_url, (int)pagesize);
+ 
+-  /* find status line and null-terminate it */
+-  status_line = page;
++  /* skip status line */
+   page += (size_t) strcspn (page, "\r\n");
+-  pos = page;
+   page += (size_t) strspn (page, "\r\n");
+-  status_line[strcspn(status_line, "\r\n")] = 0;
+-  strip (status_line);
+-  if (verbose)
+-    printf ("STATUS: %s\n", status_line);
+ 
+   /* find header info and null-terminate it */
+   header = page;
+@@ -955,68 +1020,38 @@ check_http (void)
+     printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
+                 (no_body ? "  [[ skipped ]]" : page));
+ 
+-  /* make sure the status line matches the response we are looking for */
+-  if (!expected_statuscode (status_line, server_expect)) {
+-    if (server_port == HTTP_PORT)
+-      asprintf (&msg,
+-                _("Invalid HTTP response received from host: %s\n"),
+-                status_line);
+-    else
+-      asprintf (&msg,
+-                _("Invalid HTTP response received from host on port %d: %s\n"),
+-                server_port, status_line);
+-    die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
+-  }
+-
+-  /* Bypass normal status line check if server_expect was set by user and not default */
+-  /* NOTE: After this if/else block msg *MUST* be an asprintf-allocated string */
+-  if ( server_expect_yn  )  {
+-    asprintf (&msg,
+-              _("Status line output matched \"%s\" - "), server_expect);
+-    if (verbose)
+-      printf ("%s\n",msg);
+-  }
+-  else {
+-    /* Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF */
+-    /* HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT */
+-    /* Status-Code = 3 DIGITS */
+-
+-    status_code = strchr (status_line, ' ') + sizeof (char);
+-    if (strspn (status_code, "1234567890") != 3)
+-      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status Line (%s)\n"), status_line);
+-
+-    http_status = atoi (status_code);
+-
+-    /* check the return code */
+-
+-    if (http_status >= 600 || http_status < 100) {
+-      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%s)\n"), status_line);
++  if (status_expect != -1) {
++    if (parser.status_code == status_expect)
++      asprintf (&msg, _("Got expected code %d - "), status_expect);
++    else {
++      asprintf (&msg, _("Invalid HTTP status received from host: %d\n"),
++                parser.status_code);
++      die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
++    }
++  } else {
++    if (parser.status_code >= 600 || parser.status_code < 100) {
++      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%d)\n"), parser.status_code);
+     }
+     /* server errors result in a critical state */
+-    else if (http_status >= 500) {
+-      asprintf (&msg, _("%s - "), status_line);
++    else if (parser.status_code >= 500) {
+       result = STATE_CRITICAL;
+     }
+     /* client errors result in a warning state */
+-    else if (http_status >= 400) {
+-      asprintf (&msg, _("%s - "), status_line);
++    else if (parser.status_code >= 400) {
+       result = max_state_alt(STATE_WARNING, result);
+     }
+     /* check redirected page if specified */
+-    else if (http_status >= 300) {
+-
+-      if (onredirect == STATE_DEPENDENT)
+-        redir (header, status_line);
++    else if (parser.status_code >= 300) {
++      if (onredirect == STATE_DEPENDENT) {
++        if (parser_data.location)
++          redir (parser_data.location);
++        else die (STATE_CRITICAL, _("Redirect without Location header\n"));
++      }
+       else
+         result = max_state_alt(onredirect, result);
+-      asprintf (&msg, _("%s - "), status_line);
+-    } /* end if (http_status >= 300) */
+-    else {
+-      /* Print OK status anyway */
+-      asprintf (&msg, _("%s - "), status_line);
+     }
+-
+-  } /* end else (server_expect_yn)  */
++    asprintf (&msg, _("%d - "), parser.status_code);
++  }
+ 
+   /* reset the alarm - must be called *after* redir or we'll never die on redirects! */
+   alarm (0);
+@@ -1111,11 +1146,10 @@ check_http (void)
+ #define HD5 URI_PATH
+ 
+ void
+-redir (char *pos, char *status_line)
++redir (char *pos)
+ {
+   int i = 0;
+   char *x;
+-  char xx[2];
+   char type[6];
+   char *addr;
+   char *url;
+@@ -1124,41 +1158,11 @@ redir (char *pos, char *status_line)
+   if (addr == NULL)
+     die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate addr\n"));
+ 
+-  url = malloc (strcspn (pos, "\r\n"));
++  url = malloc (strlen (pos) + 1);
+   if (url == NULL)
+     die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+ 
+-  while (pos) {
+-    sscanf (pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i);
+-    if (i == 0) {
+-      pos += (size_t) strcspn (pos, "\r\n");
+-      pos += (size_t) strspn (pos, "\r\n");
+-      if (strlen(pos) == 0)
+-        die (STATE_UNKNOWN,
+-             _("HTTP UNKNOWN - Could not find redirect location - %s%s\n"),
+-             status_line, (display_html ? "</A>" : ""));
+-      continue;
+-    }
+-
+-    pos += i;
+-    pos += strspn (pos, " \t");
+-
+-    /*
+-     * RFC 2616 (4.2):  ``Header fields can be extended over multiple lines by
+-     * preceding each extra line with at least one SP or HT.''
+-     */
+-    for (; (i = strspn (pos, "\r\n")); pos += i) {
+-      pos += i;
+-      if (!(i = strspn (pos, " \t"))) {
+-        die (STATE_UNKNOWN, _("HTTP UNKNOWN - Empty redirect location%s\n"),
+-             display_html ? "</A>" : "");
+-      }
+-    }
+-
+-    url = realloc (url, strcspn (pos, "\r\n") + 1);
+-    if (url == NULL)
+-      die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+-
++  { /* dummy block to reduce patch diff */
+     /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+     if (sscanf (pos, HD1, type, addr, &i, url) == 4) {
+       url = prepend_slash (url);
+@@ -1203,10 +1207,7 @@ redir (char *pos, char *status_line)
+            _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"),
+            pos, (display_html ? "</A>" : ""));
+     }
+-
+-    break;
+-
+-  } /* end while (pos) */
++  }
+ 
+   if (++redir_depth > max_depth)
+     die (STATE_WARNING,
+@@ -1332,11 +1333,8 @@ print_help (void)
+   printf ("    %s\n", _("(when this option is used the URL is not checked.)\n"));
+ #endif
+ 
+-  printf (" %s\n", "-e, --expect=STRING");
+-  printf ("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
+-  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", "-e, --expect=INTEGER");
++  printf ("    %s\n", _("Expected HTTP status code, overriding the default logic"));
+   printf (" %s\n", "-s, --string=STRING");
+   printf ("    %s\n", _("String to expect in the content"));
+   printf (" %s\n", "-u, --url=PATH");
+-- 
+1.7.2.5
+
+
+From a35b05d935f975478c90360ab56fb54d2d82e9c6 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Wed, 2 Nov 2011 09:52:19 +0100
+Subject: [PATCH 4/9] check_http: whitespace change to fix up indentation by removing dummy block
+
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |   76 ++++++++++++++++++++++++-------------------------
+ 1 files changed, 37 insertions(+), 39 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index ada7a95..3966ab4 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -1162,51 +1162,49 @@ redir (char *pos)
+   if (url == NULL)
+     die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+ 
+-  { /* dummy block to reduce patch diff */
+-    /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+-    if (sscanf (pos, HD1, type, addr, &i, url) == 4) {
+-      url = prepend_slash (url);
+-      use_ssl = server_type_check (type);
+-    }
++  /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
++  if (sscanf (pos, HD1, type, addr, &i, url) == 4) {
++    url = prepend_slash (url);
++    use_ssl = server_type_check (type);
++  }
+ 
+-    /* URI_HTTP URI_HOST URI_PATH */
+-    else if (sscanf (pos, HD2, type, addr, url) == 3 ) {
+-      url = prepend_slash (url);
+-      use_ssl = server_type_check (type);
+-      i = server_port_check (use_ssl);
+-    }
++  /* URI_HTTP URI_HOST URI_PATH */
++  else if (sscanf (pos, HD2, type, addr, url) == 3 ) {
++    url = prepend_slash (url);
++    use_ssl = server_type_check (type);
++    i = server_port_check (use_ssl);
++  }
+ 
+-    /* URI_HTTP URI_HOST URI_PORT */
+-    else if (sscanf (pos, HD3, type, addr, &i) == 3) {
+-      strcpy (url, HTTP_URL);
+-      use_ssl = server_type_check (type);
+-    }
++  /* URI_HTTP URI_HOST URI_PORT */
++  else if (sscanf (pos, HD3, type, addr, &i) == 3) {
++    strcpy (url, HTTP_URL);
++    use_ssl = server_type_check (type);
++  }
+ 
+-    /* URI_HTTP URI_HOST */
+-    else if (sscanf (pos, HD4, type, addr) == 2) {
+-      strcpy (url, HTTP_URL);
+-      use_ssl = server_type_check (type);
+-      i = server_port_check (use_ssl);
+-    }
++  /* URI_HTTP URI_HOST */
++  else if (sscanf (pos, HD4, type, addr) == 2) {
++    strcpy (url, HTTP_URL);
++    use_ssl = server_type_check (type);
++    i = server_port_check (use_ssl);
++  }
+ 
+-    /* URI_PATH */
+-    else if (sscanf (pos, HD5, url) == 1) {
+-      /* relative url */
+-      if ((url[0] != '/')) {
+-        if ((x = strrchr(server_url, '/')))
+-          *x = '\0';
+-        asprintf (&url, "%s/%s", server_url, url);
+-      }
+-      i = server_port;
+-      strcpy (type, server_type);
+-      strcpy (addr, host_name ? host_name : server_address);
++  /* URI_PATH */
++  else if (sscanf (pos, HD5, url) == 1) {
++    /* relative url */
++    if ((url[0] != '/')) {
++      if ((x = strrchr(server_url, '/')))
++        *x = '\0';
++      asprintf (&url, "%s/%s", server_url, url);
+     }
++    i = server_port;
++    strcpy (type, server_type);
++    strcpy (addr, host_name ? host_name : server_address);
++  }
+ 
+-    else {
+-      die (STATE_UNKNOWN,
+-           _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"),
+-           pos, (display_html ? "</A>" : ""));
+-    }
++  else {
++    die (STATE_UNKNOWN,
++         _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"),
++         pos, (display_html ? "</A>" : ""));
+   }
+ 
+   if (++redir_depth > max_depth)
+-- 
+1.7.2.5
+
+
+From 3f410b149eb7cd112466bbb147525c1d497adaa2 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Mon, 31 Oct 2011 17:45:49 +0100
+Subject: [PATCH 5/9] check_http: constify and rename the location argument for redir()
+
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 3966ab4..c4586d5 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -134,7 +134,7 @@ char buffer[MAX_INPUT_BUFFER];
+ 
+ int process_arguments (int, char **);
+ int check_http (void);
+-void redir (char *pos);
++void redir (const char *location);
+ int server_type_check(const char *type);
+ int server_port_check(int ssl_flag);
+ char *perfd_time (double microsec);
+@@ -1146,7 +1146,7 @@ check_http (void)
+ #define HD5 URI_PATH
+ 
+ void
+-redir (char *pos)
++redir (const char *location)
+ {
+   int i = 0;
+   char *x;
+@@ -1158,38 +1158,38 @@ redir (char *pos)
+   if (addr == NULL)
+     die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate addr\n"));
+ 
+-  url = malloc (strlen (pos) + 1);
++  url = malloc (strlen (location) + 1);
+   if (url == NULL)
+     die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+ 
+   /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+-  if (sscanf (pos, HD1, type, addr, &i, url) == 4) {
++  if (sscanf (location, HD1, type, addr, &i, url) == 4) {
+     url = prepend_slash (url);
+     use_ssl = server_type_check (type);
+   }
+ 
+   /* URI_HTTP URI_HOST URI_PATH */
+-  else if (sscanf (pos, HD2, type, addr, url) == 3 ) {
++  else if (sscanf (location, HD2, type, addr, url) == 3 ) {
+     url = prepend_slash (url);
+     use_ssl = server_type_check (type);
+     i = server_port_check (use_ssl);
+   }
+ 
+   /* URI_HTTP URI_HOST URI_PORT */
+-  else if (sscanf (pos, HD3, type, addr, &i) == 3) {
++  else if (sscanf (location, HD3, type, addr, &i) == 3) {
+     strcpy (url, HTTP_URL);
+     use_ssl = server_type_check (type);
+   }
+ 
+   /* URI_HTTP URI_HOST */
+-  else if (sscanf (pos, HD4, type, addr) == 2) {
++  else if (sscanf (location, HD4, type, addr) == 2) {
+     strcpy (url, HTTP_URL);
+     use_ssl = server_type_check (type);
+     i = server_port_check (use_ssl);
+   }
+ 
+   /* URI_PATH */
+-  else if (sscanf (pos, HD5, url) == 1) {
++  else if (sscanf (location, HD5, url) == 1) {
+     /* relative url */
+     if ((url[0] != '/')) {
+       if ((x = strrchr(server_url, '/')))
+@@ -1204,7 +1204,7 @@ redir (char *pos)
+   else {
+     die (STATE_UNKNOWN,
+          _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"),
+-         pos, (display_html ? "</A>" : ""));
++         location, (display_html ? "</A>" : ""));
+   }
+ 
+   if (++redir_depth > max_depth)
+-- 
+1.7.2.5
+
+
+From d1b806941bf6bf94754e86e832a11eabc003a656 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Mon, 31 Oct 2011 17:47:47 +0100
+Subject: [PATCH 6/9] check_http: make list of parsed headers configurable
+
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |   58 +++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 46 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index c4586d5..5466e06 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -49,13 +49,17 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ #define STICKY_HOST 1
+ #define STICKY_PORT 2
+ 
++struct header_data_t {
++  const char *field;
++  char *value;
++};
++
+ struct parser_data_t {
+   enum http_errno prev_callback; /* use HPE_CB_ macros for identifying callbacks */
+-  char *current_header;
+-  size_t current_header_length;
+-  int parsing_location;
+-  char *location;
+-  size_t location_length;
++  char *current_field;
++  size_t current_length;
++  struct header_data_t *current_header;
++  struct header_data_t *headers;
+ };
+ 
+ enum {
+@@ -758,6 +762,17 @@ prepend_slash (char *path)
+   return newpath;
+ }
+ 
++const char *
++get_value (const struct header_data_t *header, const char *field)
++{
++  while (header->field) {
++    if (!strcasecmp (header->field, field))
++      return header->value;
++    header++;
++  }
++  return 0;
++}
++
+ /*
+ Returns 0 on success, 1 if allocation fails.
+ Works on binary data, but also zero-terminates the result
+@@ -781,13 +796,13 @@ header_field_callback (http_parser *parser, const char *at, size_t length)
+   
+   switch (data->prev_callback) {
+   case HPE_CB_header_value:
+-    data->current_header_length = 0;
++    data->current_length = 0;
+     /* fall through */
+   case 0:
+     data->prev_callback = HPE_CB_header_field;
+     /* fall through */
+   case HPE_CB_header_field:
+-    return append (&data->current_header, &data->current_header_length, at, length);
++    return append (&data->current_field, &data->current_length, at, length);
+   default:
+     return 1;
+   }
+@@ -797,15 +812,23 @@ int
+ header_value_callback (http_parser *parser, const char *at, size_t length)
+ {
+   struct parser_data_t *data = parser->data;
++  struct header_data_t *header;
+ 
+   switch (data->prev_callback) {
+   case HPE_CB_header_field:
+-    data->parsing_location = !strcasecmp (data->current_header, "location");
++    data->current_header = 0;
++    data->current_length = 0;
++    for (header = data->headers; header->field; header++)
++      if (!strcasecmp (data->current_field, header->field)) {
++        data->current_header = header;
++        break;
++      }
+     data->prev_callback = HPE_CB_header_value;
+     /* fall through */
+   case HPE_CB_header_value:
+-    return data->parsing_location &&
+-           append (&data->location, &data->location_length, at, length);
++    return data->current_header &&
++           append (&(data->current_header->value),
++                   &data->current_length, at, length);
+   default:
+     return 1;
+   }
+@@ -816,6 +839,13 @@ headers_complete_callback (http_parser *parser)
+ {
+   struct parser_data_t *data = parser->data;
+ 
++  if (verbose) {
++    const struct header_data_t *header;
++    printf ("Parsed headers:\n");
++    for (header = data->headers; header->field; header++)
++      printf ("%s: %s\n", header->field, header->value);
++  }
++
+   data->prev_callback = HPE_CB_headers_complete;
+ 
+   if (no_body) /* Terminate parsing (thus reading) if the -N option is set */
+@@ -843,6 +873,8 @@ check_http (void)
+   http_parser_settings settings;
+   http_parser parser;
+   struct parser_data_t parser_data;
++  struct header_data_t interesting_headers[] =
++    {{"location", 0}, {"date", 0}, {"last-modified", 0}, {0, 0}};
+ 
+   /* try to connect to the host at the given port number */
+   if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
+@@ -923,6 +955,7 @@ check_http (void)
+   /* Initialize the HTTP parser */
+   http_parser_init (&parser, HTTP_RESPONSE);
+   memset (&parser_data, 0, sizeof parser_data);
++  parser_data.headers = interesting_headers;
+   parser.data = &parser_data;
+   memset (&settings, 0, sizeof settings);
+   settings.on_header_field = header_field_callback;
+@@ -1043,8 +1076,9 @@ check_http (void)
+     /* check redirected page if specified */
+     else if (parser.status_code >= 300) {
+       if (onredirect == STATE_DEPENDENT) {
+-        if (parser_data.location)
+-          redir (parser_data.location);
++        const char *location = get_value (parser_data.headers, "location");
++        if (location)
++          redir (location);
+         else die (STATE_CRITICAL, _("Redirect without Location header\n"));
+       }
+       else
+-- 
+1.7.2.5
+
+
+From 62e8868bb24c2161ccb7748dba82c6a90618aac3 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Mon, 31 Oct 2011 17:57:11 +0100
+Subject: [PATCH 7/9] check_http: use header parsing machinery in check_document_dates()
+
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |   61 +++----------------------------------------------
+ 1 files changed, 4 insertions(+), 57 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 5466e06..423bb22 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -600,63 +600,10 @@ parse_time_string (const char *string)
+ }
+ 
+ static int
+-check_document_dates (const char *headers, char **msg)
++check_document_dates (const char *server_date, const char *document_date, char **msg)
+ {
+-  const char *s;
+-  char *server_date = 0;
+-  char *document_date = 0;
+   int date_result = STATE_OK;
+ 
+-  s = headers;
+-  while (*s) {
+-    const char *field = s;
+-    const char *value = 0;
+-
+-    /* Find the end of the header field */
+-    while (*s && !isspace(*s) && *s != ':')
+-      s++;
+-
+-    /* Remember the header value, if any. */
+-    if (*s == ':')
+-      value = ++s;
+-
+-    /* Skip to the end of the header, including continuation lines. */
+-    while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
+-      s++;
+-
+-    /* Avoid stepping over end-of-string marker */
+-    if (*s)
+-      s++;
+-
+-    /* Process this header. */
+-    if (value && value > field+2) {
+-      char *ff = (char *) malloc (value-field);
+-      char *ss = ff;
+-      while (field < value-1)
+-        *ss++ = tolower(*field++);
+-      *ss++ = 0;
+-
+-      if (!strcmp (ff, "date") || !strcmp (ff, "last-modified")) {
+-        const char *e;
+-        while (*value && isspace (*value))
+-          value++;
+-        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
+-          ;
+-        ss = (char *) malloc (e - value + 1);
+-        strncpy (ss, value, e - value);
+-        ss[e - value] = 0;
+-        if (!strcmp (ff, "date")) {
+-          if (server_date) free (server_date);
+-          server_date = ss;
+-        } else {
+-          if (document_date) free (document_date);
+-          document_date = ss;
+-        }
+-      }
+-      free (ff);
+-    }
+-  }
+-
+   /* Done parsing the body.  Now check the dates we (hopefully) parsed.  */
+   if (!server_date || !*server_date) {
+     asprintf (msg, _("%sServer date unknown, "), *msg);
+@@ -687,8 +634,6 @@ check_document_dates (const char *headers, char **msg)
+         date_result = max_state_alt(STATE_CRITICAL, date_result);
+       }
+     }
+-    free (server_date);
+-    free (document_date);
+   }
+   return date_result;
+ }
+@@ -1091,7 +1036,9 @@ check_http (void)
+   alarm (0);
+ 
+   if (maximum_age >= 0) {
+-    result = max_state_alt(check_document_dates(header, &msg), result);
++    result = max_state_alt(check_document_dates(get_value (parser_data.headers, "date"),
++                                                get_value (parser_data.headers, "last-modified"), &msg),
++                           result);
+   }
+ 
+   /* Page and Header content checks go here */
+-- 
+1.7.2.5
+
+
+From efe4e949ae4ba64f333f402d0f4b54f07b18164c Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Tue, 1 Nov 2011 16:17:00 +0100
+Subject: [PATCH 8/9] check_http: also read the response content via http-parse
+
+This gets rid of good a bunch of code, and also gives free decoding of
+Transfer-Encoding: chunked, which all HTTP/1.1 clients must support.
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |   86 ++++++++++++-------------------------------------
+ 1 files changed, 21 insertions(+), 65 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 423bb22..deea38c 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -60,6 +60,7 @@ struct parser_data_t {
+   size_t current_length;
+   struct header_data_t *current_header;
+   struct header_data_t *headers;
++  char *content;
+ };
+ 
+ enum {
+@@ -488,26 +489,6 @@ process_arguments (int argc, char **argv)
+   return TRUE;
+ }
+ 
+-
+-
+-/* Returns 1 if we're done processing the document body; 0 to keep going */
+-static int
+-document_headers_done (char *full_page)
+-{
+-  const char *body;
+-
+-  for (body = full_page; *body; body++) {
+-    if (!strncmp (body, "\n\n", 2) || !strncmp (body, "\n\r\n", 3))
+-      break;
+-  }
+-
+-  if (!*body)
+-    return 0;  /* haven't read end of headers yet */
+-
+-  full_page[body - full_page] = 0;
+-  return 1;
+-}
+-
+ static time_t
+ parse_time_string (const char *string)
+ {
+@@ -792,6 +773,7 @@ headers_complete_callback (http_parser *parser)
+   }
+ 
+   data->prev_callback = HPE_CB_headers_complete;
++  data->current_length = 0;     /* prepare for the body */
+ 
+   if (no_body) /* Terminate parsing (thus reading) if the -N option is set */
+     return 2;  /* 1 means don't expect body in this callback */
+@@ -799,16 +781,20 @@ headers_complete_callback (http_parser *parser)
+ }
+ 
+ int
++body_callback (http_parser *parser, const char *at, size_t length)
++{
++  struct parser_data_t *data = parser->data;
++
++  return append (&data->content, &data->current_length, at, length);
++}
++
++int
+ check_http (void)
+ {
+   char *msg;
+-  char *header;
+-  char *page;
+   char *auth;
+   int i = 0;
+   size_t pagesize = 0;
+-  char *full_page;
+-  char *full_page_new;
+   char *buf;
+   char *pos;
+   long microsec;
+@@ -906,31 +892,19 @@ check_http (void)
+   settings.on_header_field = header_field_callback;
+   settings.on_header_value = header_value_callback;
+   settings.on_headers_complete = headers_complete_callback;
++  settings.on_body = body_callback;
+ 
+   /* fetch the page */
+-  full_page = strdup("");
+   while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) >= 0) {
+     int nparsed = http_parser_execute(&parser, &settings, buffer, i);
++    pagesize += i;
+     if (nparsed != i) {
+       enum http_errno code = HTTP_PARSER_ERRNO (&parser);
+-      if (code == HPE_CB_headers_complete) { /* the -N check fired */
+-        /* break; FIXME this would break the current header code */
+-      } else {
+-        printf ("http_parser_execute returned %d instead of %i: %s\n",
+-                nparsed, i, http_errno_description (code));
+-      }
++      if (code == HPE_CB_headers_complete) break; /* the -N check fired */
++      else die (STATE_CRITICAL, _("HTTP CRITICAL - error parsing response: %s"),
++                http_errno_description (code));
+     }
+     if (i == 0) break;
+-    buffer[i] = '\0';
+-    asprintf (&full_page_new, "%s%s", full_page, buffer);
+-    free (full_page);
+-    full_page = full_page_new;
+-    pagesize += i;
+-
+-                if (no_body && document_headers_done (full_page)) {
+-                  i = 0;
+-                  break;
+-                }
+   }
+ 
+   if (i < 0 && errno != ECONNRESET) {
+@@ -969,34 +943,16 @@ check_http (void)
+   microsec = deltime (tv);
+   elapsed_time = (double)microsec / 1.0e6;
+ 
+-  /* leave full_page untouched so we can free it later */
+-  page = full_page;
+-
+   if (verbose && !no_body)
+     printf ("%s://%s:%d%s is %d characters\n",
+       use_ssl ? "https" : "http", server_address,
+       server_port, server_url, (int)pagesize);
+ 
+-  /* skip status line */
+-  page += (size_t) strcspn (page, "\r\n");
+-  page += (size_t) strspn (page, "\r\n");
+-
+-  /* find header info and null-terminate it */
+-  header = page;
+-  while (strcspn (page, "\r\n") > 0) {
+-    page += (size_t) strcspn (page, "\r\n");
+-    pos = page;
+-    if ((strspn (page, "\r") == 1 && strspn (page, "\r\n") >= 2) ||
+-        (strspn (page, "\n") == 1 && strspn (page, "\r\n") >= 2))
+-      page += (size_t) 2;
+-    else
+-      page += (size_t) 1;
++  if (verbose && !no_body) {
++    puts ("**** CONTENT ****");
++    fwrite (parser_data.content, parser_data.current_length, 1, stdout);
++    putchar ('\n');
+   }
+-  page += (size_t) strspn (page, "\r\n");
+-  header[pos - header] = 0;
+-  if (verbose)
+-    printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
+-                (no_body ? "  [[ skipped ]]" : page));
+ 
+   if (status_expect != -1) {
+     if (parser.status_code == status_expect)
+@@ -1044,7 +1000,7 @@ check_http (void)
+   /* Page and Header content checks go here */
+ 
+   if (strlen (string_expect)) {
+-    if (!strstr (page, string_expect)) {
++    if (!strstr (parser_data.content, string_expect)) {
+       strncpy(&output_string_search[0],string_expect,sizeof(output_string_search));
+       if(output_string_search[sizeof(output_string_search)-1]!='\0') {
+         bcopy("...",&output_string_search[sizeof(output_string_search)-4],4);
+@@ -1055,7 +1011,7 @@ check_http (void)
+   }
+ 
+   if (strlen (regexp)) {
+-    errcode = regexec (&preg, page, REGS, pmatch, 0);
++    errcode = regexec (&preg, parser_data.content, REGS, pmatch, 0);
+     if ((errcode == 0 && invert_regex == 0) || (errcode == REG_NOMATCH && invert_regex == 1)) {
+       /* OK - No-op to avoid changing the logic around it */
+       result = max_state_alt(STATE_OK, result);
+-- 
+1.7.2.5
+
+
+From 256d8d15acf98ee405f79b75a52692531d173f49 Mon Sep 17 00:00:00 2001
+From: Ferenc Wagner <wferi@niif.hu>
+Date: Wed, 2 Nov 2011 07:57:30 +0100
+Subject: [PATCH 9/9] check_http: check content length instead of response length
+
+The content length does not depend on the transfer encoding and may
+be possible to derive without fetching the entire body (cf. -N option).
+
+Signed-off-by: Ferenc Wagner <wferi@niif.hu>
+---
+ plugins/check_http.c |   93 +++++++++++---------------------------------------
+ 1 files changed, 20 insertions(+), 73 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index deea38c..27f5cd3 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -619,59 +619,6 @@ check_document_dates (const char *server_date, const char *document_date, char *
+   return date_result;
+ }
+ 
+-int
+-get_content_length (const char *headers)
+-{
+-  const char *s;
+-  int content_length = 0;
+-
+-  s = headers;
+-  while (*s) {
+-    const char *field = s;
+-    const char *value = 0;
+-
+-    /* Find the end of the header field */
+-    while (*s && !isspace(*s) && *s != ':')
+-      s++;
+-
+-    /* Remember the header value, if any. */
+-    if (*s == ':')
+-      value = ++s;
+-
+-    /* Skip to the end of the header, including continuation lines. */
+-    while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
+-      s++;
+-
+-    /* Avoid stepping over end-of-string marker */
+-    if (*s)
+-      s++;
+-
+-    /* Process this header. */
+-    if (value && value > field+2) {
+-      char *ff = (char *) malloc (value-field);
+-      char *ss = ff;
+-      while (field < value-1)
+-        *ss++ = tolower(*field++);
+-      *ss++ = 0;
+-
+-      if (!strcmp (ff, "content-length")) {
+-        const char *e;
+-        while (*value && isspace (*value))
+-          value++;
+-        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
+-          ;
+-        ss = (char *) malloc (e - value + 1);
+-        strncpy (ss, value, e - value);
+-        ss[e - value] = 0;
+-        content_length = atoi(ss);
+-        free (ss);
+-      }
+-      free (ff);
+-    }
+-  }
+-  return (content_length);
+-}
+-
+ char *
+ prepend_slash (char *path)
+ {
+@@ -799,13 +746,13 @@ check_http (void)
+   char *pos;
+   long microsec;
+   double elapsed_time;
+-  int page_len = 0;
++  int page_len = -1;
+   int result = STATE_OK;
+   http_parser_settings settings;
+   http_parser parser;
+   struct parser_data_t parser_data;
+   struct header_data_t interesting_headers[] =
+-    {{"location", 0}, {"date", 0}, {"last-modified", 0}, {0, 0}};
++    {{"location", 0}, {"date", 0}, {"last-modified", 0}, {"content-length", 0}, {0, 0}};
+ 
+   /* try to connect to the host at the given port number */
+   if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
+@@ -1031,21 +978,21 @@ check_http (void)
+     }
+   }
+ 
+-  /* make sure the page is of an appropriate size */
+-  /* page_len = get_content_length(header); */
+-  /* FIXME: Will this work with -N ? IMHO we should use
+-   * get_content_length(header) and always check if it's different than the
+-   * returned pagesize
+-   */
+-  /* FIXME: IIRC pagesize returns headers - shouldn't we make
+-   * it == get_content_length(header) ??
+-   */
+-  page_len = pagesize;
+-  if ((max_page_len > 0) && (page_len > max_page_len)) {
+-    asprintf (&msg, _("%spage size %d too large, "), msg, page_len);
+-    result = max_state_alt(STATE_WARNING, result);
+-  } else if ((min_page_len > 0) && (page_len < min_page_len)) {
+-    asprintf (&msg, _("%spage size %d too small, "), msg, page_len);
++  /* make sure the content is of an appropriate size */
++  if (no_body) {
++    const char *content_length = get_value (parser_data.headers, "content-length");
++    if (content_length) page_len = atol (content_length);
++  } else page_len = parser_data.current_length;
++  if (page_len != -1) {
++    if ((max_page_len > 0) && (page_len > max_page_len)) {
++      asprintf (&msg, _("%spage size %d too large, "), msg, page_len);
++      result = max_state_alt(STATE_WARNING, result);
++    } else if ((min_page_len > 0) && (page_len < min_page_len)) {
++      asprintf (&msg, _("%spage size %d too small, "), msg, page_len);
++      result = max_state_alt(STATE_WARNING, result);
++    }
++  } else if (max_page_len > 0 || min_page_len > 0) {
++    asprintf (&msg, _("%spage size unknown, "), msg);
+     result = max_state_alt(STATE_WARNING, result);
+   }
+ 
+@@ -1058,7 +1005,7 @@ check_http (void)
+   /* check elapsed time */
+   asprintf (&msg,
+             _("%s - %d bytes in %.3f second response time %s|%s %s"),
+-            msg, page_len, elapsed_time,
++            msg, pagesize, elapsed_time,
+             (display_html ? "</A>" : ""),
+             perfd_time (elapsed_time), perfd_size (page_len));
+ 
+@@ -1310,7 +1257,7 @@ print_help (void)
+   printf ("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
+   printf ("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
+   printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
+-  printf ("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
++  printf ("    %s\n", _("Minimum content size required (bytes) : Maximum content size required (bytes)"));
+ 
+   printf (UT_WARN_CRIT);
+ 
+@@ -1361,7 +1308,7 @@ print_usage (void)
+   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 ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
++  printf ("       [-P string] [-m <min_cnt_size>:<max_cnt_size>] [-4|-6] [-N] [-M <age>]\n");
+   printf ("       [-A string] [-k string] [-S] [--sni] [-C <age>] [-T <content-type>]\n");
+   printf ("       [-j method]\n");
+ }
+-- 
+1.7.2.5
+
diff --git a/web/attachments/427640-nagios-plugins-openvz-beans.diff b/web/attachments/427640-nagios-plugins-openvz-beans.diff
new file mode 100644
index 0000000..47a8f40
--- /dev/null
+++ b/web/attachments/427640-nagios-plugins-openvz-beans.diff
@@ -0,0 +1,1771 @@
+diff -urN nothing/check_openvz_beans.py nagios-plugins-openvz-beans/check_openvz_beans.py
+--- nothing/check_openvz_beans.py       1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/check_openvz_beans.py   2011-11-01 19:04:11.133266362 +0100
+@@ -0,0 +1,589 @@
++#!/usr/bin/python
++#
++# Nagios check for OpenVZ bean counters
++#
++# usage:
++#   check_openvz_beans.py [options]
++#
++# see "check_openvz_beans.py -h" for detailed options
++#
++# Licensed under GPLv2 (or later)
++#
++# Copyright (C) 2011 NOKIA
++# Written by Andreas Kotes <andreas.kotes@nokia.com>
++#
++# Reviewed-by: Pascal Hahn <pascal.hahn@nokia.com>
++# Signed-Off-by: Pascal Hahn <pascal.hahn@nokia.com>
++# Signed-Off-by: Jessvin Thomas <jessvin.thomas@nokia.com>
++#
++
++import os
++import re
++import errno
++import sys
++import socket
++
++# using 'optparse' for Python 2.4 compatibility
++import optparse
++# using subprocess for clean sudo handling
++import subprocess
++
++__author__ = ('Andreas Kotes <andreas.kotes@nokia.com>')
++
++OPENVZ_CONFPATH = '/etc/vz/conf'
++OPENVZ_UBCSTORE = '/tmp/vzubc.store'
++
++class Error(Exception):
++   """Module level error."""
++   pass
++
++
++class NoBeanCountersFoundError(Error):
++   "No BeanCounters could be found in output."""
++   pass
++
++
++class BeanCounter(object):
++  """Object storing OpenVZ beancounter information"""
++  FIND_BEAN_COUNTER_RE = r'''(?xms)       # verbose, multiline, special
++    ^                                     # begin entry
++    \s*(?P<resource>\S+)                  # resource name
++    \s*(?P<held>\d+)                      # held count
++    \s*(?P<maxheld>\d+)                   # maximum held
++    \s*(?P<barrier>\d+)                   # barrier
++    \s*(?P<limit>\d+)                     # limit
++    \s*(?P<failcnt>\d+)                   # failure counter
++    '''
++  def __init__(self, uid, resource_txt, use_absolute_failcnt=False, storepath=OPENVZ_UBCSTORE):
++    """Create object storing OpenVZ beancounter information
++
++    Args
++      uid:          int  - OpenVZ context identifier
++      resource_txt: str  - OpenVZ resource
++      use_absolute_failcnt:
++                    bool - Whether to use delta failcnts or not
++      storepath:    str  - Path to OpenVZ's vzubc's data storage
++    """
++    self.uid = uid
++
++    # extract data from text line
++    resourcedata = re.match(BeanCounter.FIND_BEAN_COUNTER_RE, resource_txt).groupdict()
++    self.resource = resourcedata['resource']
++    self.held     = int(resourcedata['held'])
++    self.maxheld  = int(resourcedata['maxheld'])
++    self.barrier  = int(resourcedata['barrier'])
++    self.limit    = int(resourcedata['limit'])
++    self.failcnt  = int(resourcedata['failcnt'])
++
++    if not use_absolute_failcnt:
++       prev_failcnt = self.read_vzubc_failcnt(storepath)
++       # don't update from stale / lower value
++       if (prev_failcnt <= self.failcnt):
++           self.failcnt -= prev_failcnt
++
++  def read_vzubc_failcnt(self, storepath=OPENVZ_UBCSTORE):
++    """Read data stored by vzubc -r.
++
++    Args
++      uid:          int  - OpenVZ context identifier
++      storepath:    str  - Path to OpenVZ's vzubc's data storage
++
++    Returns:
++      int - stored value or 0
++    """
++    filename = os.path.join(storepath, "ubc.%d.%s.failcnt" % (self.uid, self.resource))
++    if os.path.exists(filename):
++        return int(open(filename, "r").read())
++    else:
++        return 0
++
++  def __repr__(self):
++    return ('<BeanCounter for uid %d resource %s: held %d maxheld %d barrier %d limit %d failcnt %d>' %
++           (self.uid, self.resource, self.held, self.maxheld, self.barrier, self.limit, self.failcnt))
++
++  def __eq__(self, other):
++    if (self.uid == other.uid and
++        self.resource == other.resource and
++        self.held == other.held and
++        self.maxheld == other.maxheld and
++        self.barrier == other.barrier and
++        self.limit == other.limit and
++        self.failcnt == other.failcnt):
++       return True
++    else:
++       return False
++
++
++class BeanCounterParser(object):
++  """Parse bean counter information."""
++  FIND_BEAN_COUNTER_GROUP_RE = r'''(?xms) # verbose, multline, special
++    ^                                     # begin entry
++    \s*(?P<uid>\d+):                      # group / context number
++    (?P<beancounters>[^:]*)$              # everything up to next group/EOF
++    '''
++
++  def parse_beancounters(self, beancounters_data, use_absolute_failcnt=False, storepath=OPENVZ_UBCSTORE):
++    """Populate BeanCounter objects with data.
++
++    Args:
++      beancounters_data: str - containing the unparsed
++      use_absolute_failcnt:
++                    bool - Whether to use delta failcnts or not
++      storepath:    str  - Path to OpenVZ's vzubc's data storage
++
++    Raises:
++      NoBeanCountersFoundError - in case no counters where found
++    """
++    # find all beans blocks
++    result = re.findall(BeanCounterParser.FIND_BEAN_COUNTER_GROUP_RE, beancounters_data)
++    if not result:
++      raise NoBeanCountersFoundError
++    self.beancounters = []
++    for uid, resource_txt in result:
++      for line in resource_txt.split("\n"):
++        if line:
++          self.beancounters.append(BeanCounter(int(uid), line, use_absolute_failcnt, storepath))
++    return self.beancounters
++
++  def __init__(self, beancounters_data, use_absolute_failcnt=False, storepath=OPENVZ_UBCSTORE):
++    """Create a new BeanCounter object
++
++    Args:
++      beancounters_data: str - containing the unparsed
++                    contents of /proc/user_beancounters
++      use_absolute_failcnt:
++                    bool - Whether to use delta failcnts or not
++      storepath:    str  - Path to OpenVZ's vzubc's data storage
++    """
++    self.parse_beancounters(beancounters_data, use_absolute_failcnt, storepath)
++
++  def get_beancounters(self):
++    return self.beancounters
++
++
++class BeanCounterThreshold(object):
++  """Holds threshold values for BeanCounters"""
++  THRESHOLD_KEYS = {
++    # relevant threshold limiting in OpenVZ
++    # see http://wiki.openvz.org/UBC_parameter_properties
++    # NOTE: custom/missing beancounters are treated limited by limit
++    'limit'  : ['lockedpages', 'numfile' , 'numiptent', 'numothersock', 'numproc', 'numpty', 'numsiginfo', 'numtcpsock', 'shmpages'],
++    'barrier': ['dcachesize', 'dgramrcvbuf', 'kmemsize', 'numflock', 'oomguarpages', 'othersockbuf', 'privvmpages', 'tcprcvbuf', 'tcpsndbuf', 'vmguarpages'],
++    'none'   : ['physpages']
++  }
++
++  def __init__(self, resource=None, critical=95, warning=90):
++    """Create a new verifier.
++
++    Args:
++      resource: str - resource name (None = wildcard match all resources)
++      critical: int - critical level (percentage of limit)
++       warning: int - critical level (percentage of limit)
++    """
++    self.resource = resource
++    self.critical = critical
++    self.warning  = warning
++
++  def __repr__(self):
++    if not self.resource:
++      resource = '*'
++    else:
++      resource = self.resource
++    return ('<BeanCounterThreshold for resource %s: critical %d warning %d>' %
++           (resource, self.critical, self.warning))
++
++  def check(self, beancounter, use_maxheld=False):
++    """Check a threshold
++
++    Args:
++      beancounter: BeanCounter object
++      use_maxheld: bool - use maxheld instead of held counter for limits
++
++    Returns:
++      None or BeanCounterViolation (or subclass)
++    """
++    if not self.resource or beancounter.resource == self.resource:
++      if beancounter.failcnt:
++        return BeanCounterFailure(beancounter.resource, beancounter.uid, beancounter.failcnt)
++
++      # what are we measuring against?
++      if beancounter.resource in BeanCounterThreshold.THRESHOLD_KEYS['barrier']:
++        quota = beancounter.barrier
++      else:
++        quota = beancounter.limit
++
++      # what are we measuring?
++      if use_maxheld:
++        value = beancounter.maxheld
++      else:
++        value = beancounter.held
++
++      if value > quota:
++        return BeanCounterOvershoot(beancounter.resource, beancounter.uid, value - quota)
++
++      # check for critical / warning by comparing our value with the relevant
++      # percentage of our quota. return an object with information how much
++      # over quota we are.
++      if quota and self.critical >= 0 and value >= (quota * (float(self.critical)/100)):
++        return BeanCounterCritical(beancounter.resource, beancounter.uid, value - int((quota * (float(self.critical)/100))))
++      if quota and self.warning >= 0 and value >= (quota * (float(self.warning)/100)):
++        return BeanCounterWarning(beancounter.resource, beancounter.uid, value - int((quota * (float(self.warning)/100))))
++    return None
++
++
++class BeanCounterViolation(object):
++  """Alert containing a BeanCounter violation."""
++  def __init__(self, resource, uid, excess):
++    """Create a new BeanCounter violation.
++
++    Args:
++      resource: str - resource name
++           uid: int - context uid
++        excess: int - how much the limit was exceeded
++    """
++    self.tag = 'VIOL'
++    self.resource = resource
++    self.uid = uid
++    self.excess = excess
++
++  def __repr__(self):
++    return ('<%s %s: resource %s in context %d by %d>' %
++           (self.__class__.__name__, self.tag, self.resource, self.uid, self.excess))
++
++
++class BeanCounterFailure(BeanCounterViolation):
++  """Alert containing a BeanCounter failure."""
++  def __init__(self, resource, uid, excess):
++    """Create a new BeanCounter failure.
++
++    Args:
++      resource: str - resource name
++           uid: int - context uid
++        excess: int - how much the limit was exceeded
++    """
++    super(BeanCounterFailure, self).__init__(resource, uid, excess)
++    self.tag = 'FAIL'
++
++
++class BeanCounterOvershoot(BeanCounterViolation):
++  """Alert containing a BeanCounter overshoot."""
++  def __init__(self, resource, uid, excess):
++    """Create a new BeanCounter overshoot.
++
++    Args:
++      resource: str - resource name
++           uid: int - context uid
++        excess: int - how much the limit was exceeded
++    """
++    super(BeanCounterOvershoot, self).__init__(resource, uid, excess)
++    self.tag = 'OVER'
++
++
++class BeanCounterCritical(BeanCounterViolation):
++  """Alert containing a BeanCounter critical."""
++  def __init__(self, resource, uid, excess):
++    """Create a new BeanCounter critical alert
++
++    Args:
++      resource: str - resource name
++           uid: int - context uid
++        excess: int - how much the limit was exceeded
++    """
++    super(BeanCounterCritical, self).__init__(resource, uid, excess)
++    self.tag = 'CRIT'
++
++
++class BeanCounterWarning(BeanCounterViolation):
++  """Alert containing a BeanCounter warning."""
++  def __init__(self, resource, uid, excess):
++    """Create a new BeanCounter warning alert
++
++    Args:
++      resource: str - resource name
++           uid: int - context uid
++        excess: int - how much the limit was exceeded
++    """
++    super(BeanCounterWarning, self).__init__(resource, uid, excess)
++    self.tag = 'WARN'
++
++
++class BeanCounterVerifier(object):
++  """Verifier wrapper for bean counters."""
++  def __init__(self, options):
++    """Create a new set of verifiers
++
++    Args:
++      options: optparse.Values, options used:
++                warning:  int - generic warning level
++               critical:  int - generic critical level
++            res_warning: dict - resource name:int level
++           res_critical: dict - resource name:int level
++    """
++    # add common thresholds
++    self.thresholds = [BeanCounterThreshold(None, options.critical, options.warning)]
++    for resource, level in options.res_warning.items():
++       # has both critical and warning values?
++       if resource in options.res_critical:
++         self.thresholds.append(BeanCounterThreshold(resource, options.res_critical[resource], level))
++       else:
++         self.thresholds.append(BeanCounterThreshold(resource, -1, level))
++    for resource, level in options.res_critical.iteritems():
++       # already defined during warning value loop?
++       if not resource in options.res_warning:
++         self.thresholds.append(BeanCounterThreshold(resource, level, -1))
++
++  def verify(self, beancounters, use_maxheld=False):
++    """Verify BeanCounters
++
++    Args:
++      beancounters: list of BeanCounters
++      use_maxheld: bool - use maxheld instead of held counter for limits
++
++    Returns:
++      list of lists (see BeanCounterThreshold.check)
++    """
++    results = []
++    for beancounter in beancounters:
++      for threshold in self.thresholds:
++        result = threshold.check(beancounter, use_maxheld)
++        if result:
++          results.append(result)
++    return results
++
++
++def shorten_hostname(hostname, parts=2):
++  """Shorten hostname by taking only certain parts from the beginning of it.
++
++  Args:
++    hostname: str - FQDN
++       parts: int - number of parts to keep
++  """
++  # return at least the hostname
++  if (parts < 1):
++    parts = 1
++  if hostname:
++    return '.'.join(hostname.split('.')[:parts])
++  return None
++
++
++def get_vm_hostname(uid, confpath=OPENVZ_CONFPATH):
++  """Get hostname for a vm by getting the hostname from config file
++
++  Args:
++         uid: int - uid / container context number of vm
++    confpath: str - folder in which to find <uid>.conf
++
++  Returns:
++    str: FQDN as configured, or None
++  """
++  try:
++     result = re.search(r'HOSTNAME="(.*)"', open(confpath+"/"+str(uid)+".conf", "r").read())
++     if result:
++       return result.group(1)
++  except IOError:
++    return None
++
++
++def get_local_fqdn():
++  """Get local hostname."""
++  return socket.gethostname()
++
++
++def get_hostname(uid, confpath=OPENVZ_CONFPATH, parts=2):
++  """Get and shorten OpenVZ vm hostname
++
++  Args:
++         uid: ints - uid / container context number
++    confpath: str - folder in which to find <uid>.conf
++       parts: int - number of hostname parts to return
++
++  Returns:
++    str: hostname
++  """
++  # the hypervisor itself, or a VM -> use local hostname
++  # NOTE: this assumes a correct confpath and non-existence of it on VMs.
++  if uid == 0 or not os.path.exists(confpath):
++    hostname = get_local_fqdn()
++  else:
++    hostname = get_vm_hostname(uid, confpath)
++  # drop ending domain parts of FQDN
++  return shorten_hostname(hostname, parts)
++
++
++def read_data(options):
++  """Read OpenVZ counter data from system
++
++  Args:
++    options: optparse object:
++          sudo: bool - use sudo to read file or not
++      filename: str  - filename to read
++
++  Return:
++    str: verbatim file contents
++
++  Sideeffects:
++    May exit to system directly.
++  """
++  # read into a string directly, or with a "sudo cat"
++  if not options.sudo:
++    try:
++      data = open(options.filename, "r").read()
++    except IOError, (errorcode, errorstr):
++      # file not found? not an OpenVZ system!
++      if (errorcode == errno.ENOENT):
++        print "OK: Not an OpenVZ system, no need to worry about beancounters."
++        sys.exit(0)
++      elif (errorcode == errno.EACCES):
++        print "UNKNOWN: Not permitted to read beancounter information."
++        sys.exit(3)
++      else:
++        print "CRITICAL: Unknown problem reading beancounters."
++        sys.exit(2)
++  else:
++    # call a non-interactive sudo to read the file
++    # needs to be configured via e.g. /etc/sudoers
++    try:
++      data = subprocess.Popen(["/usr/bin/sudo", "-n", "cat", options.filename], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
++    except OSError, (errorcode, errorstr):
++      print "CRITICAL: Can't execute sudo to read beancounters. (%d - %s)" % (errorcode, errorstr)
++      sys.exit(2)
++    if not data:
++      print "CRITICAL: Trying to read beancounters with sudo didn't yield data."
++      sys.exit(2)
++  return data
++
++
++def create_optionsparser():
++  """Create optparse.OptionParser object for us
++
++  Returns:
++    optparse.OptionParser object
++  """
++  usage = "usage: %prog [options]"
++  parser = optparse.OptionParser(usage=usage, option_class=ExtOption)
++  parser.add_option("-w", "--warning",       dest="warning",      default=90,
++    action="store_int",   help="default warning threshold percentage for everything (default: %default)")
++  parser.add_option("-c", "--critical",      dest="critical",     default=95,
++    action="store_int",   help="default critical threshold percentage for everything (default: %default)")
++  parser.add_option("-W", "--resource-warning",    dest="res_warning",  default={},
++    action="keyvalgroup", help="resource specific warning percentage (e.g. foo:50,bar:60)")
++  parser.add_option("-C", "--resource-critical",  dest="res_critical", default={},
++    action="keyvalgroup", help="resource-specific critical percentage (e.g. foo:90,bar:95)")
++  parser.add_option("-f", "--file", dest="filename", default='/proc/user_beancounters',
++    action="store",       help="read beancounters from file (default: %default)")
++  parser.add_option("-s", "--sudo", dest="sudo", default=False,
++    action="store_true",  help="use 'sudo cat filename' to read file as root (filename see -f)")
++  parser.add_option("-p", "--configs", dest="confpath", default=OPENVZ_CONFPATH,
++    action="store",       help="path for OpenVZ config path (to get hostnames, default: %default)")
++  parser.add_option("-d", "--domainparts", dest="domainparts", default=2,
++    action="store_int",   help="how many domain parts of the hostname to keep (default: %default)")
++  parser.add_option("-u", "--ubc-store-path", dest="storepath", default=OPENVZ_UBCSTORE,
++    action="store",       help="path for vzubc relative information (default: %default)")
++  parser.add_option("-m", "--use-maxheld", dest="use_maxheld", default=False,
++    action="store_true",  help="use resource's maxheld instead of current_held (default: %default)")
++  parser.add_option("-a", "--absolute-fails", dest="use_absolute_failcnt", default=False,
++    action="store_true",  help="don't use vzubc's relative fail counters (default: %default)")
++  return parser
++
++
++class ExtOption(optparse.Option):
++  """Specialized Option class which parses key:val,key:val parameters and integers
++  See optparse documentation for detailed explanation of how this works."""
++  ACTIONS = optparse.Option.ACTIONS + ("keyvalgroup", "store_int",)
++  STORE_ACTIONS = optparse.Option.STORE_ACTIONS + ("keyvalgroup", "store_int",)
++  TYPED_ACTIONS = optparse.Option.TYPED_ACTIONS + ("keyvalgroup", "store_int",)
++  ALWAYS_TYPED_ACTIONS = optparse.Option.ALWAYS_TYPED_ACTIONS + ("keyvalgroup", "store_int",)
++
++  def take_action(self, action, dest, opt, value, values, parser):
++    if action == "keyvalgroup":
++      keyvals = value.split(",")
++      for keyval in keyvals:
++        key, val = keyval.split(":")
++        if re.match(r'\d+', val):
++          val = int(val)
++        values.ensure_value(dest, {}).update({key:val})
++    elif action == "store_int":
++      setattr(values, dest, int(value))
++    else:
++      optparse.Option.take_action(self, action, dest, opt, value, values, parser)
++
++
++def __main__():
++  optionsparser = create_optionsparser()
++  # args parsing will exit the program if options are used wrong or help is
++  # requested. optionsparser.error exists to system as well - we call it when
++  # extra arguments are given. none are expected, we use options only.
++  options, args = optionsparser.parse_args()
++  if args:
++     optionsparser.error("incorrect number of arguments")
++
++  # NOTE: read_data itself may exit to system in some cases
++  data = read_data(options)
++  if not data:
++    print "CRITICAL: No data given while reading beancounters."
++    sys.exit(2)
++
++  # parse beancounters, create verifiers, verify beancounters
++  try:
++    beancounterparser   = BeanCounterParser(data, options.use_absolute_failcnt, options.storepath)
++  except NoBeanCountersFoundError:
++    print "CRITICAL: No beancounters found in data read."
++    sys.exit(2)
++
++  beancounterverifier = BeanCounterVerifier(options)
++  beancounteralerts   = beancounterverifier.verify(beancounterparser.get_beancounters(), options.use_maxheld)
++
++  # find uids and combine alert groups
++  fail = {}
++  over = {}
++  crit = {}
++  warn = {}
++  for alert in beancounteralerts:
++    if isinstance (alert, BeanCounterFailure):
++      fail.setdefault(alert.uid, {})
++      fail[alert.uid][alert.resource] = alert.excess
++    elif isinstance (alert, BeanCounterOvershoot):
++      over.setdefault(alert.uid, {})
++      over[alert.uid][alert.resource] = alert.excess
++    elif isinstance (alert, BeanCounterCritical):
++      crit.setdefault(alert.uid, {})
++      crit[alert.uid][alert.resource] = alert.excess
++    elif isinstance (alert, BeanCounterWarning):
++      warn.setdefault(alert.uid, {})
++      warn[alert.uid][alert.resource] = alert.excess
++
++  # default message & exitcode if everything is fine
++  message  = "OK: all beancounters below configured thresholds"
++  perfdata = ""
++  exitcode = 0
++
++  # set message prefix and errocode accordingly
++  if fail or over or crit:
++    message  = "CRITICAL:"
++    exitcode = 2
++  elif warn:
++    message  = "WARNING:"
++    exitcode = 1
++
++  # combine specific Nagios message(s)
++  for level, tag in (fail, 'FAIL'), (over, 'OVER'), (crit, 'CRIT'), (warn, 'WARN'):
++    if level:
++      message  += " %s:" % tag
++      perfdata += " %s:" % tag
++      for uid, counters in level.items():
++        hostname = get_hostname(uid, options.confpath, options.domainparts)
++        message  += " %s(%d)" % (hostname, uid)
++        perfdata += " HOST %s(%d):" % (hostname, uid)
++        for resource, counter in counters.items():
++          perfdata += " %s(+%d)" % (resource, counter)
++
++  # output message & exit
++  if len(perfdata):
++    print "%s|%s" % (message, perfdata)
++  else:
++    print message
++  sys.exit(exitcode)
++
++
++if __name__ == "__main__":
++  __main__()
+Binary files nothing/check_openvz_beans.pyc and nagios-plugins-openvz-beans/check_openvz_beans.pyc differ
+diff -urN nothing/check_openvz_beans-test.py nagios-plugins-openvz-beans/check_openvz_beans-test.py
+--- nothing/check_openvz_beans-test.py  1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/check_openvz_beans-test.py      2011-11-01 18:28:47.867345265 +0100
+@@ -0,0 +1,775 @@
++#!/usr/bin/python
++"""check_openvz_beans unit tests."""
++
++__author__ = 'Andreas Kotes <andreas.kotes@nokia.com>'
++
++import __builtin__
++import os
++import sys
++import unittest
++import mox
++import optparse
++import StringIO
++import subprocess
++import check_openvz_beans
++
++class BeanCounterTest(mox.MoxTestBase):
++  """Test the BeanCounter class."""
++  def testCreate(self):
++    beancounter = check_openvz_beans.BeanCounter(123, "dummy 1 2 3 4 5")
++    self.assertEquals(beancounter.uid,      123)
++    self.assertEquals(beancounter.resource, 'dummy')
++    self.assertEquals(beancounter.held,     1)
++    self.assertEquals(beancounter.maxheld,  2)
++    self.assertEquals(beancounter.barrier,  3)
++    self.assertEquals(beancounter.limit,    4)
++    self.assertEquals(beancounter.failcnt,  5)
++    self.assertEquals(beancounter.__repr__(),
++      '<BeanCounter for uid 123 resource dummy: held 1 maxheld 2 barrier 3 limit 4 failcnt 5>')
++    self.assertTrue(beancounter == check_openvz_beans.BeanCounter(123, "dummy 1 2 3 4 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(124, "dummy 1 2 3 4 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(123, "yummy 1 2 3 4 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(123, "dummy 2 2 3 4 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(123, "dummy 1 3 3 4 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(123, "dummy 1 2 4 4 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(123, "dummy 1 2 3 5 5"))
++    self.assertFalse(beancounter == check_openvz_beans.BeanCounter(123, "dummy 1 2 3 4 6"))
++
++
++class BeanCounterParserTest(mox.MoxTestBase):
++  """Test the BeanCounterParser class."""
++  def setUp(self):
++    super(BeanCounterParserTest, self).setUp()
++
++  def test_init_and_parsebeancounters(self):
++    beancounters = check_openvz_beans.BeanCounterParser("123: dummy1 1 2 3 4 5\n dummy2 54 63 62 13 53\n234: dummy3 9 8 7 6 5\n")
++    self.assertEquals(beancounters.get_beancounters(), [
++     check_openvz_beans.BeanCounter(123, ' dummy1 1 2 3 4 5'),
++     check_openvz_beans.BeanCounter(123, ' dummy2 54 63 62 13 53'),
++     check_openvz_beans.BeanCounter(234, ' dummy3 9 8 7 6 5')])
++
++  def test_parsefail(self):
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(check_openvz_beans.NoBeanCountersFoundError, check_openvz_beans.BeanCounterParser, "nonsense")
++
++
++class BeanCounterThresholdTest(mox.MoxTestBase):
++  """Test the BeanCounterThreshold class."""
++  def setUp(self):
++    super(BeanCounterThresholdTest, self).setUp()
++    # Mock BeanCounters
++    self.beancounter_mock = self.mox.CreateMock(check_openvz_beans.BeanCounter)
++    self.beancounter_mock.uid      = 123
++    self.beancounter_mock.failcnt  = 0
++
++  def testCreateSimple(self):
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    self.assertEquals(threshold.resource, None)
++    self.assertEquals(threshold.critical, 95)
++    self.assertEquals(threshold.warning,  90)
++    self.assertEquals(threshold.__repr__(),
++      '<BeanCounterThreshold for resource *: critical 95 warning 90>')
++
++  def testCreateCustom(self):
++    threshold = check_openvz_beans.BeanCounterThreshold('dummy', 70, 60)
++    self.assertEquals(threshold.resource, 'dummy')
++    self.assertEquals(threshold.critical, 70)
++    self.assertEquals(threshold.warning,  60)
++    self.assertEquals(threshold.__repr__(),
++      '<BeanCounterThreshold for resource dummy: critical 70 warning 60>')
++
++  def testCheckSimpleOkay(self):
++    self.beancounter_mock.resource = 'dummy_okay'
++    self.beancounter_mock.held     = 1
++    self.beancounter_mock.maxheld  = 2
++    self.beancounter_mock.barrier  = 3
++    self.beancounter_mock.limit    = 4
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    self.assertFalse(threshold.check(self.beancounter_mock))
++
++  def testCheckSimpleOkayNegWarn(self):
++    self.beancounter_mock.resource = 'dummy_okay'
++    self.beancounter_mock.held     = 1
++    self.beancounter_mock.maxheld  = 2
++    self.beancounter_mock.barrier  = 3
++    self.beancounter_mock.limit    = 4
++    threshold = check_openvz_beans.BeanCounterThreshold(warning=-1)
++    self.assertEqual(threshold.check(self.beancounter_mock), None)
++
++  def testCheckSimpleOkayNegCrit(self):
++    self.beancounter_mock.resource = 'dummy_okay'
++    self.beancounter_mock.held     = 1
++    self.beancounter_mock.maxheld  = 2
++    self.beancounter_mock.barrier  = 3
++    self.beancounter_mock.limit    = 4
++    threshold = check_openvz_beans.BeanCounterThreshold(critical=-1)
++    self.assertEqual(threshold.check(self.beancounter_mock), None)
++
++  def testCheckSimpleFail(self):
++    # failcnt engaged
++    self.beancounter_mock.resource = 'dummy_fail'
++    self.beancounter_mock.held     = 1
++    self.beancounter_mock.maxheld  = 2
++    self.beancounter_mock.barrier  = 3
++    self.beancounter_mock.limit    = 4
++    self.beancounter_mock.failcnt  = 1
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'FAIL')
++
++  def testCheckSimpleEqual(self):
++    # eq Limit
++    self.beancounter_mock.resource = 'dummy_equal'
++    self.beancounter_mock.held     = 50
++    self.beancounter_mock.maxheld  = 100
++    self.beancounter_mock.barrier  = 100
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold(critical=101, warning=101)
++    self.assertFalse(threshold.check(self.beancounter_mock))
++
++  def testCheckSimpleOverGt(self):
++    # over Limit
++    self.beancounter_mock.resource = 'dummy_over'
++    self.beancounter_mock.held     = 4
++    self.beancounter_mock.maxheld  = 4
++    self.beancounter_mock.barrier  = 3
++    self.beancounter_mock.limit    = 3
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'OVER')
++
++  def testCheckSimpleCritEq(self):
++    # eq critical value
++    self.beancounter_mock.resource = 'dummy_crit_eq'
++    self.beancounter_mock.held     = 95
++    self.beancounter_mock.maxheld  = 95
++    self.beancounter_mock.barrier  = 100
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'CRIT')
++
++  def testCheckSimpleCritGt(self):
++    # gt critical value
++    self.beancounter_mock.resource = 'dummy_crit_gt'
++    self.beancounter_mock.held     = 96
++    self.beancounter_mock.maxheld  = 96
++    self.beancounter_mock.barrier  = 100
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'CRIT')
++
++  def testCheckSimpleWarnEq(self):
++    # eq warning value
++    self.beancounter_mock.resource = 'dummy_warn_eq'
++    self.beancounter_mock.held     = 90
++    self.beancounter_mock.maxheld  = 90
++    self.beancounter_mock.barrier  = 100
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'WARN')
++
++  def testCheckSimpleWarnGt(self):
++    # gt warning value
++    self.beancounter_mock.resource = 'dummy_warn_gt'
++    self.beancounter_mock.held     = 91
++    self.beancounter_mock.maxheld  = 91
++    self.beancounter_mock.barrier  = 100
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'WARN')
++
++  def testCheckBarrierQuota(self):
++    # limited by barrier -> would not warn if limited by limit
++    self.beancounter_mock.resource = 'numflock'
++    self.beancounter_mock.held     = 45
++    self.beancounter_mock.maxheld  = 45
++    self.beancounter_mock.barrier  = 50
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    result = threshold.check(self.beancounter_mock)
++    self.assertTrue(result)
++    self.assertEquals(result.tag, 'WARN')
++
++  def testCheckLimitQuota(self):
++    # limited by limit -> would be over if limited by barrier
++    self.beancounter_mock.resource = 'numproc'
++    self.beancounter_mock.held     = 50
++    self.beancounter_mock.maxheld  = 56
++    self.beancounter_mock.barrier  = 50
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold()
++    self.assertFalse(threshold.check(self.beancounter_mock))
++
++  def testCheckNotResponsible(self):
++    # gt critical value
++    self.beancounter_mock.resource = 'dummy_crit_gt'
++    self.beancounter_mock.held     = 50
++    self.beancounter_mock.maxheld  = 96
++    self.beancounter_mock.barrier  = 100
++    self.beancounter_mock.limit    = 100
++    threshold = check_openvz_beans.BeanCounterThreshold('differentresource')
++    self.assertFalse(threshold.check(self.beancounter_mock))
++
++
++class BeanCounterViolationTest(unittest.TestCase):
++  """Test the BeanCounterViolation class."""
++  def testCreate(self):
++    violation = check_openvz_beans.BeanCounterViolation('dummy', 123, 10)
++    self.assertEquals(violation.uid,      123)
++    self.assertEquals(violation.resource, 'dummy')
++    self.assertEquals(violation.tag,      'VIOL')
++    self.assertEquals(violation.excess,   10)
++    self.assertEquals(violation.__repr__(),
++      '<BeanCounterViolation VIOL: resource dummy in context 123 by 10>')
++
++
++class BeanCounterFailureTest(unittest.TestCase):
++  """Test the BeanCounterFailure class."""
++  def testCreate(self):
++    violation = check_openvz_beans.BeanCounterFailure('dummy', 123, 10)
++    self.assertEquals(violation.uid,      123)
++    self.assertEquals(violation.resource, 'dummy')
++    self.assertEquals(violation.tag,      'FAIL')
++    self.assertEquals(violation.excess,   10)
++    self.assertEquals(violation.__repr__(),
++      '<BeanCounterFailure FAIL: resource dummy in context 123 by 10>')
++
++
++class BeanCounterOvershootTest(unittest.TestCase):
++  """Test the BeanCounterOvershoot class."""
++  def testCreate(self):
++    violation = check_openvz_beans.BeanCounterOvershoot('dummy', 123, 10)
++    self.assertEquals(violation.uid,      123)
++    self.assertEquals(violation.resource, 'dummy')
++    self.assertEquals(violation.tag,      'OVER')
++    self.assertEquals(violation.excess,   10)
++    self.assertEquals(violation.__repr__(),
++      '<BeanCounterOvershoot OVER: resource dummy in context 123 by 10>')
++
++
++class BeanCounterCritical(unittest.TestCase):
++  """Test the BeanCounterCritical class."""
++  def testCreate(self):
++    violation = check_openvz_beans.BeanCounterCritical('dummy', 123, 10)
++    self.assertEquals(violation.uid,      123)
++    self.assertEquals(violation.resource, 'dummy')
++    self.assertEquals(violation.tag,      'CRIT')
++    self.assertEquals(violation.excess,   10)
++    self.assertEquals(violation.__repr__(),
++      '<BeanCounterCritical CRIT: resource dummy in context 123 by 10>')
++
++
++class BeanCounterWarningTest(unittest.TestCase):
++  """Test the BeanCounterWarning class."""
++  def testCreate(self):
++    violation = check_openvz_beans.BeanCounterWarning('dummy', 123, 10)
++    self.assertEquals(violation.uid,      123)
++    self.assertEquals(violation.resource, 'dummy')
++    self.assertEquals(violation.tag,      'WARN')
++    self.assertEquals(violation.excess,   10)
++    self.assertEquals(violation.__repr__(),
++      '<BeanCounterWarning WARN: resource dummy in context 123 by 10>')
++
++
++class BeanCounterVerifierInitTest(mox.MoxTestBase):
++  """Test the BeanCounterVerifier class (1/2)."""
++  def setUp(self):
++    super(BeanCounterVerifierInitTest, self).setUp()
++    # Mock BeanCounterThresholds
++    self.values_mock = self.mox.CreateMock(optparse.Values)
++    self.threshold_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterThreshold)
++    self.mox.StubOutWithMock(check_openvz_beans, 'BeanCounterThreshold')
++
++    # check with common thresholds
++    self.values_mock.critical = 95
++    self.values_mock.warning = 90
++    check_openvz_beans.BeanCounterThreshold(None, 95, 90)
++
++    # check with resource-specific thresholds
++    self.values_mock.res_critical = {'foo':20, 'bar':30}
++    self.values_mock.res_warning =  {'foo':10, 'baz':20}
++    check_openvz_beans.BeanCounterThreshold('foo', 20, 10)
++    check_openvz_beans.BeanCounterThreshold('baz', -1, 20)
++    check_openvz_beans.BeanCounterThreshold('bar', 30, -1)
++
++    self.mox.ReplayAll()
++
++  def test_init(self):
++    beancounterverifier = check_openvz_beans.BeanCounterVerifier(self.values_mock)
++
++
++class BeanCounterVerifierVerifyTest(mox.MoxTestBase):
++  """Test the BeanCounterVerifier class (2/2)."""
++  def setUp(self):
++    super(BeanCounterVerifierVerifyTest, self).setUp()
++    # Mock BeanCounterThresholds
++    self.values_mock = self.mox.CreateMock(optparse.Values)
++    self.threshold_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterThreshold)
++    self.beancounter_mock = self.mox.CreateMock(check_openvz_beans.BeanCounter)
++    self.violation_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterViolation)
++    self.mox.StubOutWithMock(check_openvz_beans, 'BeanCounterThreshold')
++    self.mox.StubOutWithMock(check_openvz_beans.BeanCounterThreshold, 'check')
++
++    # check with common thresholds
++    self.values_mock.critical = 95
++    self.values_mock.warning = 90
++    self.values_mock.res_critical = {}
++    self.values_mock.res_warning = {}
++    check_openvz_beans.BeanCounterThreshold(None, 95, 90).AndReturn(self.threshold_mock)
++    self.threshold_mock.check(mox.IsA(check_openvz_beans.BeanCounter), False)
++    self.threshold_mock.check(mox.IsA(check_openvz_beans.BeanCounter), False).AndReturn(self.violation_mock)
++    self.threshold_mock.check(mox.IsA(check_openvz_beans.BeanCounter), False).AndReturn(self.violation_mock)
++    self.threshold_mock.check(mox.IsA(check_openvz_beans.BeanCounter), False).AndReturn(self.violation_mock)
++
++    self.mox.ReplayAll()
++
++  def test_verify(self):
++    beancounterverifier = check_openvz_beans.BeanCounterVerifier(self.values_mock)
++    beancounter_mock = self.mox.CreateMock(check_openvz_beans.BeanCounter)
++    # first one is okay
++    self.assertEquals(len(beancounterverifier.verify([beancounter_mock,], False)), 0)
++    # second one has a violation
++    self.assertEquals(len(beancounterverifier.verify([beancounter_mock,], False)), 1)
++    # third + fourth each have a violation
++    self.assertEquals(len(beancounterverifier.verify([beancounter_mock, beancounter_mock], False)), 2)
++
++
++class ExtOptionTest(mox.MoxTestBase):
++  """Test the ExtOption class."""
++  def setUp(self):
++    super(ExtOptionTest, self).setUp()
++    # Mock optparse objects
++    self.values1 = self.mox.CreateMockAnything()
++    self.values1.ensure_value('foobar', {}).AndReturn(self.values1)
++    self.values1.update({'key1': 'val1'})
++    self.values1.ensure_value('foobar', {}).AndReturn(self.values1)
++    self.values1.update({'key2': 'val2'})
++
++    self.values2 = self.mox.CreateMockAnything()
++    self.values2.intval = 0
++
++    self.values3 = self.mox.CreateMockAnything()
++
++    self.mox.StubOutWithMock(optparse.Option, '__init__')
++    self.mox.StubOutWithMock(optparse.Option, 'take_action')
++    optparse.Option.__init__()
++    optparse.Option.take_action(mox.IsA(optparse.Option), 'something_else', None, None, None, None, None)
++
++    self.mox.ReplayAll()
++
++  def test_take_action(self):
++    option = check_openvz_beans.ExtOption()
++    option.take_action('keyvalgroup', 'foobar', 'dunno', 'key1:val1,key2:val2', self.values1, 'dunno')
++
++    self.assertEquals(self.values2.intval, 0)
++    option.take_action('store_int',   'intval', 'dunno', '10', self.values2, 'dunno')
++    self.assertEquals(self.values2.intval, 10)
++
++    option.take_action('something_else', None, None, None, None, None)
++
++
++class ReadDataTest(mox.MoxTestBase):
++  """Check read_data functions without sudo."""
++  def setUp(self):
++    super(ReadDataTest, self).setUp()
++    # Mock optparse objects
++    self.options_mock = self.mox.CreateMock(optparse.Values)
++    self.popen_mock = self.mox.CreateMock(subprocess.Popen)
++    self.mox.StubOutWithMock(subprocess, 'Popen')
++    self.saved_stdout = sys.stdout
++    sys.stdout = StringIO.StringIO()
++
++  def tearDown(self):
++    super(ReadDataTest, self).tearDown()
++    sys.stdout = self.saved_stdout
++
++  def test_read_data(self):
++    """Test reading OpenVZ counter data from system without sudo - existing file."""
++    self.options_mock.sudo = False
++    self.options_mock.filename = 'testdata/hostcrit.bcs'
++    self.mox.ReplayAll()
++
++    result = check_openvz_beans.read_data(self.options_mock)
++
++    self.assertTrue(isinstance(result, str))
++    self.assertEquals(len(result), os.path.getsize(self.options_mock.filename))
++
++  def test_read_data_missing_file(self):
++    """Test reading OpenVZ counter data from system without sudo - missing file."""
++    self.options_mock.sudo = False
++    self.options_mock.filename = '/nonexisting/foobar'
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.read_data, self.options_mock)
++    self.assertEqual(sys.stdout.getvalue(), 'OK: Not an OpenVZ system, no need to worry about beancounters.\n')
++
++  def test_read_data_missing_file(self):
++    """Test reading OpenVZ counter data from system without sudo - unreadable file."""
++    self.options_mock.sudo = False
++    self.options_mock.filename = 'testdata/unreadable.bcs'
++    try:
++      os.unlink(self.options_mock.filename)
++    except OSError:
++      pass
++
++    open(self.options_mock.filename, 'w').close()
++    os.chmod(self.options_mock.filename, 0000)
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.read_data, self.options_mock)
++    self.assertEqual(sys.stdout.getvalue(), 'UNKNOWN: Not permitted to read beancounter information.\n')
++
++    try:
++      os.unlink(self.options_mock.filename)
++    except OSError:
++      pass
++
++  # FIXME: not all code pathes completely tested due to unmockability of open()
++
++  def test_read_data_sudo(self):
++    """Test reading OpenVZ counter data from system with sudo - sucess."""
++    self.options_mock.sudo = True
++    self.options_mock.filename = 'irrelevant'
++    subprocess.Popen(['/usr/bin/sudo', '-n', 'cat', 'irrelevant'], stderr=-1, stdout=-1).AndReturn(self.popen_mock)
++    self.popen_mock.communicate().AndReturn(['somedata'])
++    self.mox.ReplayAll()
++
++    result = check_openvz_beans.read_data(self.options_mock)
++
++    self.assertTrue(isinstance(result, str))
++    self.assertEquals(result, 'somedata')
++
++  def test_read_data_sudo_oserror(self):
++    """Test reading OpenVZ counter data from system with sudo - OSError."""
++    self.options_mock.sudo = True
++    self.options_mock.filename = 'irrelevant'
++    subprocess.Popen(['/usr/bin/sudo', '-n', 'cat', 'irrelevant'], stderr=-1, stdout=-1).AndRaise(OSError(42, 'mocketimock'))
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.read_data, self.options_mock)
++    self.assertEqual(sys.stdout.getvalue(), "CRITICAL: Can't execute sudo to read beancounters. (42 - mocketimock)\n")
++
++  def test_read_data_sudo_nodata(self):
++    """Test reading OpenVZ counter data from system with sudo - no data."""
++    self.options_mock.sudo = True
++    self.options_mock.filename = 'irrelevant'
++
++    subprocess.Popen(['/usr/bin/sudo', '-n', 'cat', 'irrelevant'], stderr=-1, stdout=-1).AndReturn(self.popen_mock)
++    self.popen_mock.communicate().AndReturn([''])
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.read_data, self.options_mock)
++    self.assertEqual(sys.stdout.getvalue(), "CRITICAL: Trying to read beancounters with sudo didn't yield data.\n")
++
++
++class GlobalsTest(mox.MoxTestBase):
++  """Check global functions."""
++  def setUp(self):
++    super(GlobalsTest, self).setUp()
++    self.saved_stdout, sys.stdout = sys.stdout, StringIO.StringIO()
++
++  def tearDown(self):
++    super(GlobalsTest, self).tearDown()
++    sys.stdout = self.saved_stdout
++
++  def test_shorten_hostname(self):
++    """Test shortening hostnames."""
++    self.testfqdn = "hostname.with.long.domain.name"
++    # the (short) hostname should be returned in any case
++    self.assertEqual(check_openvz_beans.shorten_hostname(self.testfqdn,  0), "hostname")
++    self.assertEqual(check_openvz_beans.shorten_hostname(self.testfqdn,  1), "hostname")
++    # various lengths should be returned properly
++    self.assertEqual(check_openvz_beans.shorten_hostname(self.testfqdn,  2), "hostname.with")
++    self.assertEqual(check_openvz_beans.shorten_hostname(self.testfqdn,  5), "hostname.with.long.domain.name")
++    # if more is requested than is there, just give all there is
++    self.assertEqual(check_openvz_beans.shorten_hostname(self.testfqdn, 42), "hostname.with.long.domain.name")
++
++  def test_get_vm_hostname(self):
++    """Test getting vm hostnames."""
++    # two known existing hosts
++    self.assertEqual(check_openvz_beans.get_vm_hostname(10, 'testdata'), 'vmokay.pr.foo.test.your.do.main')
++    self.assertEqual(check_openvz_beans.get_vm_hostname(60, 'testdata'), 'vmover1.st.foo.test.your.do.main')
++    # one host whose config file doesn't contain a hostname
++    self.assertEqual(check_openvz_beans.get_vm_hostname(99, 'testdata'), None)
++    # one host where no config file exists
++    self.assertEqual(check_openvz_beans.get_vm_hostname(90, 'testdata'), None)
++
++  def test_get_local_fqdn(self):
++    """Test getting local hostnames."""
++    # due to the local nature of hostnames we can only check wether it has a qualifying '.' in it
++    self.assertTrue(check_openvz_beans.get_local_fqdn().find('.') > 0)
++
++  def test_get_hostname(self):
++    """Test getting and shortening hostnames."""
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_vm_hostname')
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_local_fqdn')
++    check_openvz_beans.get_local_fqdn().AndReturn('localhost.localdomain')
++    check_openvz_beans.get_local_fqdn().AndReturn('localhost.localdomain')
++    check_openvz_beans.get_vm_hostname(10, 'testdata').AndReturn('hostname.with.long.domain.name')
++    self.mox.ReplayAll()
++
++    self.assertEqual(check_openvz_beans.get_hostname(0, 'testdata'), 'localhost.localdomain')
++    self.assertEqual(check_openvz_beans.get_hostname(99, 'nonexistent'), 'localhost.localdomain')
++    self.assertEqual(check_openvz_beans.get_hostname(10, 'testdata'), 'hostname.with')
++
++    self.mox.VerifyAll()
++    self.mox.UnsetStubs()
++
++  def test_create_optionsparser(self):
++    """Test creating a custom OptionParser."""
++    parser = check_openvz_beans.create_optionsparser()
++    self.assertTrue(isinstance(parser, optparse.OptionParser))
++    # FIXME: do we want to check more?
++
++
++class MainEarlyFailuresTest(mox.MoxTestBase):
++  def setUp(self):
++    super(MainEarlyFailuresTest, self).setUp()
++    self.saved_stdout, sys.stdout = sys.stdout, StringIO.StringIO()
++    self.option_mock = self.mox.CreateMock(optparse.Values)
++    self.option_mock.use_absolute_failcnt = False
++    self.option_mock.storepath = 'testdata'
++
++  def tearDown(self):
++    sys.stdout = self.saved_stdout
++
++  def test___main___wrongargs(self):
++    """Test the __main__ function -- wrong args."""
++    optionsparser_mock = self.mox.CreateMock(optparse.OptionParser)
++    self.mox.StubOutWithMock(check_openvz_beans, 'create_optionsparser')
++    check_openvz_beans.create_optionsparser().AndReturn(optionsparser_mock)
++    optionsparser_mock.parse_args().AndReturn((self.option_mock, ['arg',]))
++    optionsparser_mock.error('incorrect number of arguments').AndRaise(SystemExit)
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++
++  def test___main___nodata(self):
++    """Test the __main__ function -- no data."""
++    optionsparser_mock = self.mox.CreateMock(optparse.OptionParser)
++    self.mox.StubOutWithMock(check_openvz_beans, 'create_optionsparser')
++    check_openvz_beans.create_optionsparser().AndReturn(optionsparser_mock)
++    optionsparser_mock.parse_args().AndReturn((self.option_mock, []))
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'read_data')
++    check_openvz_beans.read_data(mox.IsA(optparse.Values)).AndReturn('')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: No data given while reading beancounters.\n')
++
++  def test___main___nobeancounters(self):
++    """Test the __main__ function -- no beancounters"""
++    optionsparser_mock = self.mox.CreateMock(optparse.OptionParser)
++    self.mox.StubOutWithMock(check_openvz_beans, 'create_optionsparser')
++    check_openvz_beans.create_optionsparser().AndReturn(optionsparser_mock)
++    optionsparser_mock.parse_args().AndReturn((self.option_mock, []))
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'read_data')
++    check_openvz_beans.read_data(mox.IsA(optparse.Values)).AndReturn('somedata')
++
++    beancounterparser_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterParser)
++    self.mox.StubOutWithMock(check_openvz_beans, 'BeanCounterParser')
++    check_openvz_beans.BeanCounterParser('somedata', False, 'testdata').AndRaise(check_openvz_beans.NoBeanCountersFoundError)
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: No beancounters found in data read.\n')
++
++
++class MainRegularTest(mox.MoxTestBase):
++  def setUp(self):
++    super(MainRegularTest, self).setUp()
++    self.saved_stdout, sys.stdout = sys.stdout, StringIO.StringIO()
++
++    self.optionsparser_mock = self.mox.CreateMock(optparse.OptionParser)
++    self.option_mock = self.mox.CreateMock(optparse.Values)
++    self.option_mock.confpath = 'irrelevant'
++    self.option_mock.domainparts = 21
++    self.option_mock.use_absolute_failcnt = False
++    self.option_mock.storepath = 'testdata'
++    self.option_mock.use_maxheld = False
++    self.mox.StubOutWithMock(check_openvz_beans, 'create_optionsparser')
++    check_openvz_beans.create_optionsparser().AndReturn(self.optionsparser_mock)
++    self.optionsparser_mock.parse_args().AndReturn((self.option_mock, []))
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'read_data')
++    check_openvz_beans.read_data(mox.IsA(optparse.Values)).AndReturn('somedata')
++
++    self.beancounterparser_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterParser)
++    self.mox.StubOutWithMock(check_openvz_beans, 'BeanCounterParser')
++    check_openvz_beans.BeanCounterParser('somedata', False, 'testdata').AndReturn(self.beancounterparser_mock)
++    self.beancounterparser_mock.get_beancounters().AndReturn(None)
++
++    self.beancounterverifier_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterVerifier)
++    self.mox.StubOutWithMock(check_openvz_beans, 'BeanCounterVerifier')
++    check_openvz_beans.BeanCounterVerifier(mox.IsA(optparse.Values)).AndReturn(self.beancounterverifier_mock)
++
++  def tearDown(self):
++    sys.stdout = self.saved_stdout
++
++  def test___main___noalerts(self):
++    """Test the __main__ function -- no alerts."""
++    self.beancounterverifier_mock.verify(None, False).AndReturn([])
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'OK: all beancounters below configured thresholds\n')
++
++  def test___main___nospecificalert(self):
++    """Test the __main__ function -- no alerts."""
++    beancounteralert_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterViolation)
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_mock,])
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'OK: all beancounters below configured thresholds\n')
++
++  def test___main___failalert(self):
++    """Test the __main__ function -- fail alert."""
++    beancounteralert_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterFailure)
++    beancounteralert_mock.uid = 123
++    beancounteralert_mock.excess = 987
++    beancounteralert_mock.resource = 'resource'
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_mock,])
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_hostname')
++    check_openvz_beans.get_hostname(123, 'irrelevant', 21).AndReturn('dummy')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: FAIL: dummy(123)| FAIL: HOST dummy(123): resource(+987)\n')
++
++  def test___main___overalert(self):
++    """Test the __main__ function -- over alert."""
++    beancounteralert_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterOvershoot)
++    beancounteralert_mock.uid = 123
++    beancounteralert_mock.excess = 987
++    beancounteralert_mock.resource = 'resource'
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_mock,])
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_hostname')
++    check_openvz_beans.get_hostname(123, 'irrelevant', 21).AndReturn('dummy')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: OVER: dummy(123)| OVER: HOST dummy(123): resource(+987)\n')
++
++  def test___main___critalert(self):
++    """Test the __main__ function -- crit alert."""
++    beancounteralert_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterCritical)
++    beancounteralert_mock.uid = 123
++    beancounteralert_mock.excess = 987
++    beancounteralert_mock.resource = 'resource'
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_mock,])
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_hostname')
++    check_openvz_beans.get_hostname(123, 'irrelevant', 21).AndReturn('dummy')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: CRIT: dummy(123)| CRIT: HOST dummy(123): resource(+987)\n')
++
++  def test___main___warnalert(self):
++    """Test the __main__ function -- warn alert."""
++    beancounteralert_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterWarning)
++    beancounteralert_mock.uid = 123
++    beancounteralert_mock.excess = 987
++    beancounteralert_mock.resource = 'resource'
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_mock,])
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_hostname')
++    check_openvz_beans.get_hostname(123, 'irrelevant', 21).AndReturn('dummy')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'WARNING: WARN: dummy(123)| WARN: HOST dummy(123): resource(+987)\n')
++
++  def test___main___failwarnalert(self):
++    """Test the __main__ function -- failwarn alert."""
++    beancounteralert_fail_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterFailure)
++    beancounteralert_fail_mock.uid = 123
++    beancounteralert_fail_mock.excess = 987
++    beancounteralert_fail_mock.resource = 'resource'
++    beancounteralert_warn_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterWarning)
++    beancounteralert_warn_mock.uid = 234
++    beancounteralert_warn_mock.excess = 896
++    beancounteralert_warn_mock.resource = 'resource'
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_fail_mock, beancounteralert_warn_mock])
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_hostname')
++    check_openvz_beans.get_hostname(123, 'irrelevant', 21).AndReturn('foo')
++    check_openvz_beans.get_hostname(234, 'irrelevant', 21).AndReturn('bar')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: FAIL: foo(123) WARN: bar(234)| FAIL: HOST foo(123): resource(+987) WARN: HOST bar(234): resource(+896)\n')
++
++  def test___main___multifailwarnalert(self):
++    """Test the __main__ function -- failwarn alert."""
++    beancounteralert_fail1_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterFailure)
++    beancounteralert_fail1_mock.uid = 123
++    beancounteralert_fail1_mock.excess = 987
++    beancounteralert_fail1_mock.resource = 'resource1'
++    beancounteralert_fail2_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterFailure)
++    beancounteralert_fail2_mock.uid = 123
++    beancounteralert_fail2_mock.excess = 987
++    beancounteralert_fail2_mock.resource = 'resource2'
++    beancounteralert_warn1_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterWarning)
++    beancounteralert_warn1_mock.uid = 234
++    beancounteralert_warn1_mock.excess = 896
++    beancounteralert_warn1_mock.resource = 'resource'
++    beancounteralert_warn2_mock = self.mox.CreateMock(check_openvz_beans.BeanCounterWarning)
++    beancounteralert_warn2_mock.uid = 345
++    beancounteralert_warn2_mock.excess = 896
++    beancounteralert_warn2_mock.resource = 'resource'
++    self.beancounterverifier_mock.verify(None, False).AndReturn([beancounteralert_fail1_mock, beancounteralert_fail2_mock, beancounteralert_warn1_mock, beancounteralert_warn2_mock])
++
++    self.mox.StubOutWithMock(check_openvz_beans, 'get_hostname')
++    check_openvz_beans.get_hostname(123, 'irrelevant', 21).AndReturn('foo')
++    check_openvz_beans.get_hostname(345, 'irrelevant', 21).AndReturn('baz')
++    check_openvz_beans.get_hostname(234, 'irrelevant', 21).AndReturn('bar')
++
++    self.mox.ReplayAll()
++
++    # FIXME: check the Exception value. assertRaisesRegexp() is only available in Python unittest 2.7+
++    self.assertRaises(SystemExit, check_openvz_beans.__main__)
++    self.assertEqual(sys.stdout.getvalue(), 'CRITICAL: FAIL: foo(123) WARN: baz(345) bar(234)| FAIL: HOST foo(123): resource1(+987) resource2(+987) WARN: HOST baz(345): resource(+896) HOST bar(234): resource(+896)\n')
++
++if __name__ == '__main__':
++  unittest.main()
+diff -urN nothing/debian/changelog nagios-plugins-openvz-beans/debian/changelog
+--- nothing/debian/changelog    1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/debian/changelog        2011-11-01 18:30:10.247574999 +0100
+@@ -0,0 +1,5 @@
++nagios-plugins-openvz-beans (0.5-0) stable; urgency=low
++
++  * initial release packaging
++
++ -- Andreas Kotes <andreas.kotes@nokia.com>  Thu, 01 Nov 2011 18:30:23 +0100
+diff -urN nothing/debian/compat nagios-plugins-openvz-beans/debian/compat
+--- nothing/debian/compat       1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/debian/compat   2011-10-17 14:23:00.655695188 +0200
+@@ -0,0 +1 @@
++5
+diff -urN nothing/debian/control nagios-plugins-openvz-beans/debian/control
+--- nothing/debian/control      1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/debian/control  2011-11-01 16:54:48.381618568 +0100
+@@ -0,0 +1,9 @@
++Source: nagios-plugins-openvz-beans
++Section: net
++Priority: extra
++Maintainer: Andreas Kotes <andreas.kotes@nokia.com>
++
++Package: nagios-plugins-openvz-beans
++Architecture: all
++Depends: python-minimal
++Description: Nagios Plugin to check OpenVZ Bean Counters
+diff -urN nothing/debian/.gitignore nagios-plugins-openvz-beans/debian/.gitignore
+--- nothing/debian/.gitignore   1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/debian/.gitignore       2011-10-17 14:23:00.655695188 +0200
+@@ -0,0 +1,4 @@
++files
++nagios-plugins-openvz-beans.debhelper.log
++nagios-plugins-openvz-beans.substvars
++nagios-plugins-openvz-beans/
+diff -urN nothing/debian/rules nagios-plugins-openvz-beans/debian/rules
+--- nothing/debian/rules        1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/debian/rules    2011-11-01 18:28:09.727238903 +0100
+@@ -0,0 +1,33 @@
++#!/usr/bin/make -f
++DEBIANDIR=$(CURDIR)/debian
++
++%:
++       dh $@
++
++install: build
++       dh_testdir
++       dh_testroot
++       dh_clean -k
++       dh_installdirs
++
++       install -d -m0755 $(DEBIANDIR)/nagios-plugins-openvz-beans/usr/lib/nagios/plugins
++       install -m0755 check_openvz_beans.py $(DEBIANDIR)/nagios-plugins-openvz-beans/usr/lib/nagios/plugins
++       install -d -m0755 $(DEBIANDIR)/nagios-plugins-openvz-beans/usr/share/doc/nagios-plugins-openvz-beans
++       install -m0644 README $(DEBIANDIR)/nagios-plugins-openvz-beans/usr/share/doc/nagios-plugins-openvz-beans
++
++# Build architecture-independent files here.
++binary-indep: build install
++       dh_testdir -i
++       dh_testroot -i
++       dh_installchangelogs -i
++       dh_installdocs -i
++       dh_link -i
++       dh_compress -i
++       dh_fixperms -i
++       dh_installdeb -i
++       dh_gencontrol -i
++       dh_md5sums -i
++       dh_builddeb -i
++
++binary: binary-indep
++.PHONY: build clean binary-indep binary install
+diff -urN nothing/.gitignore nagios-plugins-openvz-beans/.gitignore
+--- nothing/.gitignore  1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/.gitignore      2011-10-17 14:23:00.695695306 +0200
+@@ -0,0 +1 @@
++*.pyc
+diff -urN nothing/nagios-plugins-openvz-beans.spec nagios-plugins-openvz-beans/nagios-plugins-openvz-beans.spec
+--- nothing/nagios-plugins-openvz-beans.spec    1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/nagios-plugins-openvz-beans.spec        2011-11-01 16:54:35.621582988 +0100
+@@ -0,0 +1,34 @@
++Name:          nagios-plugins-openvz-beans
++Version:       0.5
++Release:       0
++Summary:       Nagios Plugin to check OpenVZ Bean Counters
++License:       GPL
++Group:         Applications/System
++Source:        check_openvz_beans.py
++
++Autoreq:       0
++BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
++BuildArch:     noarch
++Requires:      python
++
++%description
++Nagios Plugin to check OpenVZ Bean Counters
++
++%prep
++rm -rf %{buildroot}
++
++%install
++install -d -m0755 %{buildroot}%{_libdir}/nagios/plugins/contrib/
++install -m0755 %{_sourcefile} %{buildroot}%{_libdir}/nagios/plugins/contrib/
++
++
++%clean
++rm -rf %{buildroot}
++
++%files
++%dir %{_libdir}/nagios/plugins/contrib
++%attr(755, root, root) %{_libdir}/nagios/plugins/contrib/check_openvz_beans.py
++
++%changelog
++* Thu Oct 13 2011 Andreas Kotes <andreas.kotes@nokia.com> 0.5
++  - initial release packaging
+diff -urN nothing/README nagios-plugins-openvz-beans/README
+--- nothing/README      1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/README  2011-11-01 18:04:40.633309403 +0100
+@@ -0,0 +1,75 @@
++Nagios check for OpenVZ bean counters
++=====================================
++
++General
++-------
++
++This Nagios plugin allows to define and check for thresholds against bean
++counters defined in /proc/user_beancounters, which are available in both OpenVZ
++hypervisors and VMs.
++
++It's possible to set global thresholds via '-c' (for critical) and '-w' (for
++warning) which apply to all resources checked.
++
++Tresholds for individual resources can be set by using '-C'/'-W' and giving
++comma-separated key:value pairs.
++
++The script was written to be compatible with Python 2.4 and later.
++
++Reading /proc/user_beancounters
++-------------------------------
++
++Since /proc/user_beancounters is only readable by the root user - and running
++Nagios plugins as the root user is highly discouraged - you can either copy
++this file and check against the copy using the -f option. Or - if you have set
++up your /etc/sudoers file to allow it - you can use the -s option, which lets
++check_openvz_beans use 'sudo cat /proc/user_beancounters' to read the file.
++
++Hostname handling
++-----------------
++The OpenVZ context IDs are resolved by grepping for the HOSTNAME variable in
++the uid's config file found in the path given by '-p'.
++
++Hostnames (e.g. this.is.a.very.long.hostname) are shortened to their first two
++components per default (e.g. this.is for the former one), but this length can
++be configured using -d (e.g. '-d 1' for 'this', '-d 3' for 'this.is.a'),
++allowing you to identify the affected VM(s) in the Nagios alert message
++already.
++
++Output
++------
++
++The output follows the Nagios Plugin API 3.0, i.e. the script gives the proper
++exit codes (0 = OK, 1 = Warning, 2 = Critical, 3 = Unknown), a simple single
++line of text, and additional perf-data.
++
++The single line of text informs about WARNING or CRITICAL state, and what's a
++problem:
++
++FAIL - a resource against its limit and the was blocked by kernel
++OVER - a resource was over its relevant threshold and will cause problems
++CRIT - a resource ran close to its threshold by given (critical) percentage
++WARN - a resource ran close to its threshold by given (warning) percentage
++
++Data used
++---------
++
++The value checked for each resource is the 'held' value, but you could use '-m'
++to use the 'maxheld' value instead. You'll not be able to reset that value,
++though, so any Nagios warning/failure status will stay until the next
++hypervisor reboot.
++
++Failure counters can't be reset either, but the plugin reads the data stored by
++vzubc's relative mode, i.e. if you inspect the problem with 'vzubc -r', the
++critical status will be resolved. This behaviour can be turned off with '-a'.
++
++If you are storing data somewhere else than the default '/tmp/vzubc.store', you
++can change that via '-u'.
++
++vzubc is provided by the vzctl package which isn't used by this code directly,
++nor is there a dependency - you'll have to install it yourself if you want to
++use this functionality.
++
++Each group lists the hostname & uid of the VM in the regular message,
++additionally the resource name and how much its threshold was exeeded are given
++in the perfdata line.
+diff -urN nothing/README.source nagios-plugins-openvz-beans/README.source
+--- nothing/README.source       1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/README.source   2011-11-01 16:29:20.667358270 +0100
+@@ -0,0 +1,16 @@
++The implementation can be tested by calling its test scripts
++./check_openvz_beans-test.py, which runs unit tests for almost all of its code,
++and requires Python unittest >= 2.4 as well as pymox.
++
++Current code coverage of the unit tests is >95%.
++
++RPMs can be build using the following commandline:
++
++rpmbuild -bb -D "_sourcefile `pwd`/check_openvz_beans.py" nagios-plugins-openvz-beans.spec
++
++Debian / Ubuntu packages can be build by simply calling:
++
++dpkg-buildpackage
++
++... in both cases the proper developer tools for the corresponding distribution
++have to be installed.
+diff -urN nothing/testdata/10.conf nagios-plugins-openvz-beans/testdata/10.conf
+--- nothing/testdata/10.conf    1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/testdata/10.conf        2011-11-01 19:09:28.124150356 +0100
+@@ -0,0 +1 @@
++HOSTNAME="vmokay.pr.foo.test.your.do.main"
+diff -urN nothing/testdata/60.conf nagios-plugins-openvz-beans/testdata/60.conf
+--- nothing/testdata/60.conf    1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/testdata/60.conf        2011-11-01 19:09:32.834163485 +0100
+@@ -0,0 +1 @@
++HOSTNAME="vmover1.st.foo.test.your.do.main"
+diff -urN nothing/testdata/hostcrit.bcs nagios-plugins-openvz-beans/testdata/hostcrit.bcs
+--- nothing/testdata/hostcrit.bcs       1970-01-01 01:00:00.000000000 +0100
++++ nagios-plugins-openvz-beans/testdata/hostcrit.bcs   2011-11-01 19:07:53.643886880 +0100
+@@ -0,0 +1,170 @@
++Version: 2.5
++       uid  resource                     held              maxheld              barrier                limit              failcnt
++       40:  kmemsize                 12345678             33456789             34567890             40000000                    0
++            lockedpages                     0                 5859                32768                65536                    0
++            privvmpages               1234567              2345678              3276800  9223372036854775807                    0
++            shmpages                      688                 1344  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0                    0                    0                    0
++            numproc                        75                   88                 8000                 8000                    0
++            physpages                  199301               239798                    0  9223372036854775807                    0
++            vmguarpages                     0                    0              4194304  9223372036854775807                    0
++            oomguarpages               199301               239798              4186112  9223372036854775807                    0
++            numtcpsock                     16                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        4                   14                  200                  220                    0
++            numpty                          1                    2                   64                   64                    0
++            numsiginfo                      0                    9                  512                  512                    0
++            tcpsndbuf                  278016               547280              2703360  9223372036854775807                    0
++            tcprcvbuf                  262144               769968              2703360  9223372036854775807                    0
++            othersockbuf               158304               197424  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                58680               262144               262144                    0
++            numothersock                  115                  125                  360                  360                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      1655                 1958                 9312                 9312                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            numiptent                      20                   20                  128                  128                    0
++       20:  kmemsize                 12345678             23456789             34567890             40000000                    0
++            lockedpages                     0                 5859                32768                65536                    0
++            privvmpages               1234567              2345678              3276800  9223372036854775807                    3
++            shmpages                      688                 1344  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0                    0                    0                    0
++            numproc                        75                   88                 8000                 8000                    0
++            physpages                  199301               239798                    0  9223372036854775807                    0
++            vmguarpages                     0                    0              4194304  9223372036854775807                    0
++            oomguarpages               199301               239798              4186112  9223372036854775807                    0
++            numtcpsock                     16                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        4                   14                  200                  220                    0
++            numpty                          1                    2                   64                   64                    0
++            numsiginfo                      0                    9                  512                  512                    0
++            tcpsndbuf                  278016               547280              2703360  9223372036854775807                    0
++            tcprcvbuf                  262144               769968              2703360  9223372036854775807                    0
++            othersockbuf               158304               197424  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                58680               262144               262144                    0
++            numothersock                  115                  125                  360                  360                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      1655                 1958                 9312                 9312                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            numiptent                      20                   20                  128                  128                    0
++       30:  kmemsize                 12345678             23456789             34567890             40000000                    0
++            lockedpages                     0                 5859                32768                65536                    0
++            privvmpages               1234567              2345678              3276800  9223372036854775807                    3
++            shmpages                      688                 1344  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0                    0                    0                    0
++            numproc                        75                   88                  100                  120                    2
++            physpages                  199301               239798                    0  9223372036854775807                    0
++            vmguarpages                     0                    0              4194304  9223372036854775807                    0
++            oomguarpages               199301               239798              4186112  9223372036854775807                    0
++            numtcpsock                     16                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        4                   14                  200                  220                    0
++            numpty                          1                    2                   64                   64                    0
++            numsiginfo                      0                    9                  512                  512                    0
++            tcpsndbuf                  278016               547280              2703360  9223372036854775807                    0
++            tcprcvbuf                  262144               769968              2703360  9223372036854775807                    0
++            othersockbuf               158304               197424  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                58680               262144               262144                    0
++            numothersock                  115                  125                  360                  360                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      1655                 1958                 9312                 9312                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            numiptent                      20                   20                  128                  128                    0
++       10:  kmemsize                 12345678             30456789             34567890             40000000                    0
++            lockedpages                     0                 5859                32768                65536                    0
++            privvmpages               1234567              2345678              3276800  9223372036854775807                    0
++            shmpages                      688                 1344  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0                    0                    0                    0
++            numproc                        75                   88                 8000                 8000                    0
++            physpages                  199301               239798                    0  9223372036854775807                    0
++            vmguarpages                     0                    0              4194304  9223372036854775807                    0
++            oomguarpages               199301               239798              4186112  9223372036854775807                    0
++            numtcpsock                     16                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        4                   14                  200                  220                    0
++            numpty                          1                    2                   64                   64                    0
++            numsiginfo                      0                    9                  512                  512                    0
++            tcpsndbuf                  278016               547280              2703360  9223372036854775807                    0
++            tcprcvbuf                  262144               769968              2703360  9223372036854775807                    0
++            othersockbuf               158304               197424  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                58680               262144               262144                    0
++            numothersock                  115                  125                  360                  360                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      1655                 1958                 9312                 9312                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            numiptent                      20                   20                  128                  128                    0
++       50:  kmemsize                 12345678             31456789             34567890             40000000                    0
++            lockedpages                     0                 5859                32768                65536                    0
++            privvmpages               1234567              2345678              3276800  9223372036854775807                    0
++            shmpages                      688                 1344  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0                    0                    0                    0
++            numproc                        75                   88                 8000                 8000                    0
++            physpages                  199301               239798                    0  9223372036854775807                    0
++            vmguarpages                     0                    0              4194304  9223372036854775807                    0
++            oomguarpages               199301               239798              4186112  9223372036854775807                    0
++            numtcpsock                     16                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        4                   14                  200                  220                    0
++            numpty                          1                    2                   64                   64                    0
++            numsiginfo                      0                    9                  512                  512                    0
++            tcpsndbuf                  278016               547280              2703360  9223372036854775807                    0
++            tcprcvbuf                  262144               769968              2703360  9223372036854775807                    0
++            othersockbuf               158304               197424  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                58680               262144               262144                    0
++            numothersock                  115                  125                  360                  360                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      1655                 1958                 9312                 9312                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            numiptent                      20                   20                  128                  128                    0
++       60:  kmemsize                 12345678             40000001             34567890             40000000                    0
++            lockedpages                     0                 5859                32768                65536                    0
++            privvmpages               1234567              2345678              3276800  9223372036854775807                    0
++            shmpages                      688                 1344  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0                    0                    0                    0
++            numproc                        75                   88                 8000                 8000                    0
++            physpages                  199301               239798                    0  9223372036854775807                    0
++            vmguarpages                     0                    0              4194304  9223372036854775807                    0
++            oomguarpages               199301               239798              4186112  9223372036854775807                    0
++            numtcpsock                     16                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        4                   14                  200                  220                    0
++            numpty                          1                    2                   64                   64                    0
++            numsiginfo                      0                    9                  512                  512                    0
++            tcpsndbuf                  278016               547280              2703360  9223372036854775807                    0
++            tcprcvbuf                  262144               769968              2703360  9223372036854775807                    0
++            othersockbuf               158304               197424  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                58680               262144               262144                    0
++            numothersock                  115                  125                  360                  360                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      1655                 1958                 9312                 9312                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            dummy                           0                    0                    0                    0                    0
++            numiptent                      20                   20                  128                  128                    0
++        0:  kmemsize                 15408521             33415719  9223372036854775807  9223372036854775807                    0
++            lockedpages                  8789                12353  9223372036854775807  9223372036854775807                    0
++            privvmpages                 41072               104930  9223372036854775807  9223372036854775807                    0
++            shmpages                      730                 1706  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0  9223372036854775807  9223372036854775807                    0
++            numproc                       291                  472  9223372036854775807  9223372036854775807                    0
++            physpages                    9432                54303  9223372036854775807  9223372036854775807                    0
++            vmguarpages                     0                    0  9223372036854775807  9223372036854775807                    0
++            oomguarpages                 9432                54303  9223372036854775807  9223372036854775807                    0
++            numtcpsock                     13                   21  9223372036854775807  9223372036854775807                    0
++            numflock                        5                   22  9223372036854775807  9223372036854775807                    0
++            numpty                          1                    1  9223372036854775807  9223372036854775807                    0
++            numsiginfo                      0                    6  9223372036854775807  9223372036854775807                    0
++            tcpsndbuf                  773048               924800  9223372036854775807  9223372036854775807                    0
++            tcprcvbuf                  212992               854408  9223372036854775807  9223372036854775807                    0
++            othersockbuf               204864               283784  9223372036854775807  9223372036854775807                    0
++            dgramrcvbuf                     0                16944  9223372036854775807  9223372036854775807                    0
++            numothersock                  178                  225  9223372036854775807  9223372036854775807                    0
++            dcachesize                      0                    0  9223372036854775807  9223372036854775807                    0
++            numfile                      5141                 6779  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0  9223372036854775807  9223372036854775807                    0
++            dummy                           0                    0  9223372036854775807  9223372036854775807                    0
++            numiptent                      51                   51  9223372036854775807  9223372036854775807                    0
diff --git a/web/attachments/427934-check_nt-uptime-perfdata.diff b/web/attachments/427934-check_nt-uptime-perfdata.diff
new file mode 100644
index 0000000..2423c42
--- /dev/null
+++ b/web/attachments/427934-check_nt-uptime-perfdata.diff
@@ -0,0 +1,10 @@
+--- plugins/check_nt.c.v0       2011-11-07 22:02:22.000000000 +0100
++++ plugins/check_nt.c  2011-11-07 22:05:00.000000000 +0100
+@@ -202,7 +202,7 @@ int main(int argc, char **argv){
+                updays = uptime / 86400;
+                uphours = (uptime % 86400) / 3600;
+                upminutes = ((uptime % 86400) % 3600) / 60;
+-               asprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes);
++               asprintf(&output_message, _("System Uptime - %u day(s) %u hour(s) %u minute(s)|uptime=%lu"), updays, uphours, upminutes, uptime);
+                return_code=STATE_OK;
+                break;
diff --git a/web/attachments/428489-check_ping-seconds-perfdata.diff b/web/attachments/428489-check_ping-seconds-perfdata.diff
new file mode 100644
index 0000000..78b01f6
--- /dev/null
+++ b/web/attachments/428489-check_ping-seconds-perfdata.diff
@@ -0,0 +1,67 @@
+diff -u -p -b check_ping.c.v0 check_ping.c
+--- check_ping.c.v0     2011-11-15 13:00:48.823063478 +0100
++++ check_ping.c        2011-11-15 13:28:40.819060887 +0100
+@@ -54,6 +54,7 @@ void print_usage (void);
+ void print_help (void);
+ 
+ int display_html = FALSE;
++int perfdata_seconds = FALSE;
+ int wpl = UNKNOWN_PACKET_LOSS;
+ int cpl = UNKNOWN_PACKET_LOSS;
+ float wrta = UNKNOWN_TRIP_TIME;
+@@ -163,6 +164,12 @@ main (int argc, char **argv)
+                        printf ("</A>");
+ 
+                /* Print performance data */
++               if (perfdata_seconds)
++                       printf("|%s", fperfdata ("rta", (double) (rta/1000), "s",
++                                          wrta>0?TRUE:FALSE, wrta/1000,
++                                          crta>0?TRUE:FALSE, crta/1000,
++                                          TRUE, 0, FALSE, 0));
++               else
+                printf("|%s", fperfdata ("rta", (double) rta, "ms",
+                                          wrta>0?TRUE:FALSE, wrta,
+                                          crta>0?TRUE:FALSE, crta,
+@@ -200,6 +207,7 @@ process_arguments (int argc, char **argv
+                {"link", no_argument, 0, 'L'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
++               {"seconds", no_argument, 0, 's'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -214,7 +222,7 @@ process_arguments (int argc, char **argv
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
++               c = getopt_long (argc, argv, "VvhnL46st:c:w:H:p:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -283,6 +291,9 @@ process_arguments (int argc, char **argv
+                case 'w':
+                        get_threshold (optarg, &wrta, &wpl);
+                        break;
++               case 's':
++                       perfdata_seconds = TRUE;
++                       break;
+                }
+        }
+ 
+@@ -578,6 +589,8 @@ print_help (void)
+   printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
+   printf (" %s\n", "-L, --link");
+   printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
++  printf (" %s\n", "-s, --seconds");
++  printf ("    %s\n", _("output performance data in seconds rather than milliseconds"));
+ 
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+ 
+@@ -600,5 +613,5 @@ print_usage (void)
+ {
+   printf ("%s\n", _("Usage:"));
+        printf ("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
+-  printf (" [-p packets] [-t timeout] [-4|-6]\n");
++  printf (" [-p packets] [-t timeout] [-4|-6] [-s]\n");
+ }
diff --git a/web/attachments/42908-check_dns_freebsd.patch b/web/attachments/42908-check_dns_freebsd.patch
new file mode 100644
index 0000000..c856ab9
--- /dev/null
+++ b/web/attachments/42908-check_dns_freebsd.patch
@@ -0,0 +1,14 @@
+--- check_dns.c.orig    Wed Feb 19 21:01:54 2003
++++ check_dns.c Wed Feb 19 21:07:22 2003
+@@ -132,7 +132,10 @@
+                                printf ("%s\n", input_buffer);
+ 
+                        if ((temp_buffer = index (input_buffer, ':'))) {
+-                               address = strscpy (address, temp_buffer + 2);
++                               temp_buffer++;
++                               for(; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
++                                       /* NOOP */;
++                               address = strscpy (address, temp_buffer);
+                                strip (address);
+                                result = STATE_OK;
+                        }
diff --git a/web/attachments/429277-check_http.patch b/web/attachments/429277-check_http.patch
new file mode 100644
index 0000000..3f52985
--- /dev/null
+++ b/web/attachments/429277-check_http.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-3 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378824926" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378824926" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378824926" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378824926" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378824926');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=3442015&group_id=29880&atid=397599&file_id=429277"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/429681-check_http.patch b/web/attachments/429681-check_http.patch
new file mode 100644
index 0000000..ae9d48a
--- /dev/null
+++ b/web/attachments/429681-check_http.patch
@@ -0,0 +1,80 @@
+--- nagios-plugins-1.4.15/plugins/check_http.c  2011-11-28 16:35:25.000000000 +0000
++++ nagios-plugins-1.4.15.new/plugins/check_http.c      2011-11-28 13:26:56.000000000 +0000
+@@ -90,10 +90,12 @@
+ 
+ int specify_port = FALSE;
+ int server_port = HTTP_PORT;
++int virtual_port = 0;
+ char server_port_text[6] = "";
+ char server_type[6] = "http";
+ char *server_address;
+ char *host_name;
++int host_name_length;
+ char *server_url;
+ char *user_agent;
+ int server_url_length;
+@@ -334,11 +336,25 @@
+     case 'H': /* Host Name (virtual host) */
+       host_name = strdup (optarg);
+       if (host_name[0] == '[') {
+-        if ((p = strstr (host_name, "]:")) != NULL) /* [IPv6]:port */
+-          server_port = atoi (p + 2);
++        if ((p = strstr (host_name, "]:")) != NULL) { /* [IPv6]:port */
++          virtual_port = atoi (p + 2);
++          /* cut off the port */
++         host_name_length = strlen (host_name) - strlen (p) - 1;
++          free (host_name);
++          host_name = strndup (optarg, host_name_length);
++          if (specify_port == FALSE)
++            server_port = virtual_port;
++       }
+       } else if ((p = strchr (host_name, ':')) != NULL
+-                 && strchr (++p, ':') == NULL) /* IPv4:port or host:port */
+-          server_port = atoi (p);
++                 && strchr (++p, ':') == NULL) { /* IPv4:port or host:port */
++          virtual_port = atoi (p);
++          /* cut off the port */
++         host_name_length = strlen (host_name) - strlen (p) - 1;
++          free (host_name);
++          host_name = strndup (optarg, host_name_length);
++          if (specify_port == FALSE)
++            server_port = virtual_port;
++        }  
+       break;
+     case 'I': /* Server IP-address */
+       server_address = strdup (optarg);
+@@ -484,6 +500,9 @@
+   if (http_method == NULL)
+     http_method = strdup ("GET");
+ 
++  if (virtual_port == 0)
++    virtual_port = server_port;
++  
+   return TRUE;
+ }
+ 
+@@ -829,11 +848,11 @@
+      * 14.23).  Some server applications/configurations cause trouble if the
+      * (default) port is explicitly specified in the "Host:" header line.
+      */
+-    if ((use_ssl == FALSE && server_port == HTTP_PORT) ||
+-        (use_ssl == TRUE && server_port == HTTPS_PORT))
++    if ((use_ssl == FALSE && virtual_port == HTTP_PORT) ||
++        (use_ssl == TRUE && virtual_port == HTTPS_PORT))
+       asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
+     else
+-      asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port);
++      asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port);
+   }
+ 
+   /* optionally send any other header tag */
+@@ -1255,6 +1274,9 @@
+          MAX_PORT, server_type, server_address, server_port, server_url,
+          display_html ? "</A>" : "");
+ 
++  /* reset virtual port */
++  virtual_port = server_port;
++  
+   if (verbose)
+     printf (_("Redirection to %s://%s:%d%s\n"), server_type,
+             host_name ? host_name : server_address, server_port, server_url);
diff --git a/web/attachments/430067-check_proc-perfdata.patch b/web/attachments/430067-check_proc-perfdata.patch
new file mode 100644
index 0000000..a7f409a
--- /dev/null
+++ b/web/attachments/430067-check_proc-perfdata.patch
@@ -0,0 +1,47 @@
+--- nagios-plugins-1.4.15/plugins/check_procs.c 2010-07-27 22:47:16.000000000 +0200
++++ /home/goesta/Projekte/Nagios/nagios-plugins_procs_perfpatch/plugins/check_procs.c   2009-12-19 01:12:49.924399127 +0100
+@@ -92,6 +92,7 @@
+ char *fmt;
+ char *fails;
+ char tmp[MAX_INPUT_BUFFER];
++int print_perfdata = 0;
+ 
+ FILE *ps_input = NULL;
+ 
+@@ -293,6 +294,9 @@
+                }
+        } 
+        printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs);
++       if ( print_perfdata == 1 ) {
++               printf ("|procs=%d;%d;%d;0;", procs, wmax, cmax);
++       }
+        
+        if (strcmp(fmt,"") != 0) {
+                printf (_(" with %s"), fmt);
+@@ -331,6 +335,7 @@
+                {"pcpu", required_argument, 0, 'P'},
+                {"elapsed", required_argument, 0, 'e'},
+                {"argument-array", required_argument, 0, 'a'},
++               {"perfdata", no_argument, 0, 'd'},
+                {"help", no_argument, 0, 'h'},
+                {"version", no_argument, 0, 'V'},
+                {"verbose", no_argument, 0, 'v'},
+@@ -344,7 +349,7 @@
+                        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, "Vvhdt:c:w:p:s:u:C:a:z:r:m:P:", 
+                        longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+@@ -505,6 +510,9 @@
+                case CHAR_MAX+2:
+                        input_filename = optarg;
+                        break;
++               case 'd':
++                       print_perfdata = 1;
++                       break;
+                }
+        }
+ 
diff --git a/web/attachments/430613-check_fping.c_patch b/web/attachments/430613-check_fping.c_patch
new file mode 100644
index 0000000..4c661a8
--- /dev/null
+++ b/web/attachments/430613-check_fping.c_patch
@@ -0,0 +1,28 @@
+68d67
+< int alive_p = FALSE;
+154,166d152
+<   if (alive_p && strstr (buf, "avg, 0% loss)")){
+<     rtastr = strstr (buf, "ms (");
+<     rtastr = 1 + index (rtastr, '(');
+<     rta = strtod (rtastr, NULL);
+<     loss=strtod ("0",NULL);
+<     die (STATE_OK,
+<          _("FPING %s - %s (rta=%f ms)|%s %s\n"),
+<          state_text (STATE_OK), server_name,rta,
+<          perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100),
+<          fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0));
+< 
+<   }
+< 
+275c261
+<     c = getopt_long (argc, argv, "+hVvaH:c:w:b:n:T:i:", longopts, &option);
+---
+>     c = getopt_long (argc, argv, "+hVvH:c:w:b:n:T:i:", longopts, &option);
+292,294d277
+<     case 'a':                 /* host alive mode */
+<       alive_p = TRUE;
+<       break;
+436,438d418
+<   printf (" %s\n", "-a");
+<   printf ("    %s\n", _("Return OK after first successfull reply"));
+< 
diff --git a/web/attachments/431216-check_http-dateformat-subjectname.diff b/web/attachments/431216-check_http-dateformat-subjectname.diff
new file mode 100644
index 0000000..28592c1
--- /dev/null
+++ b/web/attachments/431216-check_http-dateformat-subjectname.diff
@@ -0,0 +1,71 @@
+diff -u -p nagios-plugins-1.4.15/plugins/sslutils.c.v0 nagios-plugins-1.4.15/plugins/sslutils.c
+--- nagios-plugins-1.4.15/plugins/sslutils.c.v0 2011-12-19 17:42:22.000000000 +0100
++++ nagios-plugins-1.4.15/plugins/sslutils.c    2011-12-19 17:57:14.000000000 +0100
+@@ -103,6 +103,7 @@ int np_net_ssl_check_cert(int days_till_
+        float time_left;
+        int days_left;
+        char timestamp[17] = "";
++       char subject[256];
+ 
+        certificate=SSL_get_peer_certificate(s);
+        if(! certificate){
+@@ -113,10 +114,14 @@ int np_net_ssl_check_cert(int days_till_
+        /* Retrieve timestamp of certificate */
+        tm = X509_get_notAfter (certificate);
+ 
++       /* Retrieve subject name in certificate. */
++       *subject = '\0';
++       X509_NAME_get_text_by_NID(X509_get_subject_name(certificate), NID_commonName, subject, 256);
++
+        /* Generate tm structure to process timestamp */
+        if (tm->type == V_ASN1_UTCTIME) {
+                if (tm->length < 10) {
+-                       printf ("%s\n", _("CRITICAL - Wrong time format in certificate."));
++                       printf ("%s\n", _("CRITICAL - Wrong time format in certificate %s."), subject);
+                        return STATE_CRITICAL;
+                } else {
+                        stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
+@@ -126,7 +131,7 @@ int np_net_ssl_check_cert(int days_till_
+                }
+        } else {
+                if (tm->length < 12) {
+-                       printf ("%s\n", _("CRITICAL - Wrong time format in certificate."));
++                       printf ("%s\n", _("CRITICAL - Wrong time format in certificate %s."), subject);
+                        return STATE_CRITICAL;
+                } else {
+                        stamp.tm_year =
+@@ -149,23 +154,30 @@ int np_net_ssl_check_cert(int days_till_
+ 
+        time_left = difftime(timegm(&stamp), time(NULL));
+        days_left = time_left / 86400;
++#ifdef AMERICAN_DATE_FORMAT
+        snprintf
+                (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+                 stamp.tm_mon + 1,
+                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
++#else
++       snprintf
++               (timestamp, 17, "%04d-%02d-%02d %02d:%02d",
++                stamp.tm_year + 1900,
++                stamp.tm_mon + 1, stamp.tm_mday, stamp.tm_hour, stamp.tm_min);
++#endif
+ 
+        if (days_left > 0 && days_left <= days_till_exp) {
+-               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
++               printf (_("WARNING - Certificate %s expires in %d day(s) (%s).\n"), subject, days_left, timestamp);
+                return STATE_WARNING;
+        } else if (time_left < 0) {
+-               printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
++               printf (_("CRITICAL - Certificate %s expired on %s.\n"), subject, timestamp);
+                return STATE_CRITICAL;
+        } else if (days_left == 0) {
+-               printf (_("WARNING - Certificate expires today (%s).\n"), timestamp);
++               printf (_("WARNING - Certificate %s expires today (%s).\n"), subject, timestamp);
+                return STATE_WARNING;
+        }
+ 
+-       printf (_("OK - Certificate will expire on %s.\n"), timestamp);
++       printf (_("OK - Certificate %s will expire on %s.\n"), subject, timestamp);
+        X509_free (certificate);
+        return STATE_OK;
+ #  else /* ifndef USE_OPENSSL */
diff --git a/web/attachments/43177-check_ifstatus.txt b/web/attachments/43177-check_ifstatus.txt
new file mode 100644
index 0000000..476923a
--- /dev/null
+++ b/web/attachments/43177-check_ifstatus.txt
@@ -0,0 +1,27 @@
+--- check_ifstatus.orig Sat Feb 22 18:18:00 2003

++++ check_ifstatus      Sat Feb 22 17:37:06 2003

+@@ -156,6 +156,7 @@

+ 

+ push(@snmpoids,$snmpIfOperStatus);

+ push(@snmpoids,$snmpIfAdminStatus);

++push(@snmpoids,$snmpLocIfDescr);

+ push(@snmpoids,$snmpIfDescr);

+ push(@snmpoids,$snmpIfType);

+ push(@snmpoids,$snmpIfName) if ( defined $ifXTable);

+@@ -177,6 +178,7 @@

+       $key = $1;

+       $ifStatus{$key}{$snmpoid} = $response->{$snmpkey};

+    }

++print $snmpLocIfDescr;

+ }

+ 

+ 

+@@ -193,7 +195,7 @@

+                $ifdown++ ;

+                                $ifmessage .= sprintf("%s: down -> %s<BR>",

+                                  $ifStatus{$key}{$snmpIfDescr},

+-                                                                $ifStatus{$key}{$snmpIfName});

++                                $ifStatus{$key}{$snmpLocIfDescr});

+                        }

+                if ($ifStatus{$key}{$snmpIfOperStatus} == 5 ) { $ifdormant++ ;}

+                }

diff --git a/web/attachments/43179-check_ifstatus.txt b/web/attachments/43179-check_ifstatus.txt
new file mode 100644
index 0000000..69b540a
--- /dev/null
+++ b/web/attachments/43179-check_ifstatus.txt
@@ -0,0 +1,19 @@
+--- check_ifstatus.orig Sat Feb 22 18:18:00 2003

++++ check_ifstatus      Sat Feb 22 18:23:32 2003

+@@ -156,6 +156,7 @@

+ 

+ push(@snmpoids,$snmpIfOperStatus);

+ push(@snmpoids,$snmpIfAdminStatus);

++push(@snmpoids,$snmpLocIfDescr);

+ push(@snmpoids,$snmpIfDescr);

+ push(@snmpoids,$snmpIfType);

+ push(@snmpoids,$snmpIfName) if ( defined $ifXTable);

+@@ -193,7 +194,7 @@

+                $ifdown++ ;

+                                $ifmessage .= sprintf("%s: down -> %s<BR>",

+                                  $ifStatus{$key}{$snmpIfDescr},

+-                                                                $ifStatus{$key}{$snmpIfName});

++                                $ifStatus{$key}{$snmpLocIfDescr});

+                        }

+                if ($ifStatus{$key}{$snmpIfOperStatus} == 5 ) { $ifdormant++ ;}

+                }
\ No newline at end of file
diff --git a/web/attachments/432136-check_http.patch b/web/attachments/432136-check_http.patch
new file mode 100644
index 0000000..827bfba
--- /dev/null
+++ b/web/attachments/432136-check_http.patch
@@ -0,0 +1,77 @@
+--- check_http.c.old    2010-07-27 12:47:16.000000000 -0700
++++ check_http.c        2012-01-03 16:43:56.000000000 -0800
+@@ -99,7 +99,9 @@
+ 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] = "";
+ double warning_time = 0;
+ int check_warning_time = FALSE;
+@@ -198,6 +200,7 @@
+     {"port", required_argument, 0, 'p'},
+     {"authorization", required_argument, 0, 'a'},
+     {"proxy_authorization", required_argument, 0, 'b'},
++    {"return_header", required_argument, 0, 'd'},
+     {"string", required_argument, 0, 's'},
+     {"expect", required_argument, 0, 'e'},
+     {"regex", required_argument, 0, 'r'},
+@@ -235,7 +238,7 @@
+   }
+ 
+   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:nlLSm: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:nlLSm:M:N", longopts, &option);
+     if (c == -1 || c == EOF)
+       break;
+ 
+@@ -374,6 +377,10 @@
+         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;
+@@ -1036,6 +1043,18 @@
+ 
+   /* 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);
++      }
++      asprintf (&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)) {
+       strncpy(&output_string_search[0],string_expect,sizeof(output_string_search));
+@@ -1368,6 +1387,8 @@
+ 
+   printf (" %s\n", "-l, --linespan");
+   printf ("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
++  printf (" %s\n", "-d, --header-string=STRING");
++  printf ("    %s\n", _("Search header for regex STRING"));
+   printf (" %s\n", "-r, --regex, --ereg=STRING");
+   printf ("    %s\n", _("Search page for regex STRING"));
+   printf (" %s\n", "-R, --eregi=STRING");
+@@ -1438,7 +1459,7 @@
+   printf ("%s\n", _("Usage:"));
+   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 ("       [-b proxy_auth] [-d string] [-f <ok|warning|critcal|follow|sticky|stickyport>]\n");
+   printf ("       [-e <expect>] [-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] [--sni] [-C <age>] [-T <content-type>]\n");
diff --git a/web/attachments/43214-check_bgpstate.pl b/web/attachments/43214-check_bgpstate.pl
new file mode 100644
index 0000000..9f867ff
--- /dev/null
+++ b/web/attachments/43214-check_bgpstate.pl
@@ -0,0 +1,10 @@
+--- check_bgpstate.pl.orig      Sat Feb 22 18:38:39 2003

++++ check_bgpstate.pl   Sat Feb 22 18:38:53 2003

+@@ -141,7 +141,7 @@

+       $answer=$session->error;

+       $session->close;

+       $state = 'CRITICAL';

+-      print ("$state: $answer,$community,$snmpkey");

++      print ("$state: $answer,$snmpkey");

+       exit $ERRORS{$state};

+    }
\ No newline at end of file
diff --git a/web/attachments/43217-check_ifstatus-snmplocifdescr.patch b/web/attachments/43217-check_ifstatus-snmplocifdescr.patch
new file mode 100644
index 0000000..7fdd656
--- /dev/null
+++ b/web/attachments/43217-check_ifstatus-snmplocifdescr.patch
@@ -0,0 +1,41 @@
+--- check_ifstatus.orig Sat Feb 22 18:18:00 2003

++++ check_ifstatus      Sun Feb 23 11:23:53 2003

+@@ -160,6 +160,9 @@

+ push(@snmpoids,$snmpIfType);

+ push(@snmpoids,$snmpIfName) if ( defined $ifXTable);

+ 

++if (defined($response = $session->get_table($snmpLocIfDescr))) {

++push(@snmpoids,$snmpLocIfDescr);

++}

+ 

+ 

+ foreach $snmpoid (@snmpoids) {

+@@ -191,10 +194,17 @@

+                        if ($ifStatus{$key}{$snmpIfOperStatus} == 1 ) { $ifup++ ;}

+                if ($ifStatus{$key}{$snmpIfOperStatus} == 2 ) {

+                $ifdown++ ;

+-                               $ifmessage .= sprintf("%s: down -> %s<BR>",

++                       if (defined($ifStatus{$key}{$snmpLocIfDescr})) {

++                               $ifmessage .= sprintf("%s: down -> %s, ",

++                                 $ifStatus{$key}{$snmpIfDescr},

++                                $ifStatus{$key}{$snmpLocIfDescr});

++                       }

++                       if (!defined($ifStatus{$key}{$snmpLocIfDescr})) {

++                               $ifmessage .= sprintf("%s: down -> %s, ",

+                                  $ifStatus{$key}{$snmpIfDescr},

+-                                                                $ifStatus{$key}{$snmpIfName});

++                                $ifStatus{$key}{$snmpIfDescr});

+                        }

++               }

+                if ($ifStatus{$key}{$snmpIfOperStatus} == 5 ) { $ifdormant++ ;}

+                }

+        }

+@@ -203,7 +213,7 @@

+ 

+    if ($ifdown > 0) {

+       $state = 'CRITICAL';

+-      $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d<BR>",

++      $answer = sprintf("host '%s', interfaces up: %d, down: %d, dormant: %d, ",

+                         $hostname,

+                        $ifup,

+                        $ifdown,

diff --git a/web/attachments/432992-nagios-plugins-1.4.15-certexpire_warncrit.patch b/web/attachments/432992-nagios-plugins-1.4.15-certexpire_warncrit.patch
new file mode 100644
index 0000000..a3935e8
--- /dev/null
+++ b/web/attachments/432992-nagios-plugins-1.4.15-certexpire_warncrit.patch
@@ -0,0 +1,293 @@
+diff -ru nagios-plugins-1.4.15/plugins/check_http.c nagios-plugins-1.4.15-modified/plugins/check_http.c
+--- nagios-plugins-1.4.15/plugins/check_http.c  2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-modified/plugins/check_http.c 2012-01-11 04:03:34.000000000 +0000
+@@ -58,7 +58,7 @@
+ 
+ #ifdef HAVE_SSL
+ int check_cert = FALSE;
+-int days_till_exp;
++int days_till_exp_warn, days_till_exp_crit;
+ char *randbuff;
+ X509 *server_cert;
+ #  define my_recv(buf, len) ((use_ssl) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
+@@ -178,6 +178,7 @@
+ {
+   int c = 1;
+   char *p;
++  char *temp;
+ 
+   enum {
+     INVERT_REGEX = CHAR_MAX + 1,
+@@ -292,13 +293,25 @@
+       break;
+     case 'C': /* Check SSL cert validity */
+ #ifdef HAVE_SSL
+-      if (!is_intnonneg (optarg))
+-        usage2 (_("Invalid certificate expiration period"), optarg);
++      if ((temp=strchr(optarg,','))!=NULL) {
++       *temp='\0';
++       if (!is_intnonneg (temp))
++         usage2 (_("Invalid certificate expiration period"), optarg);
++       days_till_exp_warn = atoi(optarg);
++       *temp=',';
++       temp++;
++       if (!is_intnonneg (temp))
++         usage2 (_("Invalid certificate expiration period"), temp);
++       days_till_exp_crit = atoi (temp);
++      }
+       else {
+-        days_till_exp = atoi (optarg);
+-        check_cert = TRUE;
++       days_till_exp_crit=0;
++        if (!is_intnonneg (optarg))
++          usage2 (_("Invalid certificate expiration period"), optarg);
++        days_till_exp_warn = atoi (optarg);
+       }
+-     /* Fall through to -S option */
++      check_cert = TRUE;
++      /* Fall through to -S option */
+ #endif
+     case 'S': /* use SSL */
+ #ifndef HAVE_SSL
+@@ -809,7 +822,7 @@
+   if (use_ssl == TRUE) {
+     np_net_ssl_init_with_hostname(sd, (use_sni ? host_name : NULL));
+     if (check_cert == TRUE) {
+-      result = np_net_ssl_check_cert(days_till_exp);
++      result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
+       np_net_ssl_cleanup();
+       if (sd) close(sd);
+       return result;
+@@ -1424,6 +1437,13 @@
+   printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+   printf (" %s\n", _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
+   printf (" %s\n", _("the certificate is expired."));
++
++  printf (" %s\n\n", "CHECK CERTIFICATE: check_http -H www.verisign.com -C 30,14");
++  printf (" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
++  printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
++  printf (" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
++  printf (" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
++
+ #endif
+ 
+   printf (UT_SUPPORT);
+@@ -1441,6 +1461,6 @@
+   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 ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
+-  printf ("       [-A string] [-k string] [-S] [--sni] [-C <age>] [-T <content-type>]\n");
+-  printf ("       [-j method]\n");
++  printf ("       [-A string] [-k string] [-S] [--sni] [-C <warn_age>[,<crit_age>]]\n");
++  printf ("       [-T <content-type>] [-j method]\n");
+ }
+diff -ru nagios-plugins-1.4.15/plugins/check_smtp.c nagios-plugins-1.4.15-modified/plugins/check_smtp.c
+--- nagios-plugins-1.4.15/plugins/check_smtp.c  2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-modified/plugins/check_smtp.c 2012-01-11 04:19:41.000000000 +0000
+@@ -41,7 +41,7 @@
+ 
+ #ifdef HAVE_SSL
+ int check_cert = FALSE;
+-int days_till_exp;
++int days_till_exp_warn, days_till_exp_crit;
+ #  define my_recv(buf, len) ((use_ssl && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
+ #  define my_send(buf, len) ((use_ssl && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
+ #else /* ifndef HAVE_SSL */
+@@ -271,7 +271,7 @@
+ 
+ #  ifdef USE_OPENSSL
+                  if ( check_cert ) {
+-                   result = np_net_ssl_check_cert(days_till_exp);
++                   result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
+                    if(result != STATE_OK){
+                      printf ("%s\n", _("CRITICAL - Cannot retrieve server certificate."));
+                    }
+@@ -453,6 +453,7 @@
+ process_arguments (int argc, char **argv)
+ {
+        int c;
++       char* temp;
+ 
+        int option = 0;
+        static struct option longopts[] = {
+@@ -595,12 +596,26 @@
+                case 'D':
+                /* Check SSL cert validity */
+ #ifdef USE_OPENSSL
+-                       if (!is_intnonneg (optarg))
+-                               usage2 ("Invalid certificate expiration period",optarg);
+-                               days_till_exp = atoi (optarg);
+-                               check_cert = TRUE;
++                        if ((temp=strchr(optarg,','))!=NULL) {
++                            *temp='\0';
++                            if (!is_intnonneg (temp))
++                               usage2 ("Invalid certificate expiration period", optarg);
++                            days_till_exp_warn = atoi(optarg);
++                            *temp=',';
++                            temp++;
++                            if (!is_intnonneg (temp))
++                                usage2 (_("Invalid certificate expiration period"), temp);
++                            days_till_exp_crit = atoi (temp);
++                        }
++                        else {
++                            days_till_exp_crit=0;
++                            if (!is_intnonneg (optarg))
++                                usage2 ("Invalid certificate expiration period", optarg);
++                            days_till_exp_warn = atoi (optarg);
++                        }
++                       check_cert = TRUE;
+ #else
+-                               usage (_("SSL support not available - install OpenSSL and recompile"));
++                       usage (_("SSL support not available - install OpenSSL and recompile"));
+ #endif
+                        break;
+                case '4':
+@@ -785,7 +800,7 @@
+   printf (" %s\n", "-F, --fqdn=STRING");
+   printf ("    %s\n", _("FQDN used for HELO"));
+ #ifdef HAVE_SSL
+-  printf (" %s\n", "-D, --certificate=INTEGER");
++  printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
+   printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
+   printf (" %s\n", "-S, --starttls");
+   printf ("    %s\n", _("Use STARTTLS for the connection."));
+@@ -819,8 +834,8 @@
+ print_usage (void)
+ {
+   printf ("%s\n", _("Usage:"));
+-  printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
+-  printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
+-  printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
++  printf ("%s -H host [-p port] [-4|-6] [-e expect] [-C command] [-f from addr]\n", progname);
++  printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout] [-v]\n");
++  printf ("[-F fqdn] [-S] [-D <warn days to cert expiry>[<crit days to warn expire>]\n");
+ }
+ 
+diff -ru nagios-plugins-1.4.15/plugins/check_tcp.c nagios-plugins-1.4.15-modified/plugins/check_tcp.c
+--- nagios-plugins-1.4.15/plugins/check_tcp.c   2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-modified/plugins/check_tcp.c  2012-01-11 04:20:15.000000000 +0000
+@@ -39,7 +39,7 @@
+ 
+ #ifdef HAVE_SSL
+ static int check_cert = FALSE;
+-static int days_till_exp;
++static int days_till_exp_warn, days_till_exp_crit;
+ # define my_recv(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
+ # define my_send(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
+ #else
+@@ -235,8 +235,8 @@
+        if (flags & FLAG_SSL){
+                result = np_net_ssl_init(sd);
+                if (result == STATE_OK && check_cert == TRUE) {
+-                       result = np_net_ssl_check_cert(days_till_exp);
+-                       if(result != STATE_OK) {
++                       result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
++                       if (result != STATE_OK) {
+                                printf(_("CRITICAL - Cannot retrieve server certificate.\n"));
+                        }
+                }
+@@ -383,6 +383,7 @@
+ {
+        int c;
+        int escape = 0;
++       char *temp;
+ 
+        int option = 0;
+        static struct option longopts[] = {
+@@ -555,9 +556,22 @@
+                case 'D': /* Check SSL cert validity - days 'til certificate expiration */
+ #ifdef HAVE_SSL
+ #  ifdef USE_OPENSSL /* XXX */
+-                       if (!is_intnonneg (optarg))
++                       if ((temp=strchr(optarg,','))!=NULL) {
++                           *temp='\0';
++                           if (!is_intnonneg (temp))
++                               usage2 (_("Invalid certificate expiration period"), optarg);                             days_till_exp_warn = atoi(optarg);
++                           *temp=',';
++                           temp++;
++                           if (!is_intnonneg (temp))
++                               usage2 (_("Invalid certificate expiration period"), temp);
++                           days_till_exp_crit = atoi (temp);
++                       }
++                       else {
++                           days_till_exp_crit=0;
++                           if (!is_intnonneg (optarg))
+                                usage2 (_("Invalid certificate expiration period"), optarg);
+-                       days_till_exp = atoi (optarg);
++                           days_till_exp_warn = atoi (optarg);
++                       }
+                        check_cert = TRUE;
+                        flags |= FLAG_SSL;
+                        break;
+@@ -629,8 +643,9 @@
+   printf ("    %s\n", _("Seconds to wait between sending string and polling for response"));
+ 
+ #ifdef HAVE_SSL
+-       printf (" %s\n", "-D, --certificate=INTEGER");
++       printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
+   printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
++  printf ("    %s\n", _("1st is #days for warning, 2nd is critical (if not specified - 0)."));
+   printf (" %s\n", "-S, --ssl");
+   printf ("    %s\n", _("Use SSL for the connection."));
+ #endif
+@@ -652,6 +667,6 @@
+   printf ("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n",progname);
+   printf ("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
+   printf ("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");
+-  printf ("[-D <days to cert expiry>] [-S <use SSL>] [-E]\n");
++  printf ("[-D <warn days to cert expiry>[,<crit days to warn expire>]] [-S <use SSL>] [-E]\n");
+ }
+ 
+Only in nagios-plugins-1.4.15-modified/plugins: .deps
+Only in nagios-plugins-1.4.15-modified/plugins: Makefile
+diff -ru nagios-plugins-1.4.15/plugins/netutils.h nagios-plugins-1.4.15-modified/plugins/netutils.h
+--- nagios-plugins-1.4.15/plugins/netutils.h    2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-modified/plugins/netutils.h   2012-01-11 03:52:18.000000000 +0000
+@@ -103,7 +103,7 @@
+ void np_net_ssl_cleanup();
+ int np_net_ssl_write(const void *buf, int num);
+ int np_net_ssl_read(void *buf, int num);
+-int np_net_ssl_check_cert(int days_till_exp);
++int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
+ #endif /* HAVE_SSL */
+ 
+ #endif /* _NETUTILS_H_ */
+diff -ru nagios-plugins-1.4.15/plugins/sslutils.c nagios-plugins-1.4.15-modified/plugins/sslutils.c
+--- nagios-plugins-1.4.15/plugins/sslutils.c    2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15-modified/plugins/sslutils.c   2012-01-11 03:51:39.000000000 +0000
+@@ -94,7 +94,7 @@
+        return SSL_read(s, buf, num);
+ }
+ 
+-int np_net_ssl_check_cert(int days_till_exp){
++int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
+ #  ifdef USE_OPENSSL
+        X509 *certificate=NULL;
+        ASN1_STRING *tm;
+@@ -154,15 +154,21 @@
+                 stamp.tm_mon + 1,
+                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+ 
+-       if (days_left > 0 && days_left <= days_till_exp) {
+-               printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
+-               return STATE_WARNING;
++       if (days_left > 0 && days_left <= days_till_exp_warn) {
++               printf (_("%s - Certificate expires in %d day(s) (%s).\n"), (days_left>days_till_exp_crit)?"CRITICAL":"WARNING", days_left, timestamp);
++               if (days_left > days_till_exp_crit)
++                   return STATE_WARNING;
++               else
++                   return STATE_CRITICAL;
+        } else if (time_left < 0) {
+                printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
+                return STATE_CRITICAL;
+        } else if (days_left == 0) {
+-               printf (_("WARNING - Certificate expires today (%s).\n"), timestamp);
+-               return STATE_WARNING;
++               printf (_("%s - Certificate expires today (%s).\n"), (days_left>days_till_exp_crit)?"CRITICAL":"WARNING", timestamp);
++                if (days_left > days_till_exp_crit)
++                    return STATE_WARNING;
++                else
++                    return STATE_CRITICAL;
+        }
+ 
+        printf (_("OK - Certificate will expire on %s.\n"), timestamp);
diff --git a/web/attachments/436432-check_fping_ipv6_support.patch b/web/attachments/436432-check_fping_ipv6_support.patch
new file mode 100644
index 0000000..121a527
--- /dev/null
+++ b/web/attachments/436432-check_fping_ipv6_support.patch
@@ -0,0 +1,106 @@
+diff --git a/configure.in b/configure.in
+index 1d16bcd..fec55a0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1364,6 +1364,17 @@ else
+        AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
+ fi
+ 
++AC_PATH_PROG(PATH_TO_FPING6,fping6)
++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_FPING6"
++then
++       AC_DEFINE_UNQUOTED(PATH_TO_FPING6,"$PATH_TO_FPING6",[path to fping6])
++else
++       AC_MSG_WARN([Get fping6 from http://www.fping.com in order to make check_fping plugin])
++fi
++
+ AC_PATH_PROG(PATH_TO_SSH,ssh)
+ AC_ARG_WITH(ssh_command,
+             ACX_HELP_STRING([--with-ssh-command=PATH],
+diff --git a/plugins/check_fping.c b/plugins/check_fping.c
+index dd3f86d..d45e76b 100644
+--- a/plugins/check_fping.c
++++ b/plugins/check_fping.c
+@@ -72,6 +72,7 @@ main (int argc, char **argv)
+ /* normaly should be  int result = STATE_UNKNOWN; */
+ 
+   int status = STATE_UNKNOWN;
++  char *fping_prog = NULL;
+   char *server = NULL;
+   char *command_line = NULL;
+   char *input_buffer = NULL;
+@@ -96,7 +97,16 @@ main (int argc, char **argv)
+   if (packet_interval)
+     asprintf(&option_string, "%s-p %d ", option_string, packet_interval);
+ 
+-  asprintf (&command_line, "%s %s-b %d -c %d %s", PATH_TO_FPING,
++#ifdef USE_IPV6
++  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
++
++  asprintf (&command_line, "%s %s-b %d -c %d %s", fping_prog,
+             option_string, packet_size, packet_count, server);
+ 
+   if (verbose)
+@@ -241,6 +251,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 +270,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:c:w:b:n:T:i:46", longopts, &option);
+ 
+     if (c == -1 || c == EOF || c == 1)
+       break;
+@@ -281,6 +293,16 @@ process_arguments (int argc, char **argv)
+       }
+       server_name = strscpy (server_name, optarg);
+       break;
++    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 +424,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");
+@@ -422,6 +446,9 @@ print_help (void)
+   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/web/attachments/439112-check_pgsql.c.patch b/web/attachments/439112-check_pgsql.c.patch
new file mode 100644
index 0000000..62e2db4
--- /dev/null
+++ b/web/attachments/439112-check_pgsql.c.patch
@@ -0,0 +1,64 @@
+*** check_pgsql.c.old   Thu Mar 22 09:58:45 2012
+--- check_pgsql.c       Thu Mar 22 10:05:08 2012
+***************
+*** 32,37 ****
+--- 32,39 ----
+  const char *copyright = "1999-2007";
+  const char *email = "nagiosplug-devel@lists.sourceforge.net";
+  
++ #include <sys/stat.h>
++ 
+  #include "common.h"
+  #include "utils.h"
+  
+***************
+*** 57,62 ****
+--- 59,65 ----
+  void print_help (void);
+  int is_pg_dbname (char *);
+  int is_pg_logname (char *);
++ int is_directory(char *);
+  
+  char *pghost = NULL;                                          /* host name of the backend server */
+  char *pgport = NULL;                                          /* port of the backend server */
+***************
+*** 265,272 ****
+                                twarn = strtod (optarg, NULL);
+                        break;
+                case 'H':     /* host */
+!                       if (!is_host (optarg))
+!                               usage2 (_("Invalid hostname/address"), optarg);
+                        else
+                                pghost = optarg;
+                        break;
+--- 268,275 ----
+                                twarn = strtod (optarg, NULL);
+                        break;
+                case 'H':     /* host */
+!                       if (!is_host (optarg) && !is_directory(optarg))
+!                               usage2 (_("Invalid hostname/address/directory"), optarg);
+                        else
+                                pghost = optarg;
+                        break;
+***************
+*** 411,416 ****
+--- 414,432 ----
+  -@@
+  ******************************************************************************/
+  
++ int
++ is_directory (char *pathname)
++ {
++       struct stat s;
++ 
++       if (lstat(pathname, &s) != 0)
++               return (FALSE);
++ 
++       if (S_ISDIR(s.st_mode))
++               return (TRUE);
++       else
++               return (FALSE);
++ }
+  
+  
+  void
diff --git a/web/attachments/440468-check_dig.patch.gz b/web/attachments/440468-check_dig.patch.gz
new file mode 100644
index 0000000..6c9100e
--- /dev/null
+++ b/web/attachments/440468-check_dig.patch.gz
diff --git a/web/attachments/440895-check_dhcp.fix-option-parsing.diff b/web/attachments/440895-check_dhcp.fix-option-parsing.diff
new file mode 100644
index 0000000..d4ffe87
--- /dev/null
+++ b/web/attachments/440895-check_dhcp.fix-option-parsing.diff
@@ -0,0 +1,14 @@
+diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
+index 2a1875c..b1a7713 100644
+--- a/plugins-root/check_dhcp.c
++++ b/plugins-root/check_dhcp.c
+@@ -839,8 +839,7 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
+        /* process all DHCP options present in the packet */
+        for(x=4;x<MAX_DHCP_OPTIONS_LENGTH;){
+ 
+-               /* end of options (0 is really just a pad, but bail out anyway) */
+-               if((int)offer_packet->options[x]==-1 || (int)offer_packet->options[x]==0)
++               if((int)offer_packet->options[x]==-1)
+                        break;
+ 
+                /* get option type */
diff --git a/web/attachments/443468-nonrootthreshold.patch b/web/attachments/443468-nonrootthreshold.patch
new file mode 100644
index 0000000..c05cd80
--- /dev/null
+++ b/web/attachments/443468-nonrootthreshold.patch
@@ -0,0 +1,64 @@
+Author: Stephen Baynes <stephen.baynes@smoothwall.net>
+Description: Calculate performance data thresholds with non-root
+ figures so consistent with % free and check status.
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -160,9 +160,9 @@
+   char *perf;
+   char *preamble;
+   double inode_space_pct;
+-  uintmax_t total, available, available_to_root, used;
++  uintmax_t total, total_not_root, available, available_to_root, used;
+   double dfree_pct = -1, dused_pct = -1;
+-  double dused_units, dfree_units, dtotal_units;
++  double dused_units, dfree_units, dtotal_units, dtotal_not_root_units;
+   double dused_inodes_percent, dfree_inodes_percent;
+   double warning_high_tide;
+   double critical_high_tide;
+@@ -308,23 +308,25 @@
+       available = fsp.fsu_bavail > fsp.fsu_bfree ? 0 : fsp.fsu_bavail;
+       available_to_root = fsp.fsu_bfree;
+       used = total - available_to_root;
++         total_not_root = used + available;
+ 
+       if (verbose >= 3)
+-        printf ("For %s, total=%llu, available=%llu, available_to_root=%llu, used=%llu, fsp.fsu_files=%llu, fsp.fsu_ffree=%llu\n",
+-        me->me_mountdir, total, available, available_to_root, used, fsp.fsu_files, fsp.fsu_ffree);
++        printf ("For %s, total=%llu, total_not_root=%llu, available=%llu, available_to_root=%llu, used=%llu, fsp.fsu_files=%llu, fsp.fsu_ffree=%llu\n",
++        me->me_mountdir, total, total_not_root, available, available_to_root, used, fsp.fsu_files, fsp.fsu_ffree);
+ 
+-      dused_pct = calculate_percent( used, used + available ); /* used + available can never be > uintmax */
++      dused_pct = calculate_percent( used, total_not_root );   /* used + available can never be > uintmax */
+ 
+       dfree_pct = 100 - dused_pct;
+       dused_units = used*fsp.fsu_blocksize/mult;
+       dfree_units = available*fsp.fsu_blocksize/mult;
+       dtotal_units = total*fsp.fsu_blocksize/mult;
++      dtotal_not_root_units = total_not_root*fsp.fsu_blocksize/mult;
+       dused_inodes_percent = calculate_percent(fsp.fsu_files - fsp.fsu_ffree, fsp.fsu_files);
+       dfree_inodes_percent = 100 - dused_inodes_percent;
+ 
+       if (verbose >= 3) {
+-        printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%llu mult=%llu\n",
+-          me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dused_inodes_percent, dfree_inodes_percent, fsp.fsu_blocksize, mult);
++        printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g total_not_root_units=%g used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%llu mult=%llu\n",
++          me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dtotal_not_root_units, dused_inodes_percent, dfree_inodes_percent, fsp.fsu_blocksize, mult);
+       }
+ 
+       /* Threshold comparisons */
+@@ -368,13 +370,13 @@
+         warning_high_tide = dtotal_units - path->freespace_units->warning->end;
+       }
+       if (path->freespace_percent->warning != NULL) {
+-        warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_units ));
++        warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_not_root_units ));
+       }
+       if (path->freespace_units->critical != NULL) {
+         critical_high_tide = dtotal_units - path->freespace_units->critical->end;
+       }
+       if (path->freespace_percent->critical != NULL) {
+-        critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units ));
++        critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_not_root_units ));
+       }
+ 
+       /* Nb: *_high_tide are unset when == UINT_MAX */
diff --git a/web/attachments/446102-patch b/web/attachments/446102-patch
new file mode 100644
index 0000000..57fe747
--- /dev/null
+++ b/web/attachments/446102-patch
@@ -0,0 +1,15 @@
+diff --git a/plugins/check_ping.c b/plugins/check_ping.c
+index 1367e90..bfdee49 100644
+--- a/plugins/check_ping.c
++++ b/plugins/check_ping.c
+@@ -500,9 +500,7 @@ run_ping (const char *cmd, const char *addr)
+        (void) fclose (child_stderr);
+ 
+ 
+-       /* close the pipe - WARNING if status is set */
+-       if (spclose (child_process))
+-               result = max_state (result, STATE_WARNING);
++       spclose (child_process);
+ 
+        if (warn_text == NULL)
+                warn_text = strdup("");
diff --git a/web/attachments/44653-check_ifstatus_errors.txt b/web/attachments/44653-check_ifstatus_errors.txt
new file mode 100644
index 0000000..3116fd7
--- /dev/null
+++ b/web/attachments/44653-check_ifstatus_errors.txt
@@ -0,0 +1,231 @@
+#! /usr/bin/perl -w
+#
+# check_ifstatus.pl - nagios plugin 
+# 
+#
+# Copyright (C) 2000 Christoph Kron
+# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#
+# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net
+# 
+# 11.01.2000 Version 1.0
+#
+# $Id: check_ifstatus.pl,v 1.3 2003/02/03 05:29:54 sghosh Exp $
+
+use POSIX;
+use strict;
+use lib "/usr/lib/nagios/plugins" ;
+use utils qw($TIMEOUT %ERRORS &print_revision &support);
+
+use Net::SNMP;
+use Getopt::Long;
+Getopt::Long::Configure('bundling');
+
+my $PROGNAME = "check_ifstatus";
+
+
+my $status;
+my %ifOperStatus =      ('1','up',
+                         '2','down',
+                         '3','testing',
+                         '4','unknown',
+                         '5','dormant',
+                         '6','notPresent');
+
+my $state = "UNKNOWN";
+my $answer = "";
+my $snmpkey=0;
+my $snmpoid=0;
+my $key=0;
+my $community = "public";
+my $port = 161;
+my @snmpoids;
+my $snmpifInErrors = '1.3.6.1.2.1.2.2.1.14';   
+my $snmpifOutErrors = '1.3.6.1.2.1.2.2.1.20'; 
+my $snmpIfName = '1.3.6.1.2.1.2.2.1.2';
+my $hostname;
+my $session;
+my $error;
+my $response;
+my $ifup =0 ;
+my $ifdown =0;
+my $ifdormant = 0;
+my $ifmessage = "";
+my $snmp_version = 1;
+my $ifXTable;
+my $opt_h ;
+my $opt_V ;
+my $warn_level = 1000;
+my %ifStatus;
+my $iferrors = 0;
+
+
+
+
+
+# Just in case of problems, let's not hang Nagios
+$SIG{'ALRM'} = sub {
+     print ("ERROR: No snmp response from $hostname (alarm timeout)\n");
+     exit $ERRORS{"UNKNOWN"};
+};
+alarm($TIMEOUT);
+
+
+
+#Option checking
+$status = GetOptions(
+                "V"   => \$opt_V, "version"    => \$opt_V,
+                "h"   => \$opt_h, "help"       => \$opt_h,
+                "v=i" => \$snmp_version, "snmp_version=i"  => \$snmp_version,
+                "C=s" =>\$community,"community=s" => \$community,
+                "p=i" =>\$port, "port=i" => \$port,
+                "H=s" => \$hostname, "hostname=s" => \$hostname,
+                "I"       => \$ifXTable, "ifmib" => \$ifXTable );
+                
+if ($status == 0)
+{
+        print_help() ;
+        exit $ERRORS{'OK'};
+}
+
+
+if ($opt_V) {
+        print_revision($PROGNAME,'$Revision: 1.3 $ ');
+        exit $ERRORS{'OK'};
+}
+
+if ($opt_h) {
+        print_help();
+        exit $ERRORS{'OK'};
+}
+
+if (! utils::is_hostname($hostname)){
+        usage();
+        exit $ERRORS{"UNKNOWN"};
+}
+
+if ( ! $snmp_version ) {
+        $snmp_version =1 ;
+}else{
+        if ( $snmp_version =~ /[12]/ ) {
+                        
+                ($session, $error) = Net::SNMP->session(
+                      -hostname  => $hostname,
+                      -community => $community,
+                      -port      => $port,
+                          -version      => $snmp_version
+                           );
+
+                if (!defined($session)) {
+                      $state='UNKNOWN';
+                      $answer=$error;
+                      print ("$state: $answer");
+                      exit $ERRORS{$state};
+                }
+
+                
+        }elsif ( $snmp_version =~ /3/ ) {
+                $state='UNKNOWN';
+                print ("$state: No support for SNMP v3 yet\n");
+                exit $ERRORS{$state};
+        }else{
+                $state='UNKNOWN';
+                print ("$state: No support for SNMP v$snmp_version yet\n");
+                exit $ERRORS{$state};
+        }
+}
+
+
+
+push(@snmpoids,$snmpifInErrors);
+push(@snmpoids,$snmpifOutErrors);
+push(@snmpoids,$snmpIfName);
+
+
+foreach $snmpoid (@snmpoids) {
+
+   if (!defined($response = $session->get_table($snmpoid))) {
+      $answer=$session->error;
+      $session->close;
+      $state = 'CRITICAL';
+      print ("$state: $answer for $snmpoid  with snmp version $snmp_version\n");
+      exit $ERRORS{$state};
+   }
+
+   foreach $snmpkey (keys %{$response}) {
+      $snmpkey =~ /.*\.(\d+)$/;
+      $key = $1;
+      $ifStatus{$key}{$snmpoid} = $response->{$snmpkey};
+   }
+}
+
+
+$session->close;
+
+foreach $key (keys %ifStatus) {
+        #print "DEBG : $key :: $ifStatus{$key}{$snmpIfName} \n";
+ 
+        if (defined($ifStatus{$key}{$snmpifInErrors})) {
+                if ($ifStatus{$key}{$snmpifInErrors} >= $warn_level ) {
+                        $iferrors++;
+                        $ifmessage .= sprintf("%s: has %s errors<BR>",
+                        $ifStatus{$key}{$snmpIfName},
+                        $ifStatus{$key}{$snmpifInErrors});
+                }
+        }
+}
+ 
+if ($iferrors > 0) {
+        $state = 'WARNING';
+}
+else {
+        $state = 'OK';
+}
+ 
+print ("$state: $ifmessage\n");
+exit $ERRORS{$state};
+
+sub usage {
+        printf "\nMissing arguments!\n";
+        printf "\n";
+        printf "check_ifstatus_errors -C <READCOMMUNITY> -p <PORT> -H <HOSTNAME>\n";
+        printf "Copyright (C) 2000 Christoph Kron\n";
+        printf "Updates 5/2002 Subhendu Ghosh\n";
+        printf "\n\n";
+        support();
+        exit $ERRORS{"UNKNOWN"};
+}
+
+sub print_help {
+        printf "check_ifstatus plugin for Nagios monitors operational \n";
+        printf "status of each network interface (except PPP interfaces) on the target host\n";
+        printf "\nUsage:\n";
+        printf "   -H (--hostname)   Hostname to query - (required)\n";
+        printf "   -C (--community)  SNMP read community (defaults to public,\n";
+        printf "                     used with SNMP v1 and v2c\n";
+        printf "   -v (--snmp_version)  1 for SNMP v1 (default)\n";
+        printf "                        2 for SNMP v2c\n";
+        printf "                        SNMP v2c will use get_bulk for less overhead\n";
+        printf "   -p (--port)       SNMP port (default 161)\n";
+        printf "   -I (--ifmib)      Agent supports IFMIB ifXTable.  Do not use if\n";
+        printf "                     you don't know what this is.\n";
+        printf "   -V (--version)    Plugin version\n";
+        printf "   -h (--help)       usage help \n\n";
+        print_revision($PROGNAME, '$Revision: 1.3 $');
+        
+}
diff --git a/web/attachments/448048-nagios-plugins-1.4.16-check_ldap_certificate.patch b/web/attachments/448048-nagios-plugins-1.4.16-check_ldap_certificate.patch
new file mode 100644
index 0000000..6eb2b0c
--- /dev/null
+++ b/web/attachments/448048-nagios-plugins-1.4.16-check_ldap_certificate.patch
@@ -0,0 +1,188 @@
+diff -Naur -x '*~' -x '*.orig' -x '*.rej' nagios-plugins-1.4.16/plugins/check_ldap.c nagios-plugins-1.4.16-check_ldap_certificate/plugins/check_ldap.c
+--- nagios-plugins-1.4.16/plugins/check_ldap.c  2012-06-27 19:32:47.000000000 +0200
++++ nagios-plugins-1.4.16-check_ldap_certificate/plugins/check_ldap.c   2012-07-06 12:57:15.562316155 +0200
+@@ -72,6 +72,9 @@
+ int ssl_on_connect = FALSE;
+ int verbose = 0;
+ 
++int check_cert = FALSE;
++int days_till_exp_warn, days_till_exp_crit;
++
+ /* for ldap tls */
+ 
+ char *SERVICE = "LDAP";
+@@ -157,6 +160,9 @@
+                        printf (_("Could not init TLS at port %i!\n"), ld_port);
+                        return STATE_CRITICAL;
+                }
++
++               if (check_cert == TRUE)
++                       return ldap_check_cert(ld);
+ #else
+                printf (_("TLS not supported by the libraries!\n"));
+                return STATE_CRITICAL;
+@@ -181,6 +187,9 @@
+                        printf (_("Could not init startTLS at port %i!\n"), ld_port);
+                        return STATE_CRITICAL;
+                }
++
++               if (check_cert == TRUE)
++                       return ldap_check_cert(ld);
+ #else
+                printf (_("startTLS not supported by the library, needs LDAPv3!\n"));
+                return STATE_CRITICAL;
+@@ -240,6 +249,7 @@
+ process_arguments (int argc, char **argv)
+ {
+        int c;
++        char *temp;
+ 
+        int option = 0;
+        /* initialize the long option struct */
+@@ -258,6 +268,7 @@
+ #endif
+                {"starttls", no_argument, 0, 'T'},
+                {"ssl", no_argument, 0, 'S'},
++               {"certificate", required_argument, 0, 'C'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"port", required_argument, 0, 'p'},
+@@ -276,7 +287,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:", longopts, &option);
++               c = getopt_long (argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -338,6 +349,33 @@
+                        else
+                                usage_va(_("%s cannot be combined with %s"), "-T/--starttls", "-S/--ssl");
+                        break;
++               case 'C': /* Check SSL cert validity */
++#ifndef HAVE_SSL
++                       usage4 (_("Invalid option - SSL is not available"));
++#else
++                       if (starttls || ssl_on_connect || strstr(argv[0],"check_ldaps")) {
++                               if ((temp=strchr(optarg,','))!=NULL) {
++                                       *temp = '\0';
++                                       if (!is_intnonneg (temp))
++                                               usage2 (_("Invalid certificate expiration period"), optarg);
++                                       days_till_exp_warn = atoi(optarg);
++                                       *temp = ',';
++                                       temp++;
++                                       if (!is_intnonneg (temp))
++                                               usage2 (_("Invalid certificate expiration period"), temp);
++                                               days_till_exp_crit = atoi (temp);
++                               } else {
++                                       days_till_exp_crit = 0;
++                                       if (!is_intnonneg (optarg))
++                                               usage2 (_("Invalid certificate expiration period"), optarg);
++                                       days_till_exp_warn = atoi (optarg);
++                               }
++                               check_cert = TRUE;
++                       } else {
++                               usage_va(_("%s requires either %s or %s"), "-C/--certificate", "-S/--ssl", "-T/--starttls");
++                       }
++                       break;
++#endif
+                case 'S':
+                        if (! starttls) {
+                                ssl_on_connect = TRUE;
+@@ -420,6 +458,9 @@
+   printf (" %s\n", "-S [--ssl]");
+   printf ("    %s %i\n", _("use ldaps (ldap v2 ssl method). this also sets the default port to"), LDAPS_PORT);
+ 
++  printf (" %s\n", "-C [--certificate]");
++  printf ("    %s\n", _("Minimum number of days a certificate has to be valid"));
++
+ #ifdef HAVE_LDAP_SET_OPTION
+        printf (" %s\n", "-2 [--ver2]");
+   printf ("    %s\n", _("use ldap protocol version 2"));
+@@ -455,7 +496,7 @@
+ {
+   printf ("%s\n", _("Usage:"));
+        printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname);
+-  printf ("\n       [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
++  printf ("\n       [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout] [-C <age>]%s\n",
+ #ifdef HAVE_LDAP_SET_OPTION
+                        "\n       [-2|-3] [-4|-6]"
+ #else
+@@ -463,3 +504,16 @@
+ #endif
+                        );
+ }
++
++int ldap_check_cert (LDAP *ld)
++{
++       SSL *ssl;
++       int rc;
++
++       rc = ldap_get_option(ld, LDAP_OPT_X_TLS_SSL_CTX, &ssl);
++       if (rc == LDAP_OPT_ERROR || ssl == NULL) {
++               printf ("%s\n",_("CRITICAL - Cannot retrieve ssl session from connection."));
++               return STATE_CRITICAL;
++       }
++       return np_net_ssl_check_cert_real(ssl, days_till_exp_warn, days_till_exp_crit);
++}
+diff -Naur -x '*~' -x '*.orig' -x '*.rej' nagios-plugins-1.4.16/plugins/Makefile.am nagios-plugins-1.4.16-check_ldap_certificate/plugins/Makefile.am
+--- nagios-plugins-1.4.16/plugins/Makefile.am   2012-06-27 19:32:47.000000000 +0200
++++ nagios-plugins-1.4.16-check_ldap_certificate/plugins/Makefile.am    2012-07-04 11:03:00.888343446 +0200
+@@ -72,7 +72,7 @@
+ check_game_LDADD = $(BASEOBJS) runcmd.o
+ check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
+ check_hpjd_LDADD = $(NETLIBS) popen.o
+-check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
++check_ldap_LDADD = $(SSLOBJS) $(NETLIBS) $(LDAPLIBS) $(SSLLIBS)
+ check_load_LDADD = $(BASEOBJS) popen.o
+ check_mrtg_LDADD = $(BASEOBJS)
+ check_mrtgtraf_LDADD = $(BASEOBJS)
+@@ -118,7 +118,7 @@
+ 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_ldap_DEPENDENCIES = check_ldap.c $(SSLOBJS) $(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)
+diff -Naur -x '*~' -x '*.orig' -x '*.rej' nagios-plugins-1.4.16/plugins/netutils.h nagios-plugins-1.4.16-check_ldap_certificate/plugins/netutils.h
+--- nagios-plugins-1.4.16/plugins/netutils.h    2012-06-27 19:32:47.000000000 +0200
++++ nagios-plugins-1.4.16-check_ldap_certificate/plugins/netutils.h     2012-07-04 11:03:56.291891100 +0200
+@@ -104,6 +104,7 @@
+ int np_net_ssl_write(const void *buf, int num);
+ int np_net_ssl_read(void *buf, int num);
+ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
++int np_net_ssl_check_cert_real(SSL *ssl, int days_till_exp_warn, int days_till_exp_crit);
+ #endif /* HAVE_SSL */
+ 
+ #endif /* _NETUTILS_H_ */
+diff -Naur -x '*~' -x '*.orig' -x '*.rej' nagios-plugins-1.4.16/plugins/sslutils.c nagios-plugins-1.4.16-check_ldap_certificate/plugins/sslutils.c
+--- nagios-plugins-1.4.16/plugins/sslutils.c    2012-06-27 19:32:47.000000000 +0200
++++ nagios-plugins-1.4.16-check_ldap_certificate/plugins/sslutils.c     2012-07-06 13:11:37.469453627 +0200
+@@ -128,6 +128,15 @@
+ 
+ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
+ #  ifdef USE_OPENSSL
++       return np_net_ssl_check_cert_real(s, days_till_exp_warn, days_till_exp_crit);
++#  else /* ifndef USE_OPENSSL */
++       printf ("%s\n", _("WARNING - Plugin does not support checking certificates."));
++       return STATE_WARNING;
++#  endif /* USE_OPENSSL */
++}
++
++int np_net_ssl_check_cert_real(SSL *ssl, int days_till_exp_warn, int days_till_exp_crit){
++#  ifdef USE_OPENSSL
+        X509 *certificate=NULL;
+        X509_NAME *subj=NULL;
+        char cn[MAX_CN_LENGTH]= "";
+@@ -141,7 +150,7 @@
+        int days_left;
+        char timestamp[17] = "";
+ 
+-       certificate=SSL_get_peer_certificate(s);
++       certificate=SSL_get_peer_certificate(ssl);
+        if (!certificate) {
+                printf("%s\n",_("CRITICAL - Cannot retrieve server certificate."));
+                return STATE_CRITICAL;
diff --git a/web/attachments/450266-nagios.build.txt b/web/attachments/450266-nagios.build.txt
new file mode 100644
index 0000000..e18df70
--- /dev/null
+++ b/web/attachments/450266-nagios.build.txt
@@ -0,0 +1,2145 @@
+./configure
+checking for a BSD-compatible install... /usr/bin/install -c
+checking whether build environment is sane... yes
+checking for a thread-safe mkdir -p... /bin/mkdir -p
+checking for gawk... gawk
+checking whether make sets $(MAKE)... yes
+checking build system type... x86_64-unknown-linux-gnu
+checking host system type... x86_64-unknown-linux-gnu
+checking for gcc... gcc
+checking whether the C compiler works... yes
+checking for C compiler default output file name... a.out
+checking for suffix of executables...
+checking whether we are cross compiling... no
+checking for suffix of object files... o
+checking whether we are using the GNU C compiler... yes
+checking whether gcc accepts -g... yes
+checking for gcc option to accept ISO C89... none needed
+checking for style of include used by make... GNU
+checking dependency style of gcc... gcc3
+./configure: line 4100: gl_EARLY: command not found
+checking how to run the C preprocessor... gcc -E
+checking for grep that handles long lines and -e... /bin/grep
+checking for egrep... /bin/grep -E
+checking whether gcc needs -traditional... no
+checking how to print strings... printf
+checking for a sed that does not truncate output... /bin/sed
+checking for fgrep... /bin/grep -F
+checking for ld used by gcc... /usr/bin/ld
+checking if the linker (/usr/bin/ld) is GNU ld... yes
+checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
+checking the name lister (/usr/bin/nm -B) interface... BSD nm
+checking whether ln -s works... yes
+checking the maximum length of command line arguments... 1572864
+checking whether the shell understands some XSI constructs... yes
+checking whether the shell understands "+="... yes
+checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop
+checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop
+checking for /usr/bin/ld option to reload object files... -r
+checking for objdump... objdump
+checking how to recognize dependent libraries... pass_all
+checking for dlltool... no
+checking how to associate runtime and link libraries... printf %s\n
+checking for ar... ar
+checking for archiver @FILE support... @
+checking for strip... strip
+checking for ranlib... ranlib
+checking command to parse /usr/bin/nm -B output from gcc object... ok
+checking for sysroot... no
+checking for mt... mt
+checking if mt is a manifest tool... no
+checking for ANSI C header files... yes
+checking for sys/types.h... yes
+checking for sys/stat.h... yes
+checking for stdlib.h... yes
+checking for string.h... yes
+checking for memory.h... yes
+checking for strings.h... yes
+checking for inttypes.h... yes
+checking for stdint.h... yes
+checking for unistd.h... yes
+checking for dlfcn.h... yes
+checking for objdir... .libs
+checking if gcc supports -fno-rtti -fno-exceptions... no
+checking for gcc option to produce PIC... -fPIC -DPIC
+checking if gcc PIC flag -fPIC -DPIC works... yes
+checking if gcc static flag -static works... yes
+checking if gcc supports -c -o file.o... yes
+checking if gcc supports -c -o file.o... (cached) yes
+checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
+checking whether -lc should be explicitly linked in... no
+checking dynamic linker characteristics... GNU/Linux ld.so
+checking how to hardcode library paths into programs... immediate
+checking whether stripping libraries is possible... yes
+checking if libtool supports shared libraries... yes
+checking whether to build shared libraries... yes
+checking whether to build static libraries... yes
+checking whether gcc and cc understand -c and -o together... yes
+checking for error_at_line... yes
+checking for special C compiler options needed for large files... no
+checking for _FILE_OFFSET_BITS value needed for large files... no
+checking for working strtod... yes
+checking for python... /usr/bin/python
+checking for sh... /bin/sh
+checking for perl... /usr/bin/perl
+checking for libgnutls-config... no
+checking for hostname... /bin/hostname
+checking for basename... /usr/bin/basename
+checking for main in -ldce... no
+checking for main in -lnsl... yes
+checking for socket in -lsocket... no
+checking for main in -lresolv... yes
+checking math.h usability... yes
+checking math.h presence... yes
+checking for math.h... yes
+checking for floor in -lm... yes
+checking mp.h usability... no
+checking mp.h presence... no
+checking for mp.h... no
+checking for pow in -lbsd... no
+checking for plan_tests in -ltap... no
+checking for main in -lcrypt... yes
+checking for PQsetdbLogin in -lpq... no
+configure: WARNING: Skipping PostgreSQL plugin (check_pgsql)
+configure: WARNING: LIBS="-lcrypt " CPPFLAGS=""
+configure: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS).
+checking for dbi_initialize in -ldbi... no
+configure: WARNING: Skipping dbi plugin
+configure: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS).
+checking for rc_read_config in -lradiusclient... no
+checking for rc_read_config in -lradiusclient-ng... no
+configure: WARNING: Skipping radius plugin
+configure: WARNING: install radius libs to compile this plugin (see REQUIREMENTS).
+checking for main in -lldap... no
+configure: WARNING: Skipping LDAP plugin
+configure: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS).
+checking linux/hdreg.h usability... yes
+checking linux/hdreg.h presence... yes
+checking for linux/hdreg.h... yes
+checking linux/types.h usability... yes
+checking linux/types.h presence... yes
+checking for linux/types.h... yes
+./configure: line 13278: np_mysqlclient: command not found
+./configure: line 13279: test: =: unary operator expected
+checking for IPv6 support... yes
+checking krb5.h usability... no
+checking krb5.h presence... no
+checking for krb5.h... no
+checking krb5.h usability... no
+checking krb5.h presence... no
+checking for krb5.h... no
+checking for dlopen in -ldl... yes
+checking for shl_load in -ldl... no
+checking openssl/ssl.h usability... yes
+checking openssl/ssl.h presence... yes
+checking for openssl/ssl.h... yes
+checking openssl/x509.h usability... yes
+checking openssl/x509.h presence... yes
+checking for openssl/x509.h... yes
+checking openssl/rsa.h usability... yes
+checking openssl/rsa.h presence... yes
+checking for openssl/rsa.h... yes
+checking openssl/pem.h usability... yes
+checking openssl/pem.h presence... yes
+checking for openssl/pem.h... yes
+checking openssl/crypto.h usability... yes
+checking openssl/crypto.h presence... yes
+checking for openssl/crypto.h... yes
+checking openssl/err.h usability... yes
+checking openssl/err.h presence... yes
+checking for openssl/err.h... yes
+checking for CRYPTO_lock in -lcrypto... yes
+checking for main in -lssl... yes
+checking whether time.h and sys/time.h may both be included... yes
+checking for sys/wait.h that is POSIX.1 compatible... yes
+checking signal.h usability... yes
+checking signal.h presence... yes
+checking for signal.h... yes
+checking syslog.h usability... yes
+checking syslog.h presence... yes
+checking for syslog.h... yes
+checking uio.h usability... no
+checking uio.h presence... no
+checking for uio.h... no
+checking errno.h usability... yes
+checking errno.h presence... yes
+checking for errno.h... yes
+checking sys/time.h usability... yes
+checking sys/time.h presence... yes
+checking for sys/time.h... yes
+checking sys/socket.h usability... yes
+checking sys/socket.h presence... yes
+checking for sys/socket.h... yes
+checking sys/un.h usability... yes
+checking sys/un.h presence... yes
+checking for sys/un.h... yes
+checking sys/poll.h usability... yes
+checking sys/poll.h presence... yes
+checking for sys/poll.h... yes
+checking features.h usability... yes
+checking features.h presence... yes
+checking for features.h... yes
+checking stdarg.h usability... yes
+checking stdarg.h presence... yes
+checking for stdarg.h... yes
+checking sys/unistd.h usability... yes
+checking sys/unistd.h presence... yes
+checking for sys/unistd.h... yes
+checking ctype.h usability... yes
+checking ctype.h presence... yes
+checking for ctype.h... yes
+checking for an ANSI C-conforming const... yes
+checking whether struct tm is in sys/time.h or time.h... time.h
+checking for pid_t... yes
+checking for size_t... yes
+checking return type of signal handlers... void
+checking for va_copy... yes
+checking for memmove... yes
+checking for select... yes
+checking for socket... yes
+checking for strdup... yes
+checking for strstr... yes
+checking for strtol... yes
+checking for strtoul... yes
+checking for floor... no
+checking for poll... yes
+checking return type of socket size... int
+checking for ps... /bin/ps
+checking for ps syntax... /bin/ps axwo 'stat uid pid ppid vsz rss pcpu comm args'
+checking for ping... /bin/ping
+checking for ping6... /bin/ping6
+checking for ICMP ping syntax... /bin/ping -n -U -w %d -c %d %s
+checking for ICMPv6 ping syntax... /bin/ping6 -n -U -w %d -c %d %s
+checking for nslookup... /usr/bin/nslookup
+checking for nslookup syntax... /usr/bin/nslookup -sil
+checking for number of cpus... sysconf(_SC_NPROCESSORS_CONF)
+checking for uptime... /usr/bin/uptime
+checking for rpcinfo... /usr/bin/rpcinfo
+checking for lmstat... no
+configure: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses
+checking for smbclient... /usr/bin/smbclient
+checking for who... /usr/bin/who
+checking for snmpget... /usr/bin/snmpget
+checking for snmpgetnext... /usr/bin/snmpgetnext
+checking for Net::SNMP perl module... found
+checking for quakestat... /usr/bin/quakestat
+checking for qstat... no
+checking for fping... /usr/bin/fping
+checking for ssh... /usr/bin/ssh
+checking for mailq... /usr/bin/mailq
+checking for qmail-qstat... no
+configure: WARNING: Could not find qmail-qstat or eqivalent
+checking for swap... no
+checking for swapinfo... no
+checking for lsps... no
+checking for sys/stat.h... (cached) yes
+checking sys/param.h usability... yes
+checking sys/param.h presence... yes
+checking for sys/param.h... yes
+checking for sys/swap.h... yes
+checking whether swapctl is declared... no
+checking for swaptbl_t... no
+checking for swapent_t... no
+checking for struct swapent.se_nblks... no
+checking for /proc/meminfo... found /proc/meminfo
+checking for dig... /usr/bin/dig
+checking for apt-get... /usr/bin/apt-get
+checking sys/sockio.h usability... no
+checking sys/sockio.h presence... no
+checking for sys/sockio.h... no
+checking whether NLS is requested... yes
+checking for msgfmt... /usr/bin/msgfmt
+checking for gmsgfmt... /usr/bin/msgfmt
+checking for xgettext... /usr/bin/xgettext
+checking for msgmerge... /usr/bin/msgmerge
+checking for ld used by GCC... /usr/bin/ld -m elf_x86_64
+checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
+checking for shared library run path origin... done
+checking for CFPreferencesCopyAppValue... no
+checking for CFLocaleCopyCurrent... no
+checking for GNU gettext in libc... yes
+checking whether to use NLS... yes
+checking where the gettext function comes from... libc
+checking for main in -lpthread... yes
+./configure: line 18615: gl_INIT: command not found
+configure: creating ./config.status
+config.status: creating gl/Makefile
+config.status: creating nagios-plugins.spec
+config.status: creating Makefile
+config.status: creating tap/Makefile
+config.status: creating lib/Makefile
+config.status: creating plugins/Makefile
+config.status: creating lib/tests/Makefile
+config.status: creating plugins-root/Makefile
+config.status: creating plugins-scripts/Makefile
+config.status: creating plugins-scripts/subst
+config.status: creating plugins-scripts/utils.pm
+config.status: creating plugins-scripts/utils.sh
+config.status: creating perlmods/Makefile
+config.status: creating command.cfg
+config.status: creating test.pl
+config.status: creating pkg/solaris/pkginfo
+config.status: creating po/Makefile.in
+config.status: creating config.h
+config.status: config.h is unchanged
+config.status: executing depfiles commands
+config.status: executing libtool commands
+config.status: executing po-directories commands
+config.status: creating po/POTFILES
+config.status: creating po/Makefile
+            --with-apt-get-command: /usr/bin/apt-get
+              --with-ping6-command: /bin/ping6 -n -U -w %d -c %d %s
+               --with-ping-command: /bin/ping -n -U -w %d -c %d %s
+                       --with-ipv6: yes
+                      --with-mysql:
+                    --with-openssl: yes
+                     --with-gnutls: no
+               --enable-extra-opts: no
+                       --with-perl: /usr/bin/perl
+             --enable-perl-modules: no
+                     --with-cgiurl: /nagios/cgi-bin
+               --with-trusted-path: /bin:/sbin:/usr/bin:/usr/sbin
+                   --enable-libtap: no
+dataloader% make
+make  all-recursive
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug'
+Making all in gl
+make[2]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+rm -f configmake.h-t && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          echo '#define PREFIX "/usr/local/nagios"'; \
+          echo '#define EXEC_PREFIX "/usr/local/nagios"'; \
+          echo '#define BINDIR "/usr/local/nagios/bin"'; \
+          echo '#define SBINDIR "/usr/local/nagios/sbin"'; \
+          echo '#define LIBEXECDIR "/usr/local/nagios/libexec"'; \
+          echo '#define DATAROOTDIR "/usr/local/nagios/share"'; \
+          echo '#define DATADIR "/usr/local/nagios/share"'; \
+          echo '#define SYSCONFDIR "/usr/local/nagios/etc"'; \
+          echo '#define SHAREDSTATEDIR "/usr/local/nagios/com"'; \
+          echo '#define LOCALSTATEDIR "/usr/local/nagios/var"'; \
+          echo '#define INCLUDEDIR "/usr/local/nagios/include"'; \
+          echo '#define OLDINCLUDEDIR "/usr/include"'; \
+          echo '#define DOCDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define INFODIR "/usr/local/nagios/share/info"'; \
+          echo '#define HTMLDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define DVIDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define PDFDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define PSDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define LIBDIR "/usr/local/nagios/lib"'; \
+          echo '#define LISPDIR ""'; \
+          echo '#define LOCALEDIR "/usr/local/nagios/share/locale"'; \
+          echo '#define MANDIR "/usr/local/nagios/share/man"'; \
+          echo '#define MANEXT ""'; \
+          echo '#define PKGDATADIR "/usr/local/nagios/share/nagios-plugins"'; \
+          echo '#define PKGINCLUDEDIR "/usr/local/nagios/include/nagios-plugins"'; \
+          echo '#define PKGLIBDIR "/usr/local/nagios/lib/nagios-plugins"'; \
+          echo '#define PKGLIBEXECDIR "/usr/local/nagios/libexec/nagios-plugins"'; \
+        } | sed '/""/d' > configmake.h-t && \
+        if test -f configmake.h && cmp configmake.h-t configmake.h > /dev/null; then \
+          rm -f configmake.h-t; \
+        else \
+          rm -f configmake.h; mv configmake.h-t configmake.h; \
+        fi
+make  all-recursive
+make[3]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+make[4]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+gcc -DHAVE_CONFIG_H -I. -I..  -I../intl   -g -O2 -MT base64.o -MD -MP -MF .deps/base64.Tpo -c -o base64.o base64.c
+In file included from base64.c:47:0:
+base64.h:40:49: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.h:48:53: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+In file included from base64.c:50:0:
+./stdlib.h:20:1: error: stray ‘@’ in program
+./stdlib.h:20:1: error: stray ‘@’ in program
+In file included from base64.c:50:0:
+./stdlib.h:43:7: error: operator '||' has no left operand
+./stdlib.h:49:5: error: #if with no expression
+./stdlib.h:53:7: error: operator '!' has no right operand
+./stdlib.h:58:6: error: operator '!' has no right operand
+./stdlib.h:71:7: error: operator '||' has no left operand
+In file included from base64.c:50:0:
+./stdlib.h:410:5: error: #if with no expression
+./stdlib.h:426:5: error: #if with no expression
+./stdlib.h:445:5: error: #if with no expression
+./stdlib.h:469:5: error: #if with no expression
+./stdlib.h:488:5: error: #if with no expression
+./stdlib.h:516:5: error: #if with no expression
+./stdlib.h:532:5: error: #if with no expression
+./stdlib.h:551:5: error: #if with no expression
+./stdlib.h:570:5: error: #if with no expression
+./stdlib.h:597:5: error: #if with no expression
+./stdlib.h:627:5: error: #if with no expression
+./stdlib.h:658:5: error: #if with no expression
+./stdlib.h:683:5: error: #if with no expression
+./stdlib.h:699:5: error: #if with no expression
+./stdlib.h:714:5: error: #if with no expression
+./stdlib.h:722:5: error: #if with no expression
+./stdlib.h:737:5: error: #if with no expression
+./stdlib.h:754:5: error: #if with no expression
+./stdlib.h:773:5: error: #if with no expression
+./stdlib.h:791:5: error: #if with no expression
+./stdlib.h:810:5: error: #if with no expression
+./stdlib.h:834:5: error: #if with no expression
+./stdlib.h:850:5: error: #if with no expression
+./stdlib.h:881:5: error: #if with no expression
+./stdlib.h:906:5: error: #if with no expression
+./stdlib.h:931:5: error: #if with no expression
+./stdlib.h:956:5: error: #if with no expression
+./stdlib.h:972:5: error: #if with no expression
+In file included from base64.c:55:0:
+./string.h:23:1: error: stray ‘@’ in program
+In file included from base64.c:50:0:
+./stdlib.h:20:2: error: unknown type name ‘PRAGMA_SYSTEM_HEADER’
+In file included from base64.c:55:0:
+./string.h:23:1: error: stray ‘@’ in program
+In file included from base64.c:55:0:
+./string.h:36:6: error: operator '&&' has no left operand
+./string.h:371:5: error: #if with no expression
+./string.h:409:5: error: #if with no expression
+./string.h:444:5: error: #if with no expression
+./string.h:464:5: error: #if with no expression
+./string.h:494:5: error: #if with no expression
+./string.h:522:5: error: #if with no expression
+./string.h:541:5: error: #if with no expression
+./string.h:584:5: error: #if with no expression
+./string.h:612:5: error: #if with no expression
+./string.h:636:5: error: #if with no expression
+./string.h:658:5: error: #if with no expression
+./string.h:686:5: error: #if with no expression
+./string.h:726:5: error: #if with no expression
+./string.h:800:5: error: #if with no expression
+./string.h:823:5: error: #if with no expression
+./string.h:864:5: error: #if with no expression
+./string.h:931:5: error: #if with no expression
+./string.h:976:5: error: #if with no expression
+./string.h:995:5: error: #if with no expression
+./string.h:1002:5: error: #if with no expression
+./string.h:1022:5: error: #if with no expression
+./string.h:1042:5: error: #if with no expression
+./string.h:1051:5: error: #if with no expression
+./string.h:1062:5: error: #if with no expression
+./string.h:1076:5: error: #if with no expression
+./string.h:1090:5: error: #if with no expression
+./string.h:1100:5: error: #if with no expression
+./string.h:1110:5: error: #if with no expression
+./string.h:1130:5: error: #if with no expression
+./string.h:1140:5: error: #if with no expression
+./string.h:1159:5: error: #if with no expression
+./string.h:1181:5: error: #if with no expression
+./string.h:1200:5: error: #if with no expression
+./string.h:1224:5: error: #if with no expression
+base64.c:58:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘static’
+base64.c:69:37: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c: In function ‘base64_encode_alloc’:
+base64.c:138:10: warning: incompatible implicit declaration of built-in function ‘malloc’ [enabled by default]
+base64.c: At top level:
+base64.c:321:29: error: expected ‘;’, ‘,’ or ‘)’ before ‘*’ token
+base64.c:374:32: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c:460:41: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c: In function ‘base64_decode_alloc_ctx’:
+base64.c:561:10: warning: incompatible implicit declaration of built-in function ‘malloc’ [enabled by default]
+base64.c:567:7: warning: incompatible implicit declaration of built-in function ‘free’ [enabled by default]
+make[4]: *** [base64.o] Error 1
+make[4]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[3]: *** [all-recursive] Error 1
+make[3]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[2]: *** [all] Error 2
+make[2]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[1]: *** [all-recursive] Error 1
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug'
+make: *** [all] Error 2
+dataloader% make clean
+Making clean in po
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/po'
+rm -f remove-potcdate.sed
+rm -f stamp-poT
+rm -f core core.* nagios-plugins.po nagios-plugins.1po nagios-plugins.2po *.new.po
+rm -fr *.o
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/po'
+Making clean in plugins-root
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/plugins-root'
+NP_VERSION = 1.4.16.29.g3c10
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/plugins-root'
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/plugins-root'
+rm -rf .libs _libs
+rm -f NP-VERSION-FILE
+ rm -f check_dhcp check_icmp
+rm -f *.o
+rm -f *.lo
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/plugins-root'
+Making clean in plugins-scripts
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/plugins-scripts'
+NP_VERSION = 1.4.16.29.g3c10
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/plugins-scripts'
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/plugins-scripts'
+test -z "check_breeze check_disk_smb check_flexlm check_ircd check_log check_oracle check_rpc check_sensors check_wave check_ifstatus check_ifoperstatus check_mailq check_file_age utils.sh utils.pm" || rm -f check_breeze check_disk_smb check_flexlm check_ircd check_log check_oracle check_rpc check_sensors check_wave check_ifstatus check_ifoperstatus check_mailq check_file_age utils.sh utils.pm
+rm -rf .libs _libs
+rm -f NP-VERSION-FILE
+rm -f *.lo
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/plugins-scripts'
+Making clean in plugins
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/plugins'
+NP_VERSION = 1.4.16.29.g3c10
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/plugins'
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/plugins'
+ rm -f check_apt check_cluster check_disk check_dummy check_http check_load check_mrtg check_mrtgtraf check_ntp check_ntp_peer check_nwstat check_overcr check_ping check_real check_smtp check_ssh check_tcp check_time check_ntp_time check_ups check_users negate urlize check_ide_smart check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_game check_fping check_by_ssh check_swap check_dig check_apt check_nt
+rm -rf .libs _libs
+rm -f check_ftp check_imap check_nntp check_pop check_udp check_clamd check_simap check_spop check_jabber check_nntps check_ssmtp
+rm -f NP-VERSION-FILE
+rm -f *.o
+rm -f *.lo
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/plugins'
+Making clean in lib
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/lib'
+Making clean in tests
+make[2]: Entering directory `/home/bryan/tmp/nagiosplug/lib/tests'
+rm -rf .libs _libs
+rm -f *.o
+rm -f *.lo
+make[2]: Leaving directory `/home/bryan/tmp/nagiosplug/lib/tests'
+Making clean in .
+make[2]: Entering directory `/home/bryan/tmp/nagiosplug/lib'
+rm -rf .libs _libs
+test -z "libnagiosplug.a" || rm -f libnagiosplug.a
+rm -f *.o
+rm -f *.lo
+make[2]: Leaving directory `/home/bryan/tmp/nagiosplug/lib'
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/lib'
+Making clean in tap
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/tap'
+rm -rf .libs _libs
+test -z "" || rm -f
+rm -f *.o
+rm -f *.lo
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/tap'
+Making clean in gl
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+Making clean in .
+make[2]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+test -z "configmake.h configmake.h-t charset.alias ref-add.sed ref-del.sed" || rm -f configmake.h configmake.h-t charset.alias ref-add.sed ref-del.sed
+rm -rf .libs _libs
+test -z "libgnu.a" || rm -f libgnu.a
+test -z "" || rm -f
+rm -f *.o
+test -z "core *.stackdump alloca.h alloca.h-t arg-nonnull.h arg-nonnull.h-t arpa/inet.h arpa/inet.h-t c++defs.h c++defs.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h float.h-t getopt.h getopt.h-t langinfo.h langinfo.h-t locale.h locale.h-t math.h math.h-t netdb.h netdb.h-t netinet/in.h netinet/in.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/socket.h sys/socket.h-t sys/stat.h sys/stat.h-t time.h time.h-t unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t wchar.h wchar.h-t wctype.h wctype.h-t" || rm -f core *.stackdump alloca.h alloca.h-t arg-nonnull.h arg-nonnull.h-t arpa/inet.h arpa/inet.h-t c++defs.h c++defs.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h float.h-t getopt.h getopt.h-t langinfo.h langinfo.h-t locale.h locale.h-t math.h math.h-t netdb.h netdb.h-t netinet/in.h netinet/in.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/socket.h sys/socket.h-t sys/stat.h sys/stat.h-t time.h time.h-t unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t wchar.h wchar.h-t wctype.h wctype.h-t
+rm -f *.lo
+rmdir arpa
+rmdir sys
+make[2]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+Making clean in .
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug'
+rm -rf .libs _libs
+rm -f *.lo
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug'
+dataloader% make
+make  all-recursive
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug'
+Making all in gl
+make[2]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+rm -f arg-nonnull.h-t arg-nonnull.h && \
+        sed -n -e '/GL_ARG_NONNULL/,$p' \
+          < ../build-aux/arg-nonnull.h \
+          > arg-nonnull.h-t && \
+        mv arg-nonnull.h-t arg-nonnull.h
+rm -f warn-on-use.h-t warn-on-use.h && \
+        sed -n -e '/^.ifndef/,$p' \
+          < ../build-aux/warn-on-use.h \
+          > warn-on-use.h-t && \
+        mv warn-on-use.h-t warn-on-use.h
+/bin/mkdir -p arpa
+rm -f arpa/inet.h-t arpa/inet.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_ARPA_INET_H''@||g' \
+              -e 's|@''HAVE_ARPA_INET_H''@||g' \
+              -e 's|@''GNULIB_INET_NTOP''@||g' \
+              -e 's|@''GNULIB_INET_PTON''@||g' \
+              -e 's|@''HAVE_DECL_INET_NTOP''@||g' \
+              -e 's|@''HAVE_DECL_INET_PTON''@||g' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./arpa_inet.in.h; \
+        } > arpa/inet.h-t && \
+        mv arpa/inet.h-t arpa/inet.h
+rm -f c++defs.h-t c++defs.h && \
+        sed -n -e '/_GL_CXXDEFS/,$p' \
+          < ../build-aux/c++defs.h \
+          > c++defs.h-t && \
+        mv c++defs.h-t c++defs.h
+rm -f configmake.h-t && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          echo '#define PREFIX "/usr/local/nagios"'; \
+          echo '#define EXEC_PREFIX "/usr/local/nagios"'; \
+          echo '#define BINDIR "/usr/local/nagios/bin"'; \
+          echo '#define SBINDIR "/usr/local/nagios/sbin"'; \
+          echo '#define LIBEXECDIR "/usr/local/nagios/libexec"'; \
+          echo '#define DATAROOTDIR "/usr/local/nagios/share"'; \
+          echo '#define DATADIR "/usr/local/nagios/share"'; \
+          echo '#define SYSCONFDIR "/usr/local/nagios/etc"'; \
+          echo '#define SHAREDSTATEDIR "/usr/local/nagios/com"'; \
+          echo '#define LOCALSTATEDIR "/usr/local/nagios/var"'; \
+          echo '#define INCLUDEDIR "/usr/local/nagios/include"'; \
+          echo '#define OLDINCLUDEDIR "/usr/include"'; \
+          echo '#define DOCDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define INFODIR "/usr/local/nagios/share/info"'; \
+          echo '#define HTMLDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define DVIDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define PDFDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define PSDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define LIBDIR "/usr/local/nagios/lib"'; \
+          echo '#define LISPDIR ""'; \
+          echo '#define LOCALEDIR "/usr/local/nagios/share/locale"'; \
+          echo '#define MANDIR "/usr/local/nagios/share/man"'; \
+          echo '#define MANEXT ""'; \
+          echo '#define PKGDATADIR "/usr/local/nagios/share/nagios-plugins"'; \
+          echo '#define PKGINCLUDEDIR "/usr/local/nagios/include/nagios-plugins"'; \
+          echo '#define PKGLIBDIR "/usr/local/nagios/lib/nagios-plugins"'; \
+          echo '#define PKGLIBEXECDIR "/usr/local/nagios/libexec/nagios-plugins"'; \
+        } | sed '/""/d' > configmake.h-t && \
+        if test -f configmake.h && cmp configmake.h-t configmake.h > /dev/null; then \
+          rm -f configmake.h-t; \
+        else \
+          rm -f configmake.h; mv configmake.h-t configmake.h; \
+        fi
+rm -f fcntl.h-t fcntl.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_FCNTL_H''@||g' \
+              -e 's|@''GNULIB_FCNTL''@||g' \
+              -e 's|@''GNULIB_OPEN''@||g' \
+              -e 's|@''GNULIB_OPENAT''@||g' \
+              -e 's|@''HAVE_FCNTL''@||g' \
+              -e 's|@''HAVE_OPENAT''@||g' \
+              -e 's|@''REPLACE_FCNTL''@||g' \
+              -e 's|@''REPLACE_OPEN''@||g' \
+              -e 's|@''REPLACE_OPENAT''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./fcntl.in.h; \
+        } > fcntl.h-t && \
+        mv fcntl.h-t fcntl.h
+rm -f langinfo.h-t langinfo.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''HAVE_LANGINFO_H''@||g' \
+              -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_LANGINFO_H''@||g' \
+              -e 's|@''GNULIB_NL_LANGINFO''@||g' \
+              -e 's|@''HAVE_LANGINFO_CODESET''@||g' \
+              -e 's|@''HAVE_LANGINFO_ERA''@||g' \
+              -e 's|@''HAVE_NL_LANGINFO''@||g' \
+              -e 's|@''REPLACE_NL_LANGINFO''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./langinfo.in.h; \
+        } > langinfo.h-t && \
+        mv langinfo.h-t langinfo.h
+rm -f locale.h-t locale.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_LOCALE_H''@||g' \
+              -e 's|@''GNULIB_DUPLOCALE''@||g' \
+              -e 's|@''HAVE_DUPLOCALE''@||g' \
+              -e 's|@''HAVE_XLOCALE_H''@||g' \
+              -e 's|@''REPLACE_DUPLOCALE''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./locale.in.h; \
+        } > locale.h-t && \
+        mv locale.h-t locale.h
+rm -f math.h-t math.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@||g' \
+              -e 's|@''GNULIB_ACOSL''@||g' \
+              -e 's|@''GNULIB_ASINL''@||g' \
+              -e 's|@''GNULIB_ATANL''@||g' \
+              -e 's|@''GNULIB_CEILF''@||g' \
+              -e 's|@''GNULIB_CEILL''@||g' \
+              -e 's|@''GNULIB_COSL''@||g' \
+              -e 's|@''GNULIB_EXPL''@||g' \
+              -e 's|@''GNULIB_FLOORF''@||g' \
+              -e 's|@''GNULIB_FLOORL''@||g' \
+              -e 's|@''GNULIB_FREXP''@||g' \
+              -e 's|@''GNULIB_FREXPL''@||g' \
+              -e 's|@''GNULIB_ISFINITE''@||g' \
+              -e 's|@''GNULIB_ISINF''@||g' \
+              -e 's|@''GNULIB_ISNAN''@||g' \
+              -e 's|@''GNULIB_ISNANF''@||g' \
+              -e 's|@''GNULIB_ISNAND''@||g' \
+              -e 's|@''GNULIB_ISNANL''@||g' \
+              -e 's|@''GNULIB_LDEXPL''@||g' \
+              -e 's|@''GNULIB_LOGB''@||g' \
+              -e 's|@''GNULIB_LOGL''@||g' \
+              -e 's|@''GNULIB_ROUND''@||g' \
+              -e 's|@''GNULIB_ROUNDF''@||g' \
+              -e 's|@''GNULIB_ROUNDL''@||g' \
+              -e 's|@''GNULIB_SIGNBIT''@||g' \
+              -e 's|@''GNULIB_SINL''@||g' \
+              -e 's|@''GNULIB_SQRTL''@||g' \
+              -e 's|@''GNULIB_TANL''@||g' \
+              -e 's|@''GNULIB_TRUNC''@||g' \
+              -e 's|@''GNULIB_TRUNCF''@||g' \
+              -e 's|@''GNULIB_TRUNCL''@||g' \
+              -e 's|@''HAVE_ACOSL''@||g' \
+              -e 's|@''HAVE_ASINL''@||g' \
+              -e 's|@''HAVE_ATANL''@||g' \
+              -e 's|@''HAVE_COSL''@||g' \
+              -e 's|@''HAVE_EXPL''@||g' \
+              -e 's|@''HAVE_ISNANF''@||g' \
+              -e 's|@''HAVE_ISNAND''@||g' \
+              -e 's|@''HAVE_ISNANL''@||g' \
+              -e 's|@''HAVE_LOGL''@||g' \
+              -e 's|@''HAVE_SINL''@||g' \
+              -e 's|@''HAVE_SQRTL''@||g' \
+              -e 's|@''HAVE_TANL''@||g' \
+              -e 's|@''HAVE_DECL_ACOSL''@||g' \
+              -e 's|@''HAVE_DECL_ASINL''@||g' \
+              -e 's|@''HAVE_DECL_ATANL''@||g' \
+              -e 's|@''HAVE_DECL_CEILF''@||g' \
+              -e 's|@''HAVE_DECL_CEILL''@||g' \
+              -e 's|@''HAVE_DECL_COSL''@||g' \
+              -e 's|@''HAVE_DECL_EXPL''@||g' \
+              -e 's|@''HAVE_DECL_FLOORF''@||g' \
+              -e 's|@''HAVE_DECL_FLOORL''@||g' \
+              -e 's|@''HAVE_DECL_FREXPL''@||g' \
+              -e 's|@''HAVE_DECL_LDEXPL''@||g' \
+              -e 's|@''HAVE_DECL_LOGB''@||g' \
+              -e 's|@''HAVE_DECL_LOGL''@||g' \
+              -e 's|@''HAVE_DECL_ROUND''@||g' \
+              -e 's|@''HAVE_DECL_ROUNDF''@||g' \
+              -e 's|@''HAVE_DECL_ROUNDL''@||g' \
+              -e 's|@''HAVE_DECL_SINL''@||g' \
+              -e 's|@''HAVE_DECL_SQRTL''@||g' \
+              -e 's|@''HAVE_DECL_TANL''@||g' \
+              -e 's|@''HAVE_DECL_TRUNC''@||g' \
+              -e 's|@''HAVE_DECL_TRUNCF''@||g' \
+              -e 's|@''HAVE_DECL_TRUNCL''@||g' \
+              -e 's|@''REPLACE_CEILF''@||g' \
+              -e 's|@''REPLACE_CEILL''@||g' \
+              -e 's|@''REPLACE_FLOORF''@||g' \
+              -e 's|@''REPLACE_FLOORL''@||g' \
+              -e 's|@''REPLACE_FREXP''@||g' \
+              -e 's|@''REPLACE_FREXPL''@||g' \
+              -e 's|@''REPLACE_HUGE_VAL''@||g' \
+              -e 's|@''REPLACE_ISFINITE''@||g' \
+              -e 's|@''REPLACE_ISINF''@||g' \
+              -e 's|@''REPLACE_ISNAN''@||g' \
+              -e 's|@''REPLACE_LDEXPL''@||g' \
+              -e 's|@''REPLACE_NAN''@||g' \
+              -e 's|@''REPLACE_ROUND''@||g' \
+              -e 's|@''REPLACE_ROUNDF''@||g' \
+              -e 's|@''REPLACE_ROUNDL''@||g' \
+              -e 's|@''REPLACE_SIGNBIT''@||g' \
+              -e 's|@''REPLACE_SIGNBIT_USING_GCC''@||g' \
+              -e 's|@''REPLACE_TRUNCL''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./math.in.h; \
+        } > math.h-t && \
+        mv math.h-t math.h
+rm -f netdb.h-t netdb.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_NETDB_H''@||g' \
+              -e 's|@''HAVE_NETDB_H''@||g' \
+              -e 's|@''GNULIB_GETADDRINFO''@||g' \
+              -e 's|@''HAVE_STRUCT_ADDRINFO''@||g' \
+              -e 's|@''HAVE_DECL_FREEADDRINFO''@||g' \
+              -e 's|@''HAVE_DECL_GAI_STRERROR''@||g' \
+              -e 's|@''HAVE_DECL_GETADDRINFO''@||g' \
+              -e 's|@''HAVE_DECL_GETNAMEINFO''@||g' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./netdb.in.h; \
+        } > netdb.h-t && \
+        mv netdb.h-t netdb.h
+rm -f stdio.h-t stdio.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_STDIO_H''@||g' \
+              -e 's|@''GNULIB_DPRINTF''@||g' \
+              -e 's|@''GNULIB_FCLOSE''@||g' \
+              -e 's|@''GNULIB_FFLUSH''@||g' \
+              -e 's|@''GNULIB_FOPEN''@||g' \
+              -e 's|@''GNULIB_FPRINTF''@||g' \
+              -e 's|@''GNULIB_FPRINTF_POSIX''@||g' \
+              -e 's|@''GNULIB_FPURGE''@||g' \
+              -e 's|@''GNULIB_FPUTC''@||g' \
+              -e 's|@''GNULIB_FPUTS''@||g' \
+              -e 's|@''GNULIB_FREOPEN''@||g' \
+              -e 's|@''GNULIB_FSEEK''@||g' \
+              -e 's|@''GNULIB_FSEEKO''@||g' \
+              -e 's|@''GNULIB_FTELL''@||g' \
+              -e 's|@''GNULIB_FTELLO''@||g' \
+              -e 's|@''GNULIB_FWRITE''@||g' \
+              -e 's|@''GNULIB_GETDELIM''@||g' \
+              -e 's|@''GNULIB_GETLINE''@||g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF''@||g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@||g' \
+              -e 's|@''GNULIB_PERROR''@||g' \
+              -e 's|@''GNULIB_POPEN''@||g' \
+              -e 's|@''GNULIB_PRINTF''@||g' \
+              -e 's|@''GNULIB_PRINTF_POSIX''@||g' \
+              -e 's|@''GNULIB_PUTC''@||g' \
+              -e 's|@''GNULIB_PUTCHAR''@||g' \
+              -e 's|@''GNULIB_PUTS''@||g' \
+              -e 's|@''GNULIB_REMOVE''@||g' \
+              -e 's|@''GNULIB_RENAME''@||g' \
+              -e 's|@''GNULIB_RENAMEAT''@||g' \
+              -e 's|@''GNULIB_SNPRINTF''@||g' \
+              -e 's|@''GNULIB_SPRINTF_POSIX''@||g' \
+              -e 's|@''GNULIB_STDIO_H_SIGPIPE''@||g' \
+              -e 's|@''GNULIB_TMPFILE''@||g' \
+              -e 's|@''GNULIB_VASPRINTF''@||g' \
+              -e 's|@''GNULIB_VDPRINTF''@||g' \
+              -e 's|@''GNULIB_VFPRINTF''@||g' \
+              -e 's|@''GNULIB_VFPRINTF_POSIX''@||g' \
+              -e 's|@''GNULIB_VPRINTF''@||g' \
+              -e 's|@''GNULIB_VPRINTF_POSIX''@||g' \
+              -e 's|@''GNULIB_VSNPRINTF''@||g' \
+              -e 's|@''GNULIB_VSPRINTF_POSIX''@||g' \
+              < ./stdio.in.h | \
+          sed -e 's|@''HAVE_DECL_FPURGE''@||g' \
+              -e 's|@''HAVE_DECL_GETDELIM''@||g' \
+              -e 's|@''HAVE_DECL_GETLINE''@||g' \
+              -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@||g' \
+              -e 's|@''HAVE_DECL_SNPRINTF''@||g' \
+              -e 's|@''HAVE_DECL_VSNPRINTF''@||g' \
+              -e 's|@''HAVE_DPRINTF''@||g' \
+              -e 's|@''HAVE_FSEEKO''@||g' \
+              -e 's|@''HAVE_FTELLO''@||g' \
+              -e 's|@''HAVE_RENAMEAT''@||g' \
+              -e 's|@''HAVE_VASPRINTF''@||g' \
+              -e 's|@''HAVE_VDPRINTF''@||g' \
+              -e 's|@''REPLACE_DPRINTF''@||g' \
+              -e 's|@''REPLACE_FCLOSE''@||g' \
+              -e 's|@''REPLACE_FFLUSH''@||g' \
+              -e 's|@''REPLACE_FOPEN''@||g' \
+              -e 's|@''REPLACE_FPRINTF''@||g' \
+              -e 's|@''REPLACE_FPURGE''@||g' \
+              -e 's|@''REPLACE_FREOPEN''@||g' \
+              -e 's|@''REPLACE_FSEEK''@||g' \
+              -e 's|@''REPLACE_FSEEKO''@||g' \
+              -e 's|@''REPLACE_FTELL''@||g' \
+              -e 's|@''REPLACE_FTELLO''@||g' \
+              -e 's|@''REPLACE_GETDELIM''@||g' \
+              -e 's|@''REPLACE_GETLINE''@||g' \
+              -e 's|@''REPLACE_OBSTACK_PRINTF''@||g' \
+              -e 's|@''REPLACE_PERROR''@||g' \
+              -e 's|@''REPLACE_POPEN''@||g' \
+              -e 's|@''REPLACE_PRINTF''@||g' \
+              -e 's|@''REPLACE_REMOVE''@||g' \
+              -e 's|@''REPLACE_RENAME''@||g' \
+              -e 's|@''REPLACE_RENAMEAT''@||g' \
+              -e 's|@''REPLACE_SNPRINTF''@||g' \
+              -e 's|@''REPLACE_SPRINTF''@||g' \
+              -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@||g' \
+              -e 's|@''REPLACE_TMPFILE''@||g' \
+              -e 's|@''REPLACE_VASPRINTF''@||g' \
+              -e 's|@''REPLACE_VDPRINTF''@||g' \
+              -e 's|@''REPLACE_VFPRINTF''@||g' \
+              -e 's|@''REPLACE_VPRINTF''@||g' \
+              -e 's|@''REPLACE_VSNPRINTF''@||g' \
+              -e 's|@''REPLACE_VSPRINTF''@||g' \
+              -e 's|@''ASM_SYMBOL_PREFIX''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h'; \
+        } > stdio.h-t && \
+        mv stdio.h-t stdio.h
+rm -f stdlib.h-t stdlib.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_STDLIB_H''@||g' \
+              -e 's|@''GNULIB_ATOLL''@||g' \
+              -e 's|@''GNULIB_CALLOC_POSIX''@||g' \
+              -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@||g' \
+              -e 's|@''GNULIB_GETLOADAVG''@||g' \
+              -e 's|@''GNULIB_GETSUBOPT''@||g' \
+              -e 's|@''GNULIB_GRANTPT''@||g' \
+              -e 's|@''GNULIB_MALLOC_POSIX''@||g' \
+              -e 's|@''GNULIB_MKDTEMP''@||g' \
+              -e 's|@''GNULIB_MKOSTEMP''@||g' \
+              -e 's|@''GNULIB_MKOSTEMPS''@||g' \
+              -e 's|@''GNULIB_MKSTEMP''@||g' \
+              -e 's|@''GNULIB_MKSTEMPS''@||g' \
+              -e 's|@''GNULIB_PTSNAME''@||g' \
+              -e 's|@''GNULIB_PUTENV''@||g' \
+              -e 's|@''GNULIB_RANDOM_R''@||g' \
+              -e 's|@''GNULIB_REALLOC_POSIX''@||g' \
+              -e 's|@''GNULIB_REALPATH''@||g' \
+              -e 's|@''GNULIB_RPMATCH''@||g' \
+              -e 's|@''GNULIB_SETENV''@||g' \
+              -e 's|@''GNULIB_STRTOD''@||g' \
+              -e 's|@''GNULIB_STRTOLL''@||g' \
+              -e 's|@''GNULIB_STRTOULL''@||g' \
+              -e 's|@''GNULIB_UNLOCKPT''@||g' \
+              -e 's|@''GNULIB_UNSETENV''@||g' \
+              -e 's|@''HAVE_ATOLL''@||g' \
+              -e 's|@''HAVE_CALLOC_POSIX''@||g' \
+              -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@||g' \
+              -e 's|@''HAVE_DECL_GETLOADAVG''@||g' \
+              -e 's|@''HAVE_GETSUBOPT''@||g' \
+              -e 's|@''HAVE_GRANTPT''@||g' \
+              -e 's|@''HAVE_MALLOC_POSIX''@||g' \
+              -e 's|@''HAVE_MKDTEMP''@||g' \
+              -e 's|@''HAVE_MKOSTEMP''@||g' \
+              -e 's|@''HAVE_MKOSTEMPS''@||g' \
+              -e 's|@''HAVE_MKSTEMP''@||g' \
+              -e 's|@''HAVE_MKSTEMPS''@||g' \
+              -e 's|@''HAVE_PTSNAME''@||g' \
+              -e 's|@''HAVE_RANDOM_H''@||g' \
+              -e 's|@''HAVE_RANDOM_R''@||g' \
+              -e 's|@''HAVE_REALLOC_POSIX''@||g' \
+              -e 's|@''HAVE_REALPATH''@||g' \
+              -e 's|@''HAVE_RPMATCH''@||g' \
+              -e 's|@''HAVE_SETENV''@||g' \
+              -e 's|@''HAVE_STRTOD''@||g' \
+              -e 's|@''HAVE_STRTOLL''@||g' \
+              -e 's|@''HAVE_STRTOULL''@||g' \
+              -e 's|@''HAVE_STRUCT_RANDOM_DATA''@||g' \
+              -e 's|@''HAVE_SYS_LOADAVG_H''@||g' \
+              -e 's|@''HAVE_UNLOCKPT''@||g' \
+              -e 's|@''HAVE_UNSETENV''@||g' \
+              -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@||g' \
+              -e 's|@''REPLACE_MKSTEMP''@||g' \
+              -e 's|@''REPLACE_PUTENV''@||g' \
+              -e 's|@''REPLACE_REALPATH''@||g' \
+              -e 's|@''REPLACE_SETENV''@||g' \
+              -e 's|@''REPLACE_STRTOD''@||g' \
+              -e 's|@''REPLACE_UNSETENV''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./stdlib.in.h; \
+        } > stdlib.h-t && \
+        mv stdlib.h-t stdlib.h
+rm -f string.h-t string.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_STRING_H''@||g' \
+              -e 's|@''GNULIB_MBSLEN''@||g' \
+              -e 's|@''GNULIB_MBSNLEN''@||g' \
+              -e 's|@''GNULIB_MBSCHR''@||g' \
+              -e 's|@''GNULIB_MBSRCHR''@||g' \
+              -e 's|@''GNULIB_MBSSTR''@||g' \
+              -e 's|@''GNULIB_MBSCASECMP''@||g' \
+              -e 's|@''GNULIB_MBSNCASECMP''@||g' \
+              -e 's|@''GNULIB_MBSPCASECMP''@||g' \
+              -e 's|@''GNULIB_MBSCASESTR''@||g' \
+              -e 's|@''GNULIB_MBSCSPN''@||g' \
+              -e 's|@''GNULIB_MBSPBRK''@||g' \
+              -e 's|@''GNULIB_MBSSPN''@||g' \
+              -e 's|@''GNULIB_MBSSEP''@||g' \
+              -e 's|@''GNULIB_MBSTOK_R''@||g' \
+              -e 's|@''GNULIB_MEMCHR''@||g' \
+              -e 's|@''GNULIB_MEMMEM''@||g' \
+              -e 's|@''GNULIB_MEMPCPY''@||g' \
+              -e 's|@''GNULIB_MEMRCHR''@||g' \
+              -e 's|@''GNULIB_RAWMEMCHR''@||g' \
+              -e 's|@''GNULIB_STPCPY''@||g' \
+              -e 's|@''GNULIB_STPNCPY''@||g' \
+              -e 's|@''GNULIB_STRCHRNUL''@||g' \
+              -e 's|@''GNULIB_STRDUP''@||g' \
+              -e 's|@''GNULIB_STRNCAT''@||g' \
+              -e 's|@''GNULIB_STRNDUP''@||g' \
+              -e 's|@''GNULIB_STRNLEN''@||g' \
+              -e 's|@''GNULIB_STRPBRK''@||g' \
+              -e 's|@''GNULIB_STRSEP''@||g' \
+              -e 's|@''GNULIB_STRSTR''@||g' \
+              -e 's|@''GNULIB_STRCASESTR''@||g' \
+              -e 's|@''GNULIB_STRTOK_R''@||g' \
+              -e 's|@''GNULIB_STRERROR''@||g' \
+              -e 's|@''GNULIB_STRSIGNAL''@||g' \
+              -e 's|@''GNULIB_STRVERSCMP''@||g' \
+              < ./string.in.h | \
+          sed -e 's|@''HAVE_MBSLEN''@||g' \
+              -e 's|@''HAVE_MEMCHR''@||g' \
+              -e 's|@''HAVE_DECL_MEMMEM''@||g' \
+              -e 's|@''HAVE_MEMPCPY''@||g' \
+              -e 's|@''HAVE_DECL_MEMRCHR''@||g' \
+              -e 's|@''HAVE_RAWMEMCHR''@||g' \
+              -e 's|@''HAVE_STPCPY''@||g' \
+              -e 's|@''HAVE_STPNCPY''@||g' \
+              -e 's|@''HAVE_STRCHRNUL''@||g' \
+              -e 's|@''HAVE_DECL_STRDUP''@||g' \
+              -e 's|@''HAVE_DECL_STRNDUP''@||g' \
+              -e 's|@''HAVE_DECL_STRNLEN''@||g' \
+              -e 's|@''HAVE_STRPBRK''@||g' \
+              -e 's|@''HAVE_STRSEP''@||g' \
+              -e 's|@''HAVE_STRCASESTR''@||g' \
+              -e 's|@''HAVE_DECL_STRTOK_R''@||g' \
+              -e 's|@''HAVE_DECL_STRSIGNAL''@||g' \
+              -e 's|@''HAVE_STRVERSCMP''@||g' \
+              -e 's|@''REPLACE_STPNCPY''@||g' \
+              -e 's|@''REPLACE_MEMCHR''@||g' \
+              -e 's|@''REPLACE_MEMMEM''@||g' \
+              -e 's|@''REPLACE_STRCASESTR''@||g' \
+              -e 's|@''REPLACE_STRDUP''@||g' \
+              -e 's|@''REPLACE_STRSTR''@||g' \
+              -e 's|@''REPLACE_STRERROR''@||g' \
+              -e 's|@''REPLACE_STRNCAT''@||g' \
+              -e 's|@''REPLACE_STRNDUP''@||g' \
+              -e 's|@''REPLACE_STRNLEN''@||g' \
+              -e 's|@''REPLACE_STRSIGNAL''@||g' \
+              -e 's|@''REPLACE_STRTOK_R''@||g' \
+              -e 's|@''UNDEFINE_STRTOK_R''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h'; \
+              < ./string.in.h; \
+        } > string.h-t && \
+        mv string.h-t string.h
+/bin/mkdir -p sys
+rm -f sys/socket.h-t sys/socket.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_SYS_SOCKET_H''@||g' \
+              -e 's|@''HAVE_SYS_SOCKET_H''@||g' \
+              -e 's|@''GNULIB_CLOSE''@||g' \
+              -e 's|@''GNULIB_SOCKET''@||g' \
+              -e 's|@''GNULIB_CONNECT''@||g' \
+              -e 's|@''GNULIB_ACCEPT''@||g' \
+              -e 's|@''GNULIB_BIND''@||g' \
+              -e 's|@''GNULIB_GETPEERNAME''@||g' \
+              -e 's|@''GNULIB_GETSOCKNAME''@||g' \
+              -e 's|@''GNULIB_GETSOCKOPT''@||g' \
+              -e 's|@''GNULIB_LISTEN''@||g' \
+              -e 's|@''GNULIB_RECV''@||g' \
+              -e 's|@''GNULIB_SEND''@||g' \
+              -e 's|@''GNULIB_RECVFROM''@||g' \
+              -e 's|@''GNULIB_SENDTO''@||g' \
+              -e 's|@''GNULIB_SETSOCKOPT''@||g' \
+              -e 's|@''GNULIB_SHUTDOWN''@||g' \
+              -e 's|@''GNULIB_ACCEPT4''@||g' \
+              -e 's|@''HAVE_WINSOCK2_H''@||g' \
+              -e 's|@''HAVE_WS2TCPIP_H''@||g' \
+              -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@||g' \
+              -e 's|@''HAVE_SA_FAMILY_T''@||g' \
+              -e 's|@''HAVE_ACCEPT4''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./sys_socket.in.h; \
+        } > sys/socket.h-t && \
+        mv -f sys/socket.h-t sys/socket.h
+/bin/mkdir -p sys
+rm -f sys/stat.h-t sys/stat.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_SYS_STAT_H''@||g' \
+              -e 's|@''GNULIB_FCHMODAT''@||g' \
+              -e 's|@''GNULIB_FSTATAT''@||g' \
+              -e 's|@''GNULIB_FUTIMENS''@||g' \
+              -e 's|@''GNULIB_LCHMOD''@||g' \
+              -e 's|@''GNULIB_LSTAT''@||g' \
+              -e 's|@''GNULIB_MKDIRAT''@||g' \
+              -e 's|@''GNULIB_MKFIFO''@||g' \
+              -e 's|@''GNULIB_MKFIFOAT''@||g' \
+              -e 's|@''GNULIB_MKNOD''@||g' \
+              -e 's|@''GNULIB_MKNODAT''@||g' \
+              -e 's|@''GNULIB_STAT''@||g' \
+              -e 's|@''GNULIB_UTIMENSAT''@||g' \
+              -e 's|@''HAVE_FCHMODAT''@||g' \
+              -e 's|@''HAVE_FSTATAT''@||g' \
+              -e 's|@''HAVE_FUTIMENS''@||g' \
+              -e 's|@''HAVE_LCHMOD''@||g' \
+              -e 's|@''HAVE_LSTAT''@||g' \
+              -e 's|@''HAVE_MKDIRAT''@||g' \
+              -e 's|@''HAVE_MKFIFO''@||g' \
+              -e 's|@''HAVE_MKFIFOAT''@||g' \
+              -e 's|@''HAVE_MKNOD''@||g' \
+              -e 's|@''HAVE_MKNODAT''@||g' \
+              -e 's|@''HAVE_UTIMENSAT''@||g' \
+              -e 's|@''REPLACE_FSTAT''@||g' \
+              -e 's|@''REPLACE_FSTATAT''@||g' \
+              -e 's|@''REPLACE_FUTIMENS''@||g' \
+              -e 's|@''REPLACE_LSTAT''@||g' \
+              -e 's|@''REPLACE_MKDIR''@||g' \
+              -e 's|@''REPLACE_MKFIFO''@||g' \
+              -e 's|@''REPLACE_MKNOD''@||g' \
+              -e 's|@''REPLACE_STAT''@||g' \
+              -e 's|@''REPLACE_UTIMENSAT''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./sys_stat.in.h; \
+        } > sys/stat.h-t && \
+        mv sys/stat.h-t sys/stat.h
+rm -f time.h-t time.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_TIME_H''@||g' \
+              -e 's|@''GNULIB_MKTIME''@||g' \
+              -e 's|@''GNULIB_NANOSLEEP''@||g' \
+              -e 's|@''GNULIB_STRPTIME''@||g' \
+              -e 's|@''GNULIB_TIMEGM''@||g' \
+              -e 's|@''GNULIB_TIME_R''@||g' \
+              -e 's|@''HAVE_LOCALTIME_R''@||g' \
+              -e 's|@''HAVE_NANOSLEEP''@||g' \
+              -e 's|@''HAVE_STRPTIME''@||g' \
+              -e 's|@''HAVE_TIMEGM''@||g' \
+              -e 's|@''REPLACE_LOCALTIME_R''@||g' \
+              -e 's|@''REPLACE_MKTIME''@||g' \
+              -e 's|@''REPLACE_NANOSLEEP''@||g' \
+              -e 's|@''REPLACE_TIMEGM''@||g' \
+              -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@||g' \
+              -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@||g' \
+              -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./time.in.h; \
+        } > time.h-t && \
+        mv time.h-t time.h
+rm -f unistd.h-t unistd.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''HAVE_UNISTD_H''@||g' \
+              -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_UNISTD_H''@||g' \
+              -e 's|@''GNULIB_CHOWN''@||g' \
+              -e 's|@''GNULIB_CLOSE''@||g' \
+              -e 's|@''GNULIB_DUP2''@||g' \
+              -e 's|@''GNULIB_DUP3''@||g' \
+              -e 's|@''GNULIB_ENVIRON''@||g' \
+              -e 's|@''GNULIB_EUIDACCESS''@||g' \
+              -e 's|@''GNULIB_FACCESSAT''@||g' \
+              -e 's|@''GNULIB_FCHDIR''@||g' \
+              -e 's|@''GNULIB_FCHOWNAT''@||g' \
+              -e 's|@''GNULIB_FSYNC''@||g' \
+              -e 's|@''GNULIB_FTRUNCATE''@||g' \
+              -e 's|@''GNULIB_GETCWD''@||g' \
+              -e 's|@''GNULIB_GETDOMAINNAME''@||g' \
+              -e 's|@''GNULIB_GETDTABLESIZE''@||g' \
+              -e 's|@''GNULIB_GETGROUPS''@||g' \
+              -e 's|@''GNULIB_GETHOSTNAME''@||g' \
+              -e 's|@''GNULIB_GETLOGIN''@||g' \
+              -e 's|@''GNULIB_GETLOGIN_R''@||g' \
+              -e 's|@''GNULIB_GETPAGESIZE''@||g' \
+              -e 's|@''GNULIB_GETUSERSHELL''@||g' \
+              -e 's|@''GNULIB_LCHOWN''@||g' \
+              -e 's|@''GNULIB_LINK''@||g' \
+              -e 's|@''GNULIB_LINKAT''@||g' \
+              -e 's|@''GNULIB_LSEEK''@||g' \
+              -e 's|@''GNULIB_PIPE2''@||g' \
+              -e 's|@''GNULIB_PREAD''@||g' \
+              -e 's|@''GNULIB_PWRITE''@||g' \
+              -e 's|@''GNULIB_READLINK''@||g' \
+              -e 's|@''GNULIB_READLINKAT''@||g' \
+              -e 's|@''GNULIB_RMDIR''@||g' \
+              -e 's|@''GNULIB_SLEEP''@||g' \
+              -e 's|@''GNULIB_SYMLINK''@||g' \
+              -e 's|@''GNULIB_SYMLINKAT''@||g' \
+              -e 's|@''GNULIB_TTYNAME_R''@||g' \
+              -e 's|@''GNULIB_UNISTD_H_GETOPT''@||g' \
+              -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@||g' \
+              -e 's|@''GNULIB_UNLINK''@||g' \
+              -e 's|@''GNULIB_UNLINKAT''@||g' \
+              -e 's|@''GNULIB_USLEEP''@||g' \
+              -e 's|@''GNULIB_WRITE''@||g' \
+              < ./unistd.in.h | \
+          sed -e 's|@''HAVE_CHOWN''@||g' \
+              -e 's|@''HAVE_DUP2''@||g' \
+              -e 's|@''HAVE_DUP3''@||g' \
+              -e 's|@''HAVE_EUIDACCESS''@||g' \
+              -e 's|@''HAVE_FACCESSAT''@||g' \
+              -e 's|@''HAVE_FCHDIR''@||g' \
+              -e 's|@''HAVE_FCHOWNAT''@||g' \
+              -e 's|@''HAVE_FSYNC''@||g' \
+              -e 's|@''HAVE_FTRUNCATE''@||g' \
+              -e 's|@''HAVE_GETDOMAINNAME''@||g' \
+              -e 's|@''HAVE_GETDTABLESIZE''@||g' \
+              -e 's|@''HAVE_GETGROUPS''@||g' \
+              -e 's|@''HAVE_GETHOSTNAME''@||g' \
+              -e 's|@''HAVE_GETLOGIN''@||g' \
+              -e 's|@''HAVE_GETPAGESIZE''@||g' \
+              -e 's|@''HAVE_LCHOWN''@||g' \
+              -e 's|@''HAVE_LINK''@||g' \
+              -e 's|@''HAVE_LINKAT''@||g' \
+              -e 's|@''HAVE_PIPE2''@||g' \
+              -e 's|@''HAVE_PREAD''@||g' \
+              -e 's|@''HAVE_PWRITE''@||g' \
+              -e 's|@''HAVE_READLINK''@||g' \
+              -e 's|@''HAVE_READLINKAT''@||g' \
+              -e 's|@''HAVE_SLEEP''@||g' \
+              -e 's|@''HAVE_SYMLINK''@||g' \
+              -e 's|@''HAVE_SYMLINKAT''@||g' \
+              -e 's|@''HAVE_TTYNAME_R''@||g' \
+              -e 's|@''HAVE_UNLINKAT''@||g' \
+              -e 's|@''HAVE_USLEEP''@||g' \
+              -e 's|@''HAVE_DECL_ENVIRON''@||g' \
+              -e 's|@''HAVE_DECL_GETLOGIN_R''@||g' \
+              -e 's|@''HAVE_DECL_GETPAGESIZE''@||g' \
+              -e 's|@''HAVE_DECL_GETUSERSHELL''@||g' \
+              -e 's|@''HAVE_OS_H''@||g' \
+              -e 's|@''HAVE_SYS_PARAM_H''@||g' \
+              -e 's|@''REPLACE_CHOWN''@||g' \
+              -e 's|@''REPLACE_CLOSE''@||g' \
+              -e 's|@''REPLACE_DUP''@||g' \
+              -e 's|@''REPLACE_DUP2''@||g' \
+              -e 's|@''REPLACE_FCHOWNAT''@||g' \
+              -e 's|@''REPLACE_GETCWD''@||g' \
+              -e 's|@''REPLACE_GETGROUPS''@||g' \
+              -e 's|@''REPLACE_GETPAGESIZE''@||g' \
+              -e 's|@''REPLACE_LCHOWN''@||g' \
+              -e 's|@''REPLACE_LINK''@||g' \
+              -e 's|@''REPLACE_LINKAT''@||g' \
+              -e 's|@''REPLACE_LSEEK''@||g' \
+              -e 's|@''REPLACE_PREAD''@||g' \
+              -e 's|@''REPLACE_PWRITE''@||g' \
+              -e 's|@''REPLACE_READLINK''@||g' \
+              -e 's|@''REPLACE_RMDIR''@||g' \
+              -e 's|@''REPLACE_SLEEP''@||g' \
+              -e 's|@''REPLACE_SYMLINK''@||g' \
+              -e 's|@''REPLACE_TTYNAME_R''@||g' \
+              -e 's|@''REPLACE_UNLINK''@||g' \
+              -e 's|@''REPLACE_UNLINKAT''@||g' \
+              -e 's|@''REPLACE_USLEEP''@||g' \
+              -e 's|@''REPLACE_WRITE''@||g' \
+              -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@||g' \
+              -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h'; \
+        } > unistd.h-t && \
+        mv unistd.h-t unistd.h
+rm -f wchar.h-t wchar.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_WCHAR_H''@||g' \
+              -e 's|@''HAVE_WCHAR_H''@||g' \
+              -e 's|@''GNULIB_BTOWC''@||g' \
+              -e 's|@''GNULIB_WCTOB''@||g' \
+              -e 's|@''GNULIB_MBSINIT''@||g' \
+              -e 's|@''GNULIB_MBRTOWC''@||g' \
+              -e 's|@''GNULIB_MBRLEN''@||g' \
+              -e 's|@''GNULIB_MBSRTOWCS''@||g' \
+              -e 's|@''GNULIB_MBSNRTOWCS''@||g' \
+              -e 's|@''GNULIB_WCRTOMB''@||g' \
+              -e 's|@''GNULIB_WCSRTOMBS''@||g' \
+              -e 's|@''GNULIB_WCSNRTOMBS''@||g' \
+              -e 's|@''GNULIB_WCWIDTH''@||g' \
+              -e 's|@''HAVE_WINT_T''@||g' \
+              -e 's|@''HAVE_BTOWC''@||g' \
+              -e 's|@''HAVE_MBSINIT''@||g' \
+              -e 's|@''HAVE_MBRTOWC''@||g' \
+              -e 's|@''HAVE_MBRLEN''@||g' \
+              -e 's|@''HAVE_MBSRTOWCS''@||g' \
+              -e 's|@''HAVE_MBSNRTOWCS''@||g' \
+              -e 's|@''HAVE_WCRTOMB''@||g' \
+              -e 's|@''HAVE_WCSRTOMBS''@||g' \
+              -e 's|@''HAVE_WCSNRTOMBS''@||g' \
+              -e 's|@''HAVE_DECL_WCTOB''@||g' \
+              -e 's|@''HAVE_DECL_WCWIDTH''@||g' \
+              -e 's|@''REPLACE_MBSTATE_T''@||g' \
+              -e 's|@''REPLACE_BTOWC''@||g' \
+              -e 's|@''REPLACE_WCTOB''@||g' \
+              -e 's|@''REPLACE_MBSINIT''@||g' \
+              -e 's|@''REPLACE_MBRTOWC''@||g' \
+              -e 's|@''REPLACE_MBRLEN''@||g' \
+              -e 's|@''REPLACE_MBSRTOWCS''@||g' \
+              -e 's|@''REPLACE_MBSNRTOWCS''@||g' \
+              -e 's|@''REPLACE_WCRTOMB''@||g' \
+              -e 's|@''REPLACE_WCSRTOMBS''@||g' \
+              -e 's|@''REPLACE_WCSNRTOMBS''@||g' \
+              -e 's|@''REPLACE_WCWIDTH''@||g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_ARG_NONNULL/r arg-nonnull.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+            < ./wchar.in.h; \
+        } > wchar.h-t && \
+        mv wchar.h-t wchar.h
+rm -f wctype.h-t wctype.h && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's/@''HAVE_WCTYPE_H''@//g' \
+              -e 's|@''INCLUDE_NEXT''@||g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_WCTYPE_H''@||g' \
+              -e 's/@''HAVE_ISWBLANK''@//g' \
+              -e 's/@''HAVE_ISWCNTRL''@//g' \
+              -e 's/@''HAVE_WINT_T''@//g' \
+              -e 's/@''REPLACE_ISWCNTRL''@//g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r c++defs.h' \
+              -e '/definition of _GL_WARN_ON_USE/r warn-on-use.h' \
+              < ./wctype.in.h; \
+        } > wctype.h-t && \
+        mv wctype.h-t wctype.h
+make  all-recursive
+make[3]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+make[4]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+gcc -DHAVE_CONFIG_H -I. -I..  -I../intl   -g -O2 -MT base64.o -MD -MP -MF .deps/base64.Tpo -c -o base64.o base64.c
+In file included from base64.c:47:0:
+base64.h:40:49: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.h:48:53: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+In file included from base64.c:50:0:
+./stdlib.h:20:1: error: stray ‘@’ in program
+./stdlib.h:20:1: error: stray ‘@’ in program
+In file included from base64.c:50:0:
+./stdlib.h:43:7: error: operator '||' has no left operand
+./stdlib.h:49:5: error: #if with no expression
+./stdlib.h:53:7: error: operator '!' has no right operand
+./stdlib.h:58:6: error: operator '!' has no right operand
+./stdlib.h:71:7: error: operator '||' has no left operand
+In file included from base64.c:50:0:
+./stdlib.h:410:5: error: #if with no expression
+./stdlib.h:426:5: error: #if with no expression
+./stdlib.h:445:5: error: #if with no expression
+./stdlib.h:469:5: error: #if with no expression
+./stdlib.h:488:5: error: #if with no expression
+./stdlib.h:516:5: error: #if with no expression
+./stdlib.h:532:5: error: #if with no expression
+./stdlib.h:551:5: error: #if with no expression
+./stdlib.h:570:5: error: #if with no expression
+./stdlib.h:597:5: error: #if with no expression
+./stdlib.h:627:5: error: #if with no expression
+./stdlib.h:658:5: error: #if with no expression
+./stdlib.h:683:5: error: #if with no expression
+./stdlib.h:699:5: error: #if with no expression
+./stdlib.h:714:5: error: #if with no expression
+./stdlib.h:722:5: error: #if with no expression
+./stdlib.h:737:5: error: #if with no expression
+./stdlib.h:754:5: error: #if with no expression
+./stdlib.h:773:5: error: #if with no expression
+./stdlib.h:791:5: error: #if with no expression
+./stdlib.h:810:5: error: #if with no expression
+./stdlib.h:834:5: error: #if with no expression
+./stdlib.h:850:5: error: #if with no expression
+./stdlib.h:881:5: error: #if with no expression
+./stdlib.h:906:5: error: #if with no expression
+./stdlib.h:931:5: error: #if with no expression
+./stdlib.h:956:5: error: #if with no expression
+./stdlib.h:972:5: error: #if with no expression
+In file included from base64.c:55:0:
+./string.h:23:1: error: stray ‘@’ in program
+In file included from base64.c:50:0:
+./stdlib.h:20:2: error: unknown type name ‘PRAGMA_SYSTEM_HEADER’
+In file included from base64.c:55:0:
+./string.h:23:1: error: stray ‘@’ in program
+In file included from base64.c:55:0:
+./string.h:36:6: error: operator '&&' has no left operand
+./string.h:371:5: error: #if with no expression
+./string.h:409:5: error: #if with no expression
+./string.h:444:5: error: #if with no expression
+./string.h:464:5: error: #if with no expression
+./string.h:494:5: error: #if with no expression
+./string.h:522:5: error: #if with no expression
+./string.h:541:5: error: #if with no expression
+./string.h:584:5: error: #if with no expression
+./string.h:612:5: error: #if with no expression
+./string.h:636:5: error: #if with no expression
+./string.h:658:5: error: #if with no expression
+./string.h:686:5: error: #if with no expression
+./string.h:726:5: error: #if with no expression
+./string.h:800:5: error: #if with no expression
+./string.h:823:5: error: #if with no expression
+./string.h:864:5: error: #if with no expression
+./string.h:931:5: error: #if with no expression
+./string.h:976:5: error: #if with no expression
+./string.h:995:5: error: #if with no expression
+./string.h:1002:5: error: #if with no expression
+./string.h:1022:5: error: #if with no expression
+./string.h:1042:5: error: #if with no expression
+./string.h:1051:5: error: #if with no expression
+./string.h:1062:5: error: #if with no expression
+./string.h:1076:5: error: #if with no expression
+./string.h:1090:5: error: #if with no expression
+./string.h:1100:5: error: #if with no expression
+./string.h:1110:5: error: #if with no expression
+./string.h:1130:5: error: #if with no expression
+./string.h:1140:5: error: #if with no expression
+./string.h:1159:5: error: #if with no expression
+./string.h:1181:5: error: #if with no expression
+./string.h:1200:5: error: #if with no expression
+./string.h:1224:5: error: #if with no expression
+base64.c:58:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘static’
+base64.c:69:37: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c: In function ‘base64_encode_alloc’:
+base64.c:138:10: warning: incompatible implicit declaration of built-in function ‘malloc’ [enabled by default]
+base64.c: At top level:
+base64.c:321:29: error: expected ‘;’, ‘,’ or ‘)’ before ‘*’ token
+base64.c:374:32: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c:460:41: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c: In function ‘base64_decode_alloc_ctx’:
+base64.c:561:10: warning: incompatible implicit declaration of built-in function ‘malloc’ [enabled by default]
+base64.c:567:7: warning: incompatible implicit declaration of built-in function ‘free’ [enabled by default]
+make[4]: *** [base64.o] Error 1
+make[4]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[3]: *** [all-recursive] Error 1
+make[3]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[2]: *** [all] Error 2
+make[2]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[1]: *** [all-recursive] Error 1
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug'
+make: *** [all] Error 2
+dataloader%
+dataloader%
+dataloader% ./configure
+checking for a BSD-compatible install... /usr/bin/install -c
+checking whether build environment is sane... yes
+checking for a thread-safe mkdir -p... /bin/mkdir -p
+checking for gawk... gawk
+checking whether make sets $(MAKE)... yes
+checking build system type... x86_64-unknown-linux-gnu
+checking host system type... x86_64-unknown-linux-gnu
+checking for gcc... gcc
+checking whether the C compiler works... yes
+checking for C compiler default output file name... a.out
+checking for suffix of executables...
+checking whether we are cross compiling... no
+checking for suffix of object files... o
+checking whether we are using the GNU C compiler... yes
+checking whether gcc accepts -g... yes
+checking for gcc option to accept ISO C89... none needed
+checking for style of include used by make... GNU
+checking dependency style of gcc... gcc3
+./configure: line 4100: gl_EARLY: command not found
+checking how to run the C preprocessor... gcc -E
+checking for grep that handles long lines and -e... /bin/grep
+checking for egrep... /bin/grep -E
+checking whether gcc needs -traditional... no
+checking how to print strings... printf
+checking for a sed that does not truncate output... /bin/sed
+checking for fgrep... /bin/grep -F
+checking for ld used by gcc... /usr/bin/ld
+checking if the linker (/usr/bin/ld) is GNU ld... yes
+checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
+checking the name lister (/usr/bin/nm -B) interface... BSD nm
+checking whether ln -s works... yes
+checking the maximum length of command line arguments... 1572864
+checking whether the shell understands some XSI constructs... yes
+checking whether the shell understands "+="... yes
+checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop
+checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop
+checking for /usr/bin/ld option to reload object files... -r
+checking for objdump... objdump
+checking how to recognize dependent libraries... pass_all
+checking for dlltool... no
+checking how to associate runtime and link libraries... printf %s\n
+checking for ar... ar
+checking for archiver @FILE support... @
+checking for strip... strip
+checking for ranlib... ranlib
+checking command to parse /usr/bin/nm -B output from gcc object... ok
+checking for sysroot... no
+checking for mt... mt
+checking if mt is a manifest tool... no
+checking for ANSI C header files... yes
+checking for sys/types.h... yes
+checking for sys/stat.h... yes
+checking for stdlib.h... yes
+checking for string.h... yes
+checking for memory.h... yes
+checking for strings.h... yes
+checking for inttypes.h... yes
+checking for stdint.h... yes
+checking for unistd.h... yes
+checking for dlfcn.h... yes
+checking for objdir... .libs
+checking if gcc supports -fno-rtti -fno-exceptions... no
+checking for gcc option to produce PIC... -fPIC -DPIC
+checking if gcc PIC flag -fPIC -DPIC works... yes
+checking if gcc static flag -static works... yes
+checking if gcc supports -c -o file.o... yes
+checking if gcc supports -c -o file.o... (cached) yes
+checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
+checking whether -lc should be explicitly linked in... no
+checking dynamic linker characteristics... GNU/Linux ld.so
+checking how to hardcode library paths into programs... immediate
+checking whether stripping libraries is possible... yes
+checking if libtool supports shared libraries... yes
+checking whether to build shared libraries... yes
+checking whether to build static libraries... yes
+checking whether gcc and cc understand -c and -o together... yes
+checking for error_at_line... yes
+checking for special C compiler options needed for large files... no
+checking for _FILE_OFFSET_BITS value needed for large files... no
+checking for working strtod... yes
+checking for python... /usr/bin/python
+checking for sh... /bin/sh
+checking for perl... /usr/bin/perl
+checking for libgnutls-config... no
+checking for hostname... /bin/hostname
+checking for basename... /usr/bin/basename
+checking for main in -ldce... no
+checking for main in -lnsl... yes
+checking for socket in -lsocket... no
+checking for main in -lresolv... yes
+checking math.h usability... yes
+checking math.h presence... yes
+checking for math.h... yes
+checking for floor in -lm... yes
+checking mp.h usability... no
+checking mp.h presence... no
+checking for mp.h... no
+checking for pow in -lbsd... no
+checking for plan_tests in -ltap... no
+checking for main in -lcrypt... yes
+checking for PQsetdbLogin in -lpq... no
+configure: WARNING: Skipping PostgreSQL plugin (check_pgsql)
+configure: WARNING: LIBS="-lcrypt " CPPFLAGS=""
+configure: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS).
+checking for dbi_initialize in -ldbi... no
+configure: WARNING: Skipping dbi plugin
+configure: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS).
+checking for rc_read_config in -lradiusclient... no
+checking for rc_read_config in -lradiusclient-ng... no
+configure: WARNING: Skipping radius plugin
+configure: WARNING: install radius libs to compile this plugin (see REQUIREMENTS).
+checking for main in -lldap... no
+configure: WARNING: Skipping LDAP plugin
+configure: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS).
+checking linux/hdreg.h usability... yes
+checking linux/hdreg.h presence... yes
+checking for linux/hdreg.h... yes
+checking linux/types.h usability... yes
+checking linux/types.h presence... yes
+checking for linux/types.h... yes
+./configure: line 13278: np_mysqlclient: command not found
+./configure: line 13279: test: =: unary operator expected
+checking for IPv6 support... yes
+checking krb5.h usability... no
+checking krb5.h presence... no
+checking for krb5.h... no
+checking krb5.h usability... no
+checking krb5.h presence... no
+checking for krb5.h... no
+checking for dlopen in -ldl... yes
+checking for shl_load in -ldl... no
+checking openssl/ssl.h usability... yes
+checking openssl/ssl.h presence... yes
+checking for openssl/ssl.h... yes
+checking openssl/x509.h usability... yes
+checking openssl/x509.h presence... yes
+checking for openssl/x509.h... yes
+checking openssl/rsa.h usability... yes
+checking openssl/rsa.h presence... yes
+checking for openssl/rsa.h... yes
+checking openssl/pem.h usability... yes
+checking openssl/pem.h presence... yes
+checking for openssl/pem.h... yes
+checking openssl/crypto.h usability... yes
+checking openssl/crypto.h presence... yes
+checking for openssl/crypto.h... yes
+checking openssl/err.h usability... yes
+checking openssl/err.h presence... yes
+checking for openssl/err.h... yes
+checking for CRYPTO_lock in -lcrypto... yes
+checking for main in -lssl... yes
+checking whether time.h and sys/time.h may both be included... yes
+checking for sys/wait.h that is POSIX.1 compatible... yes
+checking signal.h usability... yes
+checking signal.h presence... yes
+checking for signal.h... yes
+checking syslog.h usability... yes
+checking syslog.h presence... yes
+checking for syslog.h... yes
+checking uio.h usability... no
+checking uio.h presence... no
+checking for uio.h... no
+checking errno.h usability... yes
+checking errno.h presence... yes
+checking for errno.h... yes
+checking sys/time.h usability... yes
+checking sys/time.h presence... yes
+checking for sys/time.h... yes
+checking sys/socket.h usability... yes
+checking sys/socket.h presence... yes
+checking for sys/socket.h... yes
+checking sys/un.h usability... yes
+checking sys/un.h presence... yes
+checking for sys/un.h... yes
+checking sys/poll.h usability... yes
+checking sys/poll.h presence... yes
+checking for sys/poll.h... yes
+checking features.h usability... yes
+checking features.h presence... yes
+checking for features.h... yes
+checking stdarg.h usability... yes
+checking stdarg.h presence... yes
+checking for stdarg.h... yes
+checking sys/unistd.h usability... yes
+checking sys/unistd.h presence... yes
+checking for sys/unistd.h... yes
+checking ctype.h usability... yes
+checking ctype.h presence... yes
+checking for ctype.h... yes
+checking for an ANSI C-conforming const... yes
+checking whether struct tm is in sys/time.h or time.h... time.h
+checking for pid_t... yes
+checking for size_t... yes
+checking return type of signal handlers... void
+checking for va_copy... yes
+checking for memmove... yes
+checking for select... yes
+checking for socket... yes
+checking for strdup... yes
+checking for strstr... yes
+checking for strtol... yes
+checking for strtoul... yes
+checking for floor... no
+checking for poll... yes
+checking return type of socket size... int
+checking for ps... /bin/ps
+checking for ps syntax... /bin/ps axwo 'stat uid pid ppid vsz rss pcpu comm args'
+checking for ping... /bin/ping
+checking for ping6... /bin/ping6
+checking for ICMP ping syntax... /bin/ping -n -U -w %d -c %d %s
+checking for ICMPv6 ping syntax... /bin/ping6 -n -U -w %d -c %d %s
+checking for nslookup... /usr/bin/nslookup
+checking for nslookup syntax... /usr/bin/nslookup -sil
+checking for number of cpus... sysconf(_SC_NPROCESSORS_CONF)
+checking for uptime... /usr/bin/uptime
+checking for rpcinfo... /usr/bin/rpcinfo
+checking for lmstat... no
+configure: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses
+checking for smbclient... /usr/bin/smbclient
+checking for who... /usr/bin/who
+checking for snmpget... /usr/bin/snmpget
+checking for snmpgetnext... /usr/bin/snmpgetnext
+checking for Net::SNMP perl module... found
+checking for quakestat... /usr/bin/quakestat
+checking for qstat... no
+checking for fping... /usr/bin/fping
+checking for ssh... /usr/bin/ssh
+checking for mailq... /usr/bin/mailq
+checking for qmail-qstat... no
+configure: WARNING: Could not find qmail-qstat or eqivalent
+checking for swap... no
+checking for swapinfo... no
+checking for lsps... no
+checking for sys/stat.h... (cached) yes
+checking sys/param.h usability... yes
+checking sys/param.h presence... yes
+checking for sys/param.h... yes
+checking for sys/swap.h... yes
+checking whether swapctl is declared... no
+checking for swaptbl_t... no
+checking for swapent_t... no
+checking for struct swapent.se_nblks... no
+checking for /proc/meminfo... found /proc/meminfo
+checking for dig... /usr/bin/dig
+checking for apt-get... /usr/bin/apt-get
+checking sys/sockio.h usability... no
+checking sys/sockio.h presence... no
+checking for sys/sockio.h... no
+checking whether NLS is requested... yes
+checking for msgfmt... /usr/bin/msgfmt
+checking for gmsgfmt... /usr/bin/msgfmt
+checking for xgettext... /usr/bin/xgettext
+checking for msgmerge... /usr/bin/msgmerge
+checking for ld used by GCC... /usr/bin/ld -m elf_x86_64
+checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
+checking for shared library run path origin... done
+checking for CFPreferencesCopyAppValue... no
+checking for CFLocaleCopyCurrent... no
+checking for GNU gettext in libc... yes
+checking whether to use NLS... yes
+checking where the gettext function comes from... libc
+checking for main in -lpthread... yes
+./configure: line 18615: gl_INIT: command not found
+configure: creating ./config.status
+config.status: creating gl/Makefile
+config.status: creating nagios-plugins.spec
+config.status: creating Makefile
+config.status: creating tap/Makefile
+config.status: creating lib/Makefile
+config.status: creating plugins/Makefile
+config.status: creating lib/tests/Makefile
+config.status: creating plugins-root/Makefile
+config.status: creating plugins-scripts/Makefile
+config.status: creating plugins-scripts/subst
+config.status: creating plugins-scripts/utils.pm
+config.status: creating plugins-scripts/utils.sh
+config.status: creating perlmods/Makefile
+config.status: creating command.cfg
+config.status: creating test.pl
+config.status: creating pkg/solaris/pkginfo
+config.status: creating po/Makefile.in
+config.status: creating config.h
+config.status: config.h is unchanged
+config.status: executing depfiles commands
+config.status: executing libtool commands
+config.status: executing po-directories commands
+config.status: creating po/POTFILES
+config.status: creating po/Makefile
+            --with-apt-get-command: /usr/bin/apt-get
+              --with-ping6-command: /bin/ping6 -n -U -w %d -c %d %s
+               --with-ping-command: /bin/ping -n -U -w %d -c %d %s
+                       --with-ipv6: yes
+                      --with-mysql:
+                    --with-openssl: yes
+                     --with-gnutls: no
+               --enable-extra-opts: no
+                       --with-perl: /usr/bin/perl
+             --enable-perl-modules: no
+                     --with-cgiurl: /nagios/cgi-bin
+               --with-trusted-path: /bin:/sbin:/usr/bin:/usr/sbin
+                   --enable-libtap: no
+dataloader% ./configure
+checking for a BSD-compatible install... /usr/bin/install -c
+checking whether build environment is sane... yes
+checking for a thread-safe mkdir -p... /bin/mkdir -p
+checking for gawk... gawk
+checking whether make sets $(MAKE)... yes
+checking build system type... x86_64-unknown-linux-gnu
+checking host system type... x86_64-unknown-linux-gnu
+checking for gcc... gcc
+checking whether the C compiler works... yes
+checking for C compiler default output file name... a.out
+checking for suffix of executables...
+checking whether we are cross compiling... no
+checking for suffix of object files... o
+checking whether we are using the GNU C compiler... yes
+checking whether gcc accepts -g... yes
+checking for gcc option to accept ISO C89... none needed
+checking for style of include used by make... GNU
+checking dependency style of gcc... gcc3
+./configure: line 4100: gl_EARLY: command not found
+checking how to run the C preprocessor... gcc -E
+checking for grep that handles long lines and -e... /bin/grep
+checking for egrep... /bin/grep -E
+checking whether gcc needs -traditional... no
+checking how to print strings... printf
+checking for a sed that does not truncate output... /bin/sed
+checking for fgrep... /bin/grep -F
+checking for ld used by gcc... /usr/bin/ld
+checking if the linker (/usr/bin/ld) is GNU ld... yes
+checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
+checking the name lister (/usr/bin/nm -B) interface... BSD nm
+checking whether ln -s works... yes
+checking the maximum length of command line arguments... 1572864
+checking whether the shell understands some XSI constructs... yes
+checking whether the shell understands "+="... yes
+checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop
+checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop
+checking for /usr/bin/ld option to reload object files... -r
+checking for objdump... objdump
+checking how to recognize dependent libraries... pass_all
+checking for dlltool... no
+checking how to associate runtime and link libraries... printf %s\n
+checking for ar... ar
+checking for archiver @FILE support... @
+checking for strip... strip
+checking for ranlib... ranlib
+checking command to parse /usr/bin/nm -B output from gcc object... ok
+checking for sysroot... no
+checking for mt... mt
+checking if mt is a manifest tool... no
+checking for ANSI C header files... yes
+checking for sys/types.h... yes
+checking for sys/stat.h... yes
+checking for stdlib.h... yes
+checking for string.h... yes
+checking for memory.h... yes
+checking for strings.h... yes
+checking for inttypes.h... yes
+checking for stdint.h... yes
+checking for unistd.h... yes
+checking for dlfcn.h... yes
+checking for objdir... .libs
+checking if gcc supports -fno-rtti -fno-exceptions... no
+checking for gcc option to produce PIC... -fPIC -DPIC
+checking if gcc PIC flag -fPIC -DPIC works... yes
+checking if gcc static flag -static works... yes
+checking if gcc supports -c -o file.o... yes
+checking if gcc supports -c -o file.o... (cached) yes
+checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
+checking whether -lc should be explicitly linked in... no
+checking dynamic linker characteristics... GNU/Linux ld.so
+checking how to hardcode library paths into programs... immediate
+checking whether stripping libraries is possible... yes
+checking if libtool supports shared libraries... yes
+checking whether to build shared libraries... yes
+checking whether to build static libraries... yes
+checking whether gcc and cc understand -c and -o together... yes
+checking for error_at_line... yes
+checking for special C compiler options needed for large files... no
+checking for _FILE_OFFSET_BITS value needed for large files... no
+checking for working strtod... yes
+checking for python... /usr/bin/python
+checking for sh... /bin/sh
+checking for perl... /usr/bin/perl
+checking for libgnutls-config... no
+checking for hostname... /bin/hostname
+checking for basename... /usr/bin/basename
+checking for main in -ldce... no
+checking for main in -lnsl... yes
+checking for socket in -lsocket... no
+checking for main in -lresolv... yes
+checking math.h usability... yes
+checking math.h presence... yes
+checking for math.h... yes
+checking for floor in -lm... yes
+checking mp.h usability... no
+checking mp.h presence... no
+checking for mp.h... no
+checking for pow in -lbsd... no
+checking for plan_tests in -ltap... no
+checking for main in -lcrypt... yes
+checking for PQsetdbLogin in -lpq... no
+configure: WARNING: Skipping PostgreSQL plugin (check_pgsql)
+configure: WARNING: LIBS="-lcrypt " CPPFLAGS=""
+configure: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS).
+checking for dbi_initialize in -ldbi... no
+configure: WARNING: Skipping dbi plugin
+configure: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS).
+checking for rc_read_config in -lradiusclient... no
+checking for rc_read_config in -lradiusclient-ng... no
+configure: WARNING: Skipping radius plugin
+configure: WARNING: install radius libs to compile this plugin (see REQUIREMENTS).
+checking for main in -lldap... no
+configure: WARNING: Skipping LDAP plugin
+configure: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS).
+checking linux/hdreg.h usability... yes
+checking linux/hdreg.h presence... yes
+checking for linux/hdreg.h... yes
+checking linux/types.h usability... yes
+checking linux/types.h presence... yes
+checking for linux/types.h... yes
+./configure: line 13278: np_mysqlclient: command not found
+./configure: line 13279: test: =: unary operator expected
+checking for IPv6 support... yes
+checking krb5.h usability... no
+checking krb5.h presence... no
+checking for krb5.h... no
+checking krb5.h usability... no
+checking krb5.h presence... no
+checking for krb5.h... no
+checking for dlopen in -ldl... yes
+checking for shl_load in -ldl... no
+checking openssl/ssl.h usability... yes
+checking openssl/ssl.h presence... yes
+checking for openssl/ssl.h... yes
+checking openssl/x509.h usability... yes
+checking openssl/x509.h presence... yes
+checking for openssl/x509.h... yes
+checking openssl/rsa.h usability... yes
+checking openssl/rsa.h presence... yes
+checking for openssl/rsa.h... yes
+checking openssl/pem.h usability... yes
+checking openssl/pem.h presence... yes
+checking for openssl/pem.h... yes
+checking openssl/crypto.h usability... yes
+checking openssl/crypto.h presence... yes
+checking for openssl/crypto.h... yes
+checking openssl/err.h usability... yes
+checking openssl/err.h presence... yes
+checking for openssl/err.h... yes
+checking for CRYPTO_lock in -lcrypto... yes
+checking for main in -lssl... yes
+checking whether time.h and sys/time.h may both be included... yes
+checking for sys/wait.h that is POSIX.1 compatible... yes
+checking signal.h usability... yes
+checking signal.h presence... yes
+checking for signal.h... yes
+checking syslog.h usability... yes
+checking syslog.h presence... yes
+checking for syslog.h... yes
+checking uio.h usability... no
+checking uio.h presence... no
+checking for uio.h... no
+checking errno.h usability... yes
+checking errno.h presence... yes
+checking for errno.h... yes
+checking sys/time.h usability... yes
+checking sys/time.h presence... yes
+checking for sys/time.h... yes
+checking sys/socket.h usability... yes
+checking sys/socket.h presence... yes
+checking for sys/socket.h... yes
+checking sys/un.h usability... yes
+checking sys/un.h presence... yes
+checking for sys/un.h... yes
+checking sys/poll.h usability... yes
+checking sys/poll.h presence... yes
+checking for sys/poll.h... yes
+checking features.h usability... yes
+checking features.h presence... yes
+checking for features.h... yes
+checking stdarg.h usability... yes
+checking stdarg.h presence... yes
+checking for stdarg.h... yes
+checking sys/unistd.h usability... yes
+checking sys/unistd.h presence... yes
+checking for sys/unistd.h... yes
+checking ctype.h usability... yes
+checking ctype.h presence... yes
+checking for ctype.h... yes
+checking for an ANSI C-conforming const... yes
+checking whether struct tm is in sys/time.h or time.h... time.h
+checking for pid_t... yes
+checking for size_t... yes
+checking return type of signal handlers... void
+checking for va_copy... yes
+checking for memmove... yes
+checking for select... yes
+checking for socket... yes
+checking for strdup... yes
+checking for strstr... yes
+checking for strtol... yes
+checking for strtoul... yes
+checking for floor... no
+checking for poll... yes
+checking return type of socket size... int
+checking for ps... /bin/ps
+checking for ps syntax... /bin/ps axwo 'stat uid pid ppid vsz rss pcpu comm args'
+checking for ping... /bin/ping
+checking for ping6... /bin/ping6
+checking for ICMP ping syntax... /bin/ping -n -U -w %d -c %d %s
+checking for ICMPv6 ping syntax... /bin/ping6 -n -U -w %d -c %d %s
+checking for nslookup... /usr/bin/nslookup
+checking for nslookup syntax... /usr/bin/nslookup -sil
+checking for number of cpus... sysconf(_SC_NPROCESSORS_CONF)
+checking for uptime... /usr/bin/uptime
+checking for rpcinfo... /usr/bin/rpcinfo
+checking for lmstat... no
+configure: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses
+checking for smbclient... /usr/bin/smbclient
+checking for who... /usr/bin/who
+checking for snmpget... /usr/bin/snmpget
+checking for snmpgetnext... /usr/bin/snmpgetnext
+checking for Net::SNMP perl module... found
+checking for quakestat... /usr/bin/quakestat
+checking for qstat... no
+checking for fping... /usr/bin/fping
+checking for ssh... /usr/bin/ssh
+checking for mailq... /usr/bin/mailq
+checking for qmail-qstat... no
+configure: WARNING: Could not find qmail-qstat or eqivalent
+checking for swap... no
+checking for swapinfo... no
+checking for lsps... no
+checking for sys/stat.h... (cached) yes
+checking sys/param.h usability... yes
+checking sys/param.h presence... yes
+checking for sys/param.h... yes
+checking for sys/swap.h... yes
+checking whether swapctl is declared... no
+checking for swaptbl_t... no
+checking for swapent_t... no
+checking for struct swapent.se_nblks... no
+checking for /proc/meminfo... found /proc/meminfo
+checking for dig... /usr/bin/dig
+checking for apt-get... /usr/bin/apt-get
+checking sys/sockio.h usability... no
+checking sys/sockio.h presence... no
+checking for sys/sockio.h... no
+checking whether NLS is requested... yes
+checking for msgfmt... /usr/bin/msgfmt
+checking for gmsgfmt... /usr/bin/msgfmt
+checking for xgettext... /usr/bin/xgettext
+checking for msgmerge... /usr/bin/msgmerge
+checking for ld used by GCC... /usr/bin/ld -m elf_x86_64
+checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
+checking for shared library run path origin... done
+checking for CFPreferencesCopyAppValue... no
+checking for CFLocaleCopyCurrent... no
+checking for GNU gettext in libc... yes
+checking whether to use NLS... yes
+checking where the gettext function comes from... libc
+checking for main in -lpthread... yes
+./configure: line 18615: gl_INIT: command not found
+configure: creating ./config.status
+config.status: creating gl/Makefile
+config.status: creating nagios-plugins.spec
+config.status: creating Makefile
+config.status: creating tap/Makefile
+config.status: creating lib/Makefile
+config.status: creating plugins/Makefile
+config.status: creating lib/tests/Makefile
+config.status: creating plugins-root/Makefile
+config.status: creating plugins-scripts/Makefile
+config.status: creating plugins-scripts/subst
+config.status: creating plugins-scripts/utils.pm
+config.status: creating plugins-scripts/utils.sh
+config.status: creating perlmods/Makefile
+config.status: creating command.cfg
+config.status: creating test.pl
+config.status: creating pkg/solaris/pkginfo
+config.status: creating po/Makefile.in
+config.status: creating config.h
+config.status: config.h is unchanged
+config.status: executing depfiles commands
+config.status: executing libtool commands
+config.status: executing po-directories commands
+config.status: creating po/POTFILES
+config.status: creating po/Makefile
+            --with-apt-get-command: /usr/bin/apt-get
+              --with-ping6-command: /bin/ping6 -n -U -w %d -c %d %s
+               --with-ping-command: /bin/ping -n -U -w %d -c %d %s
+                       --with-ipv6: yes
+                      --with-mysql:
+                    --with-openssl: yes
+                     --with-gnutls: no
+               --enable-extra-opts: no
+                       --with-perl: /usr/bin/perl
+             --enable-perl-modules: no
+                     --with-cgiurl: /nagios/cgi-bin
+               --with-trusted-path: /bin:/sbin:/usr/bin:/usr/sbin
+                   --enable-libtap: no
+dataloader% make
+make  all-recursive
+make[1]: Entering directory `/home/bryan/tmp/nagiosplug'
+Making all in gl
+make[2]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+rm -f configmake.h-t && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          echo '#define PREFIX "/usr/local/nagios"'; \
+          echo '#define EXEC_PREFIX "/usr/local/nagios"'; \
+          echo '#define BINDIR "/usr/local/nagios/bin"'; \
+          echo '#define SBINDIR "/usr/local/nagios/sbin"'; \
+          echo '#define LIBEXECDIR "/usr/local/nagios/libexec"'; \
+          echo '#define DATAROOTDIR "/usr/local/nagios/share"'; \
+          echo '#define DATADIR "/usr/local/nagios/share"'; \
+          echo '#define SYSCONFDIR "/usr/local/nagios/etc"'; \
+          echo '#define SHAREDSTATEDIR "/usr/local/nagios/com"'; \
+          echo '#define LOCALSTATEDIR "/usr/local/nagios/var"'; \
+          echo '#define INCLUDEDIR "/usr/local/nagios/include"'; \
+          echo '#define OLDINCLUDEDIR "/usr/include"'; \
+          echo '#define DOCDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define INFODIR "/usr/local/nagios/share/info"'; \
+          echo '#define HTMLDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define DVIDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define PDFDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define PSDIR "/usr/local/nagios/share/doc/nagios-plugins"'; \
+          echo '#define LIBDIR "/usr/local/nagios/lib"'; \
+          echo '#define LISPDIR ""'; \
+          echo '#define LOCALEDIR "/usr/local/nagios/share/locale"'; \
+          echo '#define MANDIR "/usr/local/nagios/share/man"'; \
+          echo '#define MANEXT ""'; \
+          echo '#define PKGDATADIR "/usr/local/nagios/share/nagios-plugins"'; \
+          echo '#define PKGINCLUDEDIR "/usr/local/nagios/include/nagios-plugins"'; \
+          echo '#define PKGLIBDIR "/usr/local/nagios/lib/nagios-plugins"'; \
+          echo '#define PKGLIBEXECDIR "/usr/local/nagios/libexec/nagios-plugins"'; \
+        } | sed '/""/d' > configmake.h-t && \
+        if test -f configmake.h && cmp configmake.h-t configmake.h > /dev/null; then \
+          rm -f configmake.h-t; \
+        else \
+          rm -f configmake.h; mv configmake.h-t configmake.h; \
+        fi
+make  all-recursive
+make[3]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+make[4]: Entering directory `/home/bryan/tmp/nagiosplug/gl'
+gcc -DHAVE_CONFIG_H -I. -I..  -I../intl   -g -O2 -MT base64.o -MD -MP -MF .deps/base64.Tpo -c -o base64.o base64.c
+In file included from base64.c:47:0:
+base64.h:40:49: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.h:48:53: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+In file included from base64.c:50:0:
+./stdlib.h:20:1: error: stray ‘@’ in program
+./stdlib.h:20:1: error: stray ‘@’ in program
+In file included from base64.c:50:0:
+./stdlib.h:43:7: error: operator '||' has no left operand
+./stdlib.h:49:5: error: #if with no expression
+./stdlib.h:53:7: error: operator '!' has no right operand
+./stdlib.h:58:6: error: operator '!' has no right operand
+./stdlib.h:71:7: error: operator '||' has no left operand
+In file included from base64.c:50:0:
+./stdlib.h:410:5: error: #if with no expression
+./stdlib.h:426:5: error: #if with no expression
+./stdlib.h:445:5: error: #if with no expression
+./stdlib.h:469:5: error: #if with no expression
+./stdlib.h:488:5: error: #if with no expression
+./stdlib.h:516:5: error: #if with no expression
+./stdlib.h:532:5: error: #if with no expression
+./stdlib.h:551:5: error: #if with no expression
+./stdlib.h:570:5: error: #if with no expression
+./stdlib.h:597:5: error: #if with no expression
+./stdlib.h:627:5: error: #if with no expression
+./stdlib.h:658:5: error: #if with no expression
+./stdlib.h:683:5: error: #if with no expression
+./stdlib.h:699:5: error: #if with no expression
+./stdlib.h:714:5: error: #if with no expression
+./stdlib.h:722:5: error: #if with no expression
+./stdlib.h:737:5: error: #if with no expression
+./stdlib.h:754:5: error: #if with no expression
+./stdlib.h:773:5: error: #if with no expression
+./stdlib.h:791:5: error: #if with no expression
+./stdlib.h:810:5: error: #if with no expression
+./stdlib.h:834:5: error: #if with no expression
+./stdlib.h:850:5: error: #if with no expression
+./stdlib.h:881:5: error: #if with no expression
+./stdlib.h:906:5: error: #if with no expression
+./stdlib.h:931:5: error: #if with no expression
+./stdlib.h:956:5: error: #if with no expression
+./stdlib.h:972:5: error: #if with no expression
+In file included from base64.c:55:0:
+./string.h:23:1: error: stray ‘@’ in program
+In file included from base64.c:50:0:
+./stdlib.h:20:2: error: unknown type name ‘PRAGMA_SYSTEM_HEADER’
+In file included from base64.c:55:0:
+./string.h:23:1: error: stray ‘@’ in program
+In file included from base64.c:55:0:
+./string.h:36:6: error: operator '&&' has no left operand
+./string.h:371:5: error: #if with no expression
+./string.h:409:5: error: #if with no expression
+./string.h:444:5: error: #if with no expression
+./string.h:464:5: error: #if with no expression
+./string.h:494:5: error: #if with no expression
+./string.h:522:5: error: #if with no expression
+./string.h:541:5: error: #if with no expression
+./string.h:584:5: error: #if with no expression
+./string.h:612:5: error: #if with no expression
+./string.h:636:5: error: #if with no expression
+./string.h:658:5: error: #if with no expression
+./string.h:686:5: error: #if with no expression
+./string.h:726:5: error: #if with no expression
+./string.h:800:5: error: #if with no expression
+./string.h:823:5: error: #if with no expression
+./string.h:864:5: error: #if with no expression
+./string.h:931:5: error: #if with no expression
+./string.h:976:5: error: #if with no expression
+./string.h:995:5: error: #if with no expression
+./string.h:1002:5: error: #if with no expression
+./string.h:1022:5: error: #if with no expression
+./string.h:1042:5: error: #if with no expression
+./string.h:1051:5: error: #if with no expression
+./string.h:1062:5: error: #if with no expression
+./string.h:1076:5: error: #if with no expression
+./string.h:1090:5: error: #if with no expression
+./string.h:1100:5: error: #if with no expression
+./string.h:1110:5: error: #if with no expression
+./string.h:1130:5: error: #if with no expression
+./string.h:1140:5: error: #if with no expression
+./string.h:1159:5: error: #if with no expression
+./string.h:1181:5: error: #if with no expression
+./string.h:1200:5: error: #if with no expression
+./string.h:1224:5: error: #if with no expression
+base64.c:58:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘static’
+base64.c:69:37: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c: In function ‘base64_encode_alloc’:
+base64.c:138:10: warning: incompatible implicit declaration of built-in function ‘malloc’ [enabled by default]
+base64.c: At top level:
+base64.c:321:29: error: expected ‘;’, ‘,’ or ‘)’ before ‘*’ token
+base64.c:374:32: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c:460:41: error: expected ‘;’, ‘,’ or ‘)’ before ‘in’
+base64.c: In function ‘base64_decode_alloc_ctx’:
+base64.c:561:10: warning: incompatible implicit declaration of built-in function ‘malloc’ [enabled by default]
+base64.c:567:7: warning: incompatible implicit declaration of built-in function ‘free’ [enabled by default]
+make[4]: *** [base64.o] Error 1
+make[4]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[3]: *** [all-recursive] Error 1
+make[3]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[2]: *** [all] Error 2
+make[2]: Leaving directory `/home/bryan/tmp/nagiosplug/gl'
+make[1]: *** [all-recursive] Error 1
+make[1]: Leaving directory `/home/bryan/tmp/nagiosplug'
+make: *** [all] Error 2
+d
+
diff --git a/web/attachments/450267-nagios-plugins-1.4.15-vserver.patch b/web/attachments/450267-nagios-plugins-1.4.15-vserver.patch
new file mode 100644
index 0000000..5ecaf89
--- /dev/null
+++ b/web/attachments/450267-nagios-plugins-1.4.15-vserver.patch
@@ -0,0 +1,98 @@
+--- configure.in.orig   2010-07-30 16:22:01.000000000 +0200
++++ configure.in        2010-07-30 16:24:30.000000000 +0200
+@@ -94,6 +94,8 @@
+ REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
+ REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
+ 
++first_ip=`/sbin/ifconfig | egrep -m1 "inet addr:" | sed 's/^.*inet addr:\([[0-9.]]*\).*/\1/'`
++
+ AC_SUBST(PKG_ARCH)
+ AC_SUBST(REV_DATESTAMP)
+ AC_SUBST(REV_TIMESTAMP)
+@@ -950,14 +952,14 @@
+        fi
+ 
+ elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
+-       $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
++       $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+@@ -965,52 +967,52 @@
+   ac_cv_ping_has_timeout=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
++elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n %s -c %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
++elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING %s -n %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
++elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
++elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
+        ac_cv_ping_packets_first=yes
+        AC_MSG_RESULT([$with_ping_command])
+ 
+-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
+        egrep -i "^round-trip|^rtt" >/dev/null
+ then
+        with_ping_command="$PATH_TO_PING -n -c %d %s"
+@@ -1221,7 +1223,7 @@
+        if test -n "$PATH_TO_NSLOOKUP"
+        then
+                AC_MSG_CHECKING(for nslookup syntax)
+-               if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
++               if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null
+                then
+                        ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
+                        AC_MSG_RESULT([$ac_cv_nslookup_command])
diff --git a/web/attachments/450268-nagios-plugins.patch b/web/attachments/450268-nagios-plugins.patch
new file mode 100644
index 0000000..f70b810
--- /dev/null
+++ b/web/attachments/450268-nagios-plugins.patch
@@ -0,0 +1,53 @@
+diff -r ./config.h nagios-plugins/config.h
+1539,1541d1538
+< /* path and args for ICMP ping command with defined source */
+< #define PING_COMMAND_SOURCE "/sbin/ping -S %s -n -c %d %s"
+< 
+Только в .: nagios-plugins
+Только в .: nagios-plugins.patch
+diff -r ./plugins/check_ping.c nagios-plugins/plugins/check_ping.c
+39d38
+< #include "arpa/inet.h"
+63d61
+< char *source = NULL;
+73a72,73
+> 
+> 
+90a91
+>       /* Parse extra opts if any */
+115,118c116
+<                       if (source == NULL)
+<                               rawcmd = strdup(PING_COMMAND);
+<                       else
+<                               rawcmd = strdup(PING_COMMAND_SOURCE);
+---
+>                       rawcmd = strdup(PING_COMMAND);
+120c118
+<               rawcmd = strdup(PING_COMMAND_SOURCE);
+---
+>               rawcmd = strdup(PING_COMMAND);
+128c126
+<               asprintf (&cmd, rawcmd, source, max_packets, addresses[i]);
+---
+>               asprintf (&cmd, rawcmd, max_packets, addresses[i]);
+205d202
+<               {"source", optional_argument, 0, 'S'},
+220c217
+<               c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:S:", longopts, &option);
+---
+>               c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
+271,278d267
+<               case 'S':       /* source address */
+<                       ptr = optarg;
+<                       source = ptr;
+<                       struct sockaddr_in sa;
+<                       char str[INET_ADDRSTRLEN];
+<                       if (inet_pton(AF_INET, source, &(sa.sin_addr)) != 0)
+<                               die (STATE_UNKNOWN, _("Bad local source\n"));
+<                       break;
+580d568
+<       printf (" %s\n", "-S, --source=IP");
+612c600
+<       printf ("%s -S <source_address> -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
+---
+>       printf ("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
diff --git a/web/attachments/450269-nagios-plugins-1.4.15-snmp_conf.patch b/web/attachments/450269-nagios-plugins-1.4.15-snmp_conf.patch
new file mode 100644
index 0000000..7d5689b
--- /dev/null
+++ b/web/attachments/450269-nagios-plugins-1.4.15-snmp_conf.patch
@@ -0,0 +1,205 @@
+--- nagios-plugins-1.4.15/plugins/check_snmp.c.conf     2011-07-22 09:23:17.000000000 -0400
++++ nagios-plugins-1.4.15/plugins/check_snmp.c  2011-07-26 15:41:43.000000000 -0400
+@@ -259,26 +259,29 @@
+        asprintf (&command_line[4], "%d", retries);
+        command_line[5] = strdup ("-m");
+        command_line[6] = strdup (miblist);
+-       command_line[7] = "-v";
+-       command_line[8] = strdup (proto);
+ 
+        for (i = 0; i < numauthpriv; i++) {
+-               command_line[9 + i] = authpriv[i];
++               command_line[7 + i] = authpriv[i];
+        }
+ 
+-       asprintf (&command_line[9 + numauthpriv], "%s:%s", server_address, port);
++       asprintf (&command_line[7 + numauthpriv], "%s:%s", server_address, port);
+ 
+        /* This is just for display purposes, so it can remain a string */
+-       asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
+-               snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
+-               server_address, port);
++       if (proto != NULL)
++               asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
++                       snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
++                       server_address, port);
++       else
++               asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s %s %s:%s",
++                       snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", "[authpriv]",
++                       server_address, port);
+ 
+        for (i = 0; i < numoids; i++) {
+-               command_line[9 + numauthpriv + 1 + i] = oids[i];
++               command_line[7 + numauthpriv + 1 + i] = oids[i];
+                asprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);    
+        }
+ 
+-       command_line[9 + numauthpriv + 1 + numoids] = NULL;
++       command_line[7 + numauthpriv + 1 + numoids] = NULL;
+ 
+        if (verbose)
+                printf ("%s\n", cl_hidden_auth);
+@@ -835,9 +838,36 @@
+ 
+ 
+ 
++void addParam(char *flag, char*val) {
++       // We are lazy. Verify if the value is null and, if not, add it
++       if (flag != NULL && val != NULL) {
++               // Raise the amount of space required for our array
++               numauthpriv+=2;
++
++               if (authpriv == NULL)
++                       authpriv = calloc(numauthpriv, sizeof(char *));
++               else
++                       authpriv = realloc(authpriv, numauthpriv * sizeof(char *));
++       
++               authpriv[numauthpriv-2] = strdup(flag);
++               authpriv[numauthpriv-1] = strdup(val);
++       }
++}
++
++/*
++Protocol                               Security                        Params                                                                                          Reason
++NULL                                           NULL                                    -c,-a,-u,-A,-x,-X                                                       We don't know what the user wants. We overwrite anything provided.
++1                                                              *                                                       -v,-c                                                                                                   SNMP v1 supports only community
++2c                                                     *                                                       -v,-c                                                                                                   SNMP v2c supports only community
++3                                                              NULL                                    -v,-u,-a,-A,-x,-X                                                       We don't know the security required in snmp.conf. We provide anything
++3                                                              authPriv                        -v,-l,-u,-a,-A,-x,-X                                    We overwrite any Authentication of privacy setting of snmp.conf by command line
++3                                                              noAuthNoPriv    -v,-l,-u                                                                                        We provide version, security level and security name
++3                                                              authNoPriv              -v,-l,-u,-a,-A                                                          We provide version, security level, security name and password
++*/
+ int
+ validate_arguments ()
+ {
++       numauthpriv=0;
+        /* check whether to load locally installed MIBS (CPU/disk intensive) */
+        if (miblist == NULL) {
+                if ( needmibs == TRUE ) {
+@@ -855,75 +885,38 @@
+        if (numoids == 0)
+                die(STATE_UNKNOWN, _("No OIDs specified\n"));
+ 
+-       if (proto == NULL)
+-               asprintf(&proto, DEFAULT_PROTOCOL);
+ 
+-       if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {     /* snmpv1 or snmpv2c */
+-               numauthpriv = 2;
+-               authpriv = calloc (numauthpriv, sizeof (char *));
+-               authpriv[0] = strdup ("-c");
+-               authpriv[1] = strdup (community);
+-       }
+-       else if ( strcmp (proto, "3") == 0 ) {          /* snmpv3 args */
+-               if (seclevel == NULL)
+-                       asprintf(&seclevel, "noAuthNoPriv");
+-
+-               if (strcmp(seclevel, "noAuthNoPriv") == 0) {
+-                       numauthpriv = 2;
+-                       authpriv = calloc (numauthpriv, sizeof (char *));
+-                       authpriv[0] = strdup ("-l");
+-                       authpriv[1] = strdup ("noAuthNoPriv");
++       if (proto == NULL || strcmp (proto, "3") == 0) {
++               // No protocol will pass any valid parameter. See note before function for more explanation
++               if (proto == NULL) {
++                               addParam("-c",community);
+                } else {
+-                       if (! ( (strcmp(seclevel, "authNoPriv")==0) || (strcmp(seclevel, "authPriv")==0) ) ) {
+-                               usage2 (_("Invalid seclevel"), seclevel);
+-                       }
+-
+-                       if (authproto == NULL )
+-                               asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
+-
+-                       if (secname == NULL)
+-                               die(STATE_UNKNOWN, _("Required parameter: %s\n"), "secname");
+-
+-                       if (authpasswd == NULL)
+-                               die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd");
+-
+-                       if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+-                               numauthpriv = 8;
+-                               authpriv = calloc (numauthpriv, sizeof (char *));
+-                               authpriv[0] = strdup ("-l");
+-                               authpriv[1] = strdup ("authNoPriv");
+-                               authpriv[2] = strdup ("-a");
+-                               authpriv[3] = strdup (authproto);
+-                               authpriv[4] = strdup ("-u");
+-                               authpriv[5] = strdup (secname);
+-                               authpriv[6] = strdup ("-A");
+-                               authpriv[7] = strdup (authpasswd);
+-                       } else if ( strcmp(seclevel, "authPriv") == 0 ) {
+-                               if (privproto == NULL )
+-                                       asprintf(&privproto, DEFAULT_PRIV_PROTOCOL);
+-
+-                               if (privpasswd == NULL)
+-                                       die(STATE_UNKNOWN, _("Required parameter: %s\n"), "privpasswd");
+-
+-                               numauthpriv = 12;
+-                               authpriv = calloc (numauthpriv, sizeof (char *));
+-                               authpriv[0] = strdup ("-l");
+-                               authpriv[1] = strdup ("authPriv");
+-                               authpriv[2] = strdup ("-a");
+-                               authpriv[3] = strdup (authproto);
+-                               authpriv[4] = strdup ("-u");
+-                               authpriv[5] = strdup (secname);
+-                               authpriv[6] = strdup ("-A");
+-                               authpriv[7] = strdup (authpasswd);
+-                               authpriv[8] = strdup ("-x");
+-                               authpriv[9] = strdup (privproto);
+-                               authpriv[10] = strdup ("-X");
+-                               authpriv[11] = strdup (privpasswd);
+-                       }
++                               addParam("-v",proto);
+                }
++               addParam("-u",secname);
+ 
+-       }
+-       else {
++               if (seclevel == NULL || strcmp(seclevel, "authPriv")==0) {
++                               addParam("-l",seclevel);
++                               addParam("-a",authproto);
++                               addParam("-A",authpasswd);
++                               addParam("-x",privproto);
++                               addParam("-X",privpasswd);
++               } else if (strcmp(seclevel, "noAuthNoPriv") == 0) {
++                               addParam("-v",proto);
++                               addParam("-l",seclevel);
++               } else if (strcmp(seclevel, "authNoPriv")==0) {
++                               addParam("-v",proto);
++                               addParam("-l",seclevel);
++                               addParam("-a",authproto);
++                               addParam("-A",authpasswd);
++               } else {
++                               usage2 (_("Invalid seclevel"), seclevel);
++               }
++       } else if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {      /* snmpv1 or snmpv2c */
++               // If we specified protocol v2, the only param that is usefull is community string (if specified).
++               addParam("-v",proto);
++               addParam("-c",community);
++       }       else {
+                usage2 (_("Invalid SNMP version"), proto);
+        }
+ 
+@@ -1011,12 +1004,11 @@
+        printf (" %s\n", "-a, --authproto=[MD5|SHA]");
+        printf ("    %s\n", _("SNMPv3 auth proto"));
+        printf (" %s\n", "-x, --privproto=[DES|AES]");
+-       printf ("    %s\n", _("SNMPv3 priv proto (default DES)"));
++       printf ("    %s\n", _("SNMPv3 priv proto"));
+ 
+        /* Authentication Tokens*/
+        printf (" %s\n", "-C, --community=STRING");
+        printf ("    %s ", _("Optional community string for SNMP communication"));
+-       printf ("(%s \"%s\")\n", _("default is") ,DEFAULT_COMMUNITY);
+        printf (" %s\n", "-U, --secname=USERNAME");
+        printf ("    %s\n", _("SNMPv3 username"));
+        printf (" %s\n", "-A, --authpassword=PASSWORD");
+@@ -1076,6 +1068,8 @@
+ 
+        printf ("\n");
+        printf ("%s\n", _("Notes:"));
++       printf (" %s\n", _("- Default configurations are retrieved from /etc/snmp/snmp.conf. See man page of"));
++       printf ("   %s\n", _("snmp.conf for more information."));
+        printf (" %s\n", _("- Multiple OIDs may be indicated by a comma or space-delimited list (lists with"));
+        printf ("   %s %i %s\n", _("internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
+ 
diff --git a/web/attachments/450270-nagios-plugins-1.4.15-snmp_conf_final.patch b/web/attachments/450270-nagios-plugins-1.4.15-snmp_conf_final.patch
new file mode 100644
index 0000000..a1bb976
--- /dev/null
+++ b/web/attachments/450270-nagios-plugins-1.4.15-snmp_conf_final.patch
@@ -0,0 +1,217 @@
+# This patch remove the SNMP configuration verification and allow using null parameters.
+# This allows the user to configure SNMP in /etc/snmp/snmp.conf and not use the command line
+--- nagios-plugins-1.4.15/plugins/check_snmp.c.conf     2011-07-22 09:23:17.000000000 -0400
++++ nagios-plugins-1.4.15/plugins/check_snmp.c  2011-07-26 16:47:28.000000000 -0400
+@@ -259,26 +259,29 @@
+        asprintf (&command_line[4], "%d", retries);
+        command_line[5] = strdup ("-m");
+        command_line[6] = strdup (miblist);
+-       command_line[7] = "-v";
+-       command_line[8] = strdup (proto);
+ 
+        for (i = 0; i < numauthpriv; i++) {
+-               command_line[9 + i] = authpriv[i];
++               command_line[7 + i] = authpriv[i];
+        }
+ 
+-       asprintf (&command_line[9 + numauthpriv], "%s:%s", server_address, port);
++       asprintf (&command_line[7 + numauthpriv], "%s:%s", server_address, port);
+ 
+        /* This is just for display purposes, so it can remain a string */
+-       asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
+-               snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
+-               server_address, port);
++       if (proto != NULL)
++               asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
++                       snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
++                       server_address, port);
++       else
++               asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s %s %s:%s",
++                       snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", "[authpriv]",
++                       server_address, port);
+ 
+        for (i = 0; i < numoids; i++) {
+-               command_line[9 + numauthpriv + 1 + i] = oids[i];
++               command_line[7 + numauthpriv + 1 + i] = oids[i];
+                asprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);    
+        }
+ 
+-       command_line[9 + numauthpriv + 1 + numoids] = NULL;
++       command_line[7 + numauthpriv + 1 + numoids] = NULL;
+ 
+        if (verbose)
+                printf ("%s\n", cl_hidden_auth);
+@@ -808,9 +811,6 @@
+        if (server_address == NULL)
+                server_address = argv[optind];
+ 
+-       if (community == NULL)
+-               community = strdup (DEFAULT_COMMUNITY);
+-
+        return validate_arguments ();
+ }
+ 
+@@ -835,9 +835,36 @@
+ 
+ 
+ 
++void addParam(char *flag, char*val) {
++       // We are lazy. Verify if the value is null and, if not, add it
++       if (flag != NULL && val != NULL) {
++               // Raise the amount of space required for our array
++               numauthpriv+=2;
++
++               if (authpriv == NULL)
++                       authpriv = calloc(numauthpriv, sizeof(char *));
++               else
++                       authpriv = realloc(authpriv, numauthpriv * sizeof(char *));
++       
++               authpriv[numauthpriv-2] = strdup(flag);
++               authpriv[numauthpriv-1] = strdup(val);
++       }
++}
++
++/*
++Protocol                               Security                        Params                                                                                          Reason
++NULL                                           NULL                                    -c,-a,-u,-A,-x,-X                                                       We don't know what the user wants. We overwrite anything provided.
++1                                                              *                                                       -v,-c                                                                                                   SNMP v1 supports only community
++2c                                                     *                                                       -v,-c                                                                                                   SNMP v2c supports only community
++3                                                              NULL                                    -v,-u,-a,-A,-x,-X                                                       We don't know the security required in snmp.conf. We provide anything
++3                                                              authPriv                        -v,-l,-u,-a,-A,-x,-X                                    We overwrite any Authentication of privacy setting of snmp.conf by command line
++3                                                              noAuthNoPriv    -v,-l,-u                                                                                        We provide version, security level and security name
++3                                                              authNoPriv              -v,-l,-u,-a,-A                                                          We provide version, security level, security name and password
++*/
+ int
+ validate_arguments ()
+ {
++       numauthpriv=0;
+        /* check whether to load locally installed MIBS (CPU/disk intensive) */
+        if (miblist == NULL) {
+                if ( needmibs == TRUE ) {
+@@ -855,75 +882,38 @@
+        if (numoids == 0)
+                die(STATE_UNKNOWN, _("No OIDs specified\n"));
+ 
+-       if (proto == NULL)
+-               asprintf(&proto, DEFAULT_PROTOCOL);
+ 
+-       if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {     /* snmpv1 or snmpv2c */
+-               numauthpriv = 2;
+-               authpriv = calloc (numauthpriv, sizeof (char *));
+-               authpriv[0] = strdup ("-c");
+-               authpriv[1] = strdup (community);
+-       }
+-       else if ( strcmp (proto, "3") == 0 ) {          /* snmpv3 args */
+-               if (seclevel == NULL)
+-                       asprintf(&seclevel, "noAuthNoPriv");
+-
+-               if (strcmp(seclevel, "noAuthNoPriv") == 0) {
+-                       numauthpriv = 2;
+-                       authpriv = calloc (numauthpriv, sizeof (char *));
+-                       authpriv[0] = strdup ("-l");
+-                       authpriv[1] = strdup ("noAuthNoPriv");
++       if (proto == NULL || strcmp (proto, "3") == 0) {
++               // No protocol will pass any valid parameter. See note before function for more explanation
++               if (proto == NULL) {
++                               addParam("-c",community);
+                } else {
+-                       if (! ( (strcmp(seclevel, "authNoPriv")==0) || (strcmp(seclevel, "authPriv")==0) ) ) {
+-                               usage2 (_("Invalid seclevel"), seclevel);
+-                       }
+-
+-                       if (authproto == NULL )
+-                               asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
+-
+-                       if (secname == NULL)
+-                               die(STATE_UNKNOWN, _("Required parameter: %s\n"), "secname");
+-
+-                       if (authpasswd == NULL)
+-                               die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd");
+-
+-                       if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+-                               numauthpriv = 8;
+-                               authpriv = calloc (numauthpriv, sizeof (char *));
+-                               authpriv[0] = strdup ("-l");
+-                               authpriv[1] = strdup ("authNoPriv");
+-                               authpriv[2] = strdup ("-a");
+-                               authpriv[3] = strdup (authproto);
+-                               authpriv[4] = strdup ("-u");
+-                               authpriv[5] = strdup (secname);
+-                               authpriv[6] = strdup ("-A");
+-                               authpriv[7] = strdup (authpasswd);
+-                       } else if ( strcmp(seclevel, "authPriv") == 0 ) {
+-                               if (privproto == NULL )
+-                                       asprintf(&privproto, DEFAULT_PRIV_PROTOCOL);
+-
+-                               if (privpasswd == NULL)
+-                                       die(STATE_UNKNOWN, _("Required parameter: %s\n"), "privpasswd");
+-
+-                               numauthpriv = 12;
+-                               authpriv = calloc (numauthpriv, sizeof (char *));
+-                               authpriv[0] = strdup ("-l");
+-                               authpriv[1] = strdup ("authPriv");
+-                               authpriv[2] = strdup ("-a");
+-                               authpriv[3] = strdup (authproto);
+-                               authpriv[4] = strdup ("-u");
+-                               authpriv[5] = strdup (secname);
+-                               authpriv[6] = strdup ("-A");
+-                               authpriv[7] = strdup (authpasswd);
+-                               authpriv[8] = strdup ("-x");
+-                               authpriv[9] = strdup (privproto);
+-                               authpriv[10] = strdup ("-X");
+-                               authpriv[11] = strdup (privpasswd);
+-                       }
++                               addParam("-v",proto);
+                }
++               addParam("-u",secname);
+ 
+-       }
+-       else {
++               if (seclevel == NULL || strcmp(seclevel, "authPriv")==0) {
++                               addParam("-l",seclevel);
++                               addParam("-a",authproto);
++                               addParam("-A",authpasswd);
++                               addParam("-x",privproto);
++                               addParam("-X",privpasswd);
++               } else if (strcmp(seclevel, "noAuthNoPriv") == 0) {
++                               addParam("-v",proto);
++                               addParam("-l",seclevel);
++               } else if (strcmp(seclevel, "authNoPriv")==0) {
++                               addParam("-v",proto);
++                               addParam("-l",seclevel);
++                               addParam("-a",authproto);
++                               addParam("-A",authpasswd);
++               } else {
++                               usage2 (_("Invalid seclevel"), seclevel);
++               }
++       } else if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {      /* snmpv1 or snmpv2c */
++               // If we specified protocol v2, the only param that is usefull is community string (if specified).
++               addParam("-v",proto);
++               addParam("-c",community);
++       }       else {
+                usage2 (_("Invalid SNMP version"), proto);
+        }
+ 
+@@ -1011,12 +1001,11 @@
+        printf (" %s\n", "-a, --authproto=[MD5|SHA]");
+        printf ("    %s\n", _("SNMPv3 auth proto"));
+        printf (" %s\n", "-x, --privproto=[DES|AES]");
+-       printf ("    %s\n", _("SNMPv3 priv proto (default DES)"));
++       printf ("    %s\n", _("SNMPv3 priv proto"));
+ 
+        /* Authentication Tokens*/
+        printf (" %s\n", "-C, --community=STRING");
+        printf ("    %s ", _("Optional community string for SNMP communication"));
+-       printf ("(%s \"%s\")\n", _("default is") ,DEFAULT_COMMUNITY);
+        printf (" %s\n", "-U, --secname=USERNAME");
+        printf ("    %s\n", _("SNMPv3 username"));
+        printf (" %s\n", "-A, --authpassword=PASSWORD");
+@@ -1076,6 +1065,8 @@
+ 
+        printf ("\n");
+        printf ("%s\n", _("Notes:"));
++       printf (" %s\n", _("- Default configurations are retrieved from /etc/snmp/snmp.conf. See man page of"));
++       printf ("   %s\n", _("snmp.conf for more information."));
+        printf (" %s\n", _("- Multiple OIDs may be indicated by a comma or space-delimited list (lists with"));
+        printf ("   %s %i %s\n", _("internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
+ 
diff --git a/web/attachments/450271-check_http.c.patch b/web/attachments/450271-check_http.c.patch
new file mode 100644
index 0000000..aa0fd6d
--- /dev/null
+++ b/web/attachments/450271-check_http.c.patch
@@ -0,0 +1,48 @@
+--- check_http.c.orig   2010-07-27 16:47:16.000000000 -0400
++++ check_http.c        2011-04-05 12:02:56.000000000 -0400
+@@ -94,6 +94,7 @@
+ char server_type[6] = "http";
+ char *server_address;
+ char *host_name;
++char *host_header;
+ char *server_url;
+ char *user_agent;
+ int server_url_length;
+@@ -346,6 +347,13 @@
+     case 'u': /* URL path */
+       server_url = strdup (optarg);
+       server_url_length = strlen (server_url);
++      // Also set HTTP host header
++      char delim[] = "/";
++      if (!strncmp(optarg, "http://", 7) ) {
++          host_header=strdup(strtok(optarg+7, delim));
++      } else if (!strncmp(optarg, "https://", 8) ) {
++          host_header=strdup(strtok(optarg+8, delim));
++      }
+       break;
+     case 'p': /* Server port */
+       if (!is_intnonneg (optarg))
+@@ -823,7 +831,10 @@
+   asprintf (&buf, "%sConnection: close\r\n", buf);
+ 
+   /* optionally send the host header info */
+-  if (host_name) {
++  if (!host_header) {
++      host_header=strdup(host_name);
++  }
++  if (host_header) {
+     /*
+      * Specify the port only if we're using a non-default port (see RFC 2616,
+      * 14.23).  Some server applications/configurations cause trouble if the
+@@ -831,9 +842,9 @@
+      */
+     if ((use_ssl == FALSE && server_port == HTTP_PORT) ||
+         (use_ssl == TRUE && server_port == HTTPS_PORT))
+-      asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
++      asprintf (&buf, "%sHost: %s\r\n", buf, host_header);
+     else
+-      asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port);
++      asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_header, server_port);
+   }
+ 
+   /* optionally send any other header tag */
diff --git a/web/attachments/450273-nagios-jabbers2s.patch b/web/attachments/450273-nagios-jabbers2s.patch
new file mode 100644
index 0000000..b0ec71f
--- /dev/null
+++ b/web/attachments/450273-nagios-jabbers2s.patch
@@ -0,0 +1,16 @@
+--- check_tcp.c.orig    2010-07-18 02:21:29.000000000 +0200
++++ check_tcp.c 2010-07-18 02:22:35.000000000 +0200
+@@ -169,6 +169,13 @@
+                flags |= FLAG_HIDE_OUTPUT;
+                PORT = 5222;
+        }
++       else if (!strncmp(SERVICE, "JABBERS2S", 9)) {
++               SEND = "<stream:stream to=\'host\' xmlns=\'jabber:server\' xmlns:stream=\'http://etherx.jabber.org/streams\' version=\'1.0\'>\n";
++               EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\' xmlns=\'jabber:server\'";
++               QUIT = "</stream:stream>\n";
++               flags |= FLAG_HIDE_OUTPUT;
++               PORT = 5269;
++       }
+        else if (!strncmp (SERVICE, "NNTPS", 5)) {
+                server_expect_count = 2;
+                server_expect[0] = "200";
diff --git a/web/attachments/453401-fsusage-config.patch b/web/attachments/453401-fsusage-config.patch
new file mode 100644
index 0000000..52d860a
--- /dev/null
+++ b/web/attachments/453401-fsusage-config.patch
@@ -0,0 +1,23 @@
+--- a/gl/m4/fsusage.m4  2012-09-19 10:30:40.000000000 +0200
++++ b/gl/m4/fsusage.m4  2012-09-19 10:31:22.000000000 +0200
+@@ -47,12 +47,14 @@
+   # SVR4
+   AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs],
+                 [AC_TRY_LINK([#include <sys/types.h>
+-#if defined __GLIBC__ && defined __linux__
+-Do not use statvfs on systems with GNU libc on Linux, because that function
+-stats all preceding entries in /proc/mounts, and that makes df hang if even
+-one of the corresponding file systems is hard-mounted, but not available.
+-statvfs in GNU libc on Hurd, BeOS, Haiku operates differently: it only makes
+-a system call.
++#ifndef __UCLIBC__
++  #if defined __GLIBC__ && defined __linux__
++  Do not use statvfs on systems with GNU libc on Linux, because that function
++  stats all preceding entries in /proc/mounts, and that makes df hang if even
++  one of the corresponding file systems is hard-mounted, but not available.
++  statvfs in GNU libc on Hurd, BeOS, Haiku operates differently: it only makes
++  a system call.
++  #endif
+ #endif
+ 
+ #ifdef __osf__
diff --git a/web/attachments/454482-check_ping.c b/web/attachments/454482-check_ping.c
new file mode 100644
index 0000000..6e0d2ed
--- /dev/null
+++ b/web/attachments/454482-check_ping.c
@@ -0,0 +1,622 @@
+/*****************************************************************************

+*

+* Nagios check_ping plugin

+*

+* License: GPL

+* Copyright (c) 2000-2007 Nagios Plugins Development Team

+*

+* Description:

+*

+* This file contains the check_ping plugin

+*

+* Use the ping program to check connection statistics for a remote host.

+*

+*

+* 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/>.

+*

+* Olli = additions from Oliver to specify the used Interface

+*

+*****************************************************************************/

+

+const char *progname = "check_ping";

+const char *copyright = "2000-2007";

+const char *email = "nagiosplug-devel@lists.sourceforge.net";

+

+#include "common.h"

+#include "netutils.h"

+#include "popen.h"

+#include "utils.h"

+

+#define WARN_DUPLICATES "DUPLICATES FOUND! "

+#define UNKNOWN_TRIP_TIME -1.0  /* -1 seconds */

+

+enum {

+        UNKNOWN_PACKET_LOSS = 200,    /* 200% */

+        DEFAULT_MAX_PACKETS = 5       /* default no. of ICMP ECHO packets */

+};

+

+int process_arguments (int, char **);

+int get_threshold (char *, float *, int *);

+int validate_arguments (void);

+int run_ping (const char *cmd, const char *addr);

+int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr);

+void print_usage (void);

+void print_help (void);

+

+int display_html = FALSE;

+int wpl = UNKNOWN_PACKET_LOSS;

+int cpl = UNKNOWN_PACKET_LOSS;

+float wrta = UNKNOWN_TRIP_TIME;

+float crta = UNKNOWN_TRIP_TIME;

+char **addresses = NULL;

+int n_addresses = 0;

+int max_addr = 1;

+int max_packets = -1;

+int verbose = 0;

+

+float rta = UNKNOWN_TRIP_TIME;

+int pl = UNKNOWN_PACKET_LOSS;

+

+char *warn_text;

+

+char *interface = "\0";  /*Olli*/

+char *r_command = NULL;  /*Olli*/

+

+int

+main (int argc, char **argv)

+{

+        char *cmd = NULL;

+        char *rawcmd = NULL;

+        int result = STATE_UNKNOWN;

+        int this_result = STATE_UNKNOWN;

+        int i;

+

+        setlocale (LC_ALL, "");

+        setlocale (LC_NUMERIC, "C");

+        bindtextdomain (PACKAGE, LOCALEDIR);

+        textdomain (PACKAGE);

+

+        addresses = malloc (sizeof(char*) * max_addr);

+        addresses[0] = NULL;

+

+        /* Parse extra opts if any */

+        argv=np_extra_opts (&argc, argv, progname);

+

+        if (process_arguments (argc, argv) == ERROR)

+                usage4 (_("Could not parse arguments"));

+

+        /* Set signal handling and alarm */

+        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {

+                usage4 (_("Cannot catch SIGALRM"));

+        }

+

+        /* If ./configure finds ping has timeout values, set plugin alarm slightly

+         * higher so that we can use response from command line ping */

+#if defined(PING_PACKETS_FIRST) && defined(PING_HAS_TIMEOUT)

+        alarm (timeout_interval + 1);

+#else

+        alarm (timeout_interval);

+#endif

+

+        for (i = 0 ; i < n_addresses ; i++) {

+

+#ifdef PING6_COMMAND

+                if (address_family != AF_INET && is_inet6_addr(addresses[i]))

+                        rawcmd = strdup(PING6_COMMAND);

+                else

+                        rawcmd = strdup(PING_COMMAND);

+#else

+                rawcmd = strdup(PING_COMMAND);

+#endif

+

+                /* does the host address of number of packets argument come first? */

+#ifdef PING_PACKETS_FIRST

+# ifdef PING_HAS_TIMEOUT

+                asprintf (&cmd, rawcmd, timeout_interval, max_packets, addresses[i]);

+# else

+                asprintf (&cmd, rawcmd, max_packets, addresses[i]);

+# endif

+#else

+                asprintf (&cmd, rawcmd, addresses[i], max_packets);

+#endif

+

+                if (verbose >= 2)

+                        printf ("CMD: %s\n", cmd);

+

+                /* run the command */

+

+                if ( strlen (interface) != 0) {

+                /*Olli*/

+                asprintf (&r_command,"%s -I %s", cmd, interface);

+                /*Olli*/

+                cmd = r_command;

+                /*Olli*/

+                }

+                /*Olli*/

+

+                this_result = run_ping (cmd, addresses[i]);

+

+                if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) {

+                        printf ("%s\n", cmd);

+                        die (STATE_UNKNOWN,

+                                   _("CRITICAL - Could not interpret output from ping command\n"));

+                }

+

+                if (pl >= cpl || rta >= crta || rta < 0)

+                        this_result = STATE_CRITICAL;

+                else if (pl >= wpl || rta >= wrta)

+                        this_result = STATE_WARNING;

+                else if (pl >= 0 && rta >= 0)

+                        this_result = max_state (STATE_OK, this_result);

+

+                if (n_addresses > 1 && this_result != STATE_UNKNOWN)

+                        die (STATE_OK, "%s is alive\n", addresses[i]);

+

+                if (display_html == TRUE)

+                        printf ("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, addresses[i]);

+                if (pl == 100)

+                        printf (_("PING %s - %sPacket loss = %d%%"), state_text (this_result), warn_text,

+                                                        pl);

+                else

+                        printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"),

+                                                        state_text (this_result), warn_text, pl, rta);

+                if (display_html == TRUE)

+                        printf ("</A>");

+

+                /* Print performance data */

+                printf("|%s", fperfdata ("rta", (double) rta, "ms",

+                                          wrta>0?TRUE:FALSE, wrta,

+                                          crta>0?TRUE:FALSE, crta,

+                                          TRUE, 0, FALSE, 0));

+                printf(" %s\n", perfdata ("pl", (long) pl, "%",

+                                          wpl>0?TRUE:FALSE, wpl,

+                                          cpl>0?TRUE:FALSE, cpl,

+                                          TRUE, 0, FALSE, 0));

+

+                if (verbose >= 2)

+                        printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);

+

+                result = max_state (result, this_result);

+                free (rawcmd);

+                free (cmd);

+        }

+

+        return result;

+}

+

+

+

+/* process command-line arguments */

+int

+process_arguments (int argc, char **argv)

+{

+        int c = 1;

+        char *ptr;

+

+        int option = 0;

+        static struct option longopts[] = {

+                STD_LONG_OPTS,

+                {"packets", required_argument, 0, 'p'},

+                {"nohtml", no_argument, 0, 'n'},

+                {"link", no_argument, 0, 'L'},

+                {"use-ipv4", no_argument, 0, '4'},

+                {"use-ipv6", no_argument, 0, '6'},

+                {"interface", required_argument, 0 ,'I'}, /*Olli*/

+                {0, 0, 0, 0}

+        };

+

+        if (argc < 2)

+                return ERROR;

+

+        for (c = 1; c < argc; c++) {

+                if (strcmp ("-to", argv[c]) == 0)

+                        strcpy (argv[c], "-t");

+                if (strcmp ("-nohtml", argv[c]) == 0)

+                        strcpy (argv[c], "-n");

+        }

+

+        while (1) {

+                c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:I:", longopts, &option); /*Olli*/

+

+                if (c == -1 || c == EOF)

+                        break;

+

+                switch (c) {

+                case '?':       /* usage */

+                        usage5 ();

+                case 'h':       /* help */

+                        print_help ();

+                        exit (STATE_OK);

+                        break;

+                case 'V':       /* version */

+                        print_revision (progname, NP_VERSION);

+                        exit (STATE_OK);

+                        break;

+                case 't':       /* timeout period */

+                        timeout_interval = atoi (optarg);

+                        break;

+                case 'v':       /* verbose mode */

+                        verbose++;

+                        break;

+                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 'H':       /* hostname */

+                        ptr=optarg;

+                        while (1) {

+                                n_addresses++;

+                                if (n_addresses > max_addr) {

+                                        max_addr *= 2;

+                                        addresses = realloc (addresses, sizeof(char*) * max_addr);

+                                        if (addresses == NULL)

+                                                die (STATE_UNKNOWN, _("Could not realloc() addresses\n"));

+                                }

+                                addresses[n_addresses-1] = ptr;

+                                if ((ptr = index (ptr, ','))) {

+                                        strcpy (ptr, "");

+                                        ptr += sizeof(char);

+                                } else {

+                                        break;

+                                }

+                        }

+                        break;

+                case 'p':       /* number of packets to send */

+                        if (is_intnonneg (optarg))

+                                max_packets = atoi (optarg);

+                        else

+                                usage2 (_("<max_packets> (%s) must be a non-negative number\n"), optarg);

+                        break;

+                case 'n':       /* no HTML */

+                        display_html = FALSE;

+                        break;

+                case 'L':       /* show HTML */

+                        display_html = TRUE;

+                        break;

+                case 'c':

+                        get_threshold (optarg, &crta, &cpl);

+                        break;

+                case 'w':

+                        get_threshold (optarg, &wrta, &wpl);

+                        break;

+                case 'I': /* Interface used for Ping*/ /*Olli*/

+                        interface = optarg; /*Olli*/

+                        break; /*Olli*/

+                }

+        }

+

+        c = optind;

+        if (c == argc)

+                return validate_arguments ();

+

+        if (addresses[0] == NULL) {

+                if (is_host (argv[c]) == FALSE) {

+                        usage2 (_("Invalid hostname/address"), argv[c]);

+                } else {

+                        addresses[0] = argv[c++];

+                        n_addresses++;

+                        if (c == argc)

+                                return validate_arguments ();

+                }

+        }

+

+        if (wpl == UNKNOWN_PACKET_LOSS) {

+                if (is_intpercent (argv[c]) == FALSE) {

+                        printf (_("<wpl> (%s) must be an integer percentage\n"), argv[c]);

+                        return ERROR;

+                } else {

+                        wpl = atoi (argv[c++]);

+                        if (c == argc)

+                                return validate_arguments ();

+                }

+        }

+

+        if (cpl == UNKNOWN_PACKET_LOSS) {

+                if (is_intpercent (argv[c]) == FALSE) {

+                        printf (_("<cpl> (%s) must be an integer percentage\n"), argv[c]);

+                        return ERROR;

+                } else {

+                        cpl = atoi (argv[c++]);

+                        if (c == argc)

+                                return validate_arguments ();

+                }

+        }

+

+        if (wrta < 0.0) {

+                if (is_negative (argv[c])) {

+                        printf (_("<wrta> (%s) must be a non-negative number\n"), argv[c]);

+                        return ERROR;

+                } else {

+                        wrta = atof (argv[c++]);

+                        if (c == argc)

+                                return validate_arguments ();

+                }

+        }

+

+        if (crta < 0.0) {

+                if (is_negative (argv[c])) {

+                        printf (_("<crta> (%s) must be a non-negative number\n"), argv[c]);

+                        return ERROR;

+                } else {

+                        crta = atof (argv[c++]);

+                        if (c == argc)

+                                return validate_arguments ();

+                }

+        }

+

+        if (max_packets == -1) {

+                if (is_intnonneg (argv[c])) {

+                        max_packets = atoi (argv[c++]);

+                } else {

+                        printf (_("<max_packets> (%s) must be a non-negative number\n"), argv[c]);

+                        return ERROR;

+                }

+        }

+

+        return validate_arguments ();

+}

+

+

+

+int

+get_threshold (char *arg, float *trta, int *tpl)

+{

+        if (is_intnonneg (arg) && sscanf (arg, "%f", trta) == 1)

+                return OK;

+        else if (strpbrk (arg, ",:") && strstr (arg, "%") && sscanf (arg, "%f%*[:,]%d%%", trta, tpl) == 2)

+                return OK;

+        else if (strstr (arg, "%") && sscanf (arg, "%d%%", tpl) == 1)

+                return OK;

+

+        usage2 (_("%s: Warning threshold must be integer or percentage!\n\n"), arg);

+        return STATE_UNKNOWN;

+}

+

+int

+validate_arguments ()

+{

+ float max_seconds;

+ int i;

+

+ if (wrta < 0.0) {

+  printf (_("<wrta> was not set\n"));

+  return ERROR;

+ }

+ else if (crta < 0.0) {

+  printf (_("<crta> was not set\n"));

+  return ERROR;

+ }

+ else if (wpl == UNKNOWN_PACKET_LOSS) {

+  printf (_("<wpl> was not set\n"));

+  return ERROR;

+ }

+ else if (cpl == UNKNOWN_PACKET_LOSS) {

+  printf (_("<cpl> was not set\n"));

+  return ERROR;

+ }

+ else if (wrta > crta) {

+  printf (_("<wrta> (%f) cannot be larger than <crta> (%f)\n"), wrta, crta);

+  return ERROR;

+ }

+ else if (wpl > cpl) {

+  printf (_("<wpl> (%d) cannot be larger than <cpl> (%d)\n"), wpl, cpl);

+  return ERROR;

+ }

+

+ if (max_packets == -1)

+  max_packets = DEFAULT_MAX_PACKETS;

+

+ max_seconds = crta / 1000.0 * max_packets + max_packets;

+ if (max_seconds > timeout_interval)

+  timeout_interval = (int)max_seconds;

+

+ for (i=0; i<n_addresses; i++) {

+  if (is_host(addresses[i]) == FALSE)

+   usage2 (_("Invalid hostname/address"), addresses[i]);

+ }

+

+ if (n_addresses == 0) {

+  usage (_("You must specify a server address or host name"));

+ }

+

+ return OK;

+}

+

+

+

+int

+run_ping (const char *cmd, const char *addr)

+{

+ char buf[MAX_INPUT_BUFFER];

+ int result = STATE_UNKNOWN;

+ int match;

+

+ if ((child_process = spopen (cmd)) == NULL)

+  die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);

+

+ child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");

+ if (child_stderr == NULL)

+  printf (_("Cannot open stderr for %s\n"), cmd);

+

+ while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {

+

+  if (verbose >= 3)

+   printf("Output: %s", buf);

+

+  result = max_state (result, error_scan (buf, addr));

+

+  /* get the percent loss statistics */

+  match = 0;

+  if((sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||

+    (sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match)

+    )

+   continue;

+

+  /* get the round trip average */

+  else

+   if((sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||

+     (sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n",&rta,&match) && match))

+   continue;

+ }

+

+ /* this is needed because there is no rta if all packets are lost */

+ if (pl == 100)

+  rta = crta;

+

+ /* check stderr, setting at least WARNING if there is output here */

+ /* Add warning into warn_text */

+ while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {

+  if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {

+   if (verbose >= 3) {

+    printf("Got stderr: %s", buf);

+   }

+   if ((result=error_scan(buf, addr)) == STATE_OK) {

+    result = STATE_WARNING;

+    if (warn_text == NULL) {

+     warn_text = strdup(_("System call sent warnings to stderr "));

+    } else {

+     asprintf(&warn_text, "%s %s", warn_text, _("System call sent warnings to stderr "));

+    }

+   }

+  }

+ }

+

+ (void) fclose (child_stderr);

+

+

+ spclose (child_process);

+

+ if (warn_text == NULL)

+  warn_text = strdup("");

+

+ return result;

+}

+

+

+

+int

+error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)

+{

+ if (strstr (buf, "Network is unreachable") ||

+  strstr (buf, "Destination Net Unreachable")

+  )

+  die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr);

+ else if (strstr (buf, "Destination Host Unreachable"))

+  die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr);

+ else if (strstr (buf, "Destination Port Unreachable"))

+  die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr);

+ else if (strstr (buf, "Destination Protocol Unreachable"))

+  die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr);

+ else if (strstr (buf, "Destination Net Prohibited"))

+  die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);

+ else if (strstr (buf, "Destination Host Prohibited"))

+  die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr);

+ else if (strstr (buf, "Packet filtered"))

+  die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);

+ else if (strstr (buf, "unknown host" ))

+  die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), addr);

+ else if (strstr (buf, "Time to live exceeded"))

+  die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr);

+ else if (strstr (buf, "Destination unreachable: "))

+  die (STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr);

+

+ if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {

+  if (warn_text == NULL)

+   warn_text = strdup (_(WARN_DUPLICATES));

+  else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&

+           asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)

+   die (STATE_UNKNOWN, _("Unable to realloc warn_text\n"));

+  return (STATE_WARNING);

+ }

+

+ return (STATE_OK);

+}

+

+

+

+void

+print_help (void)

+{

+ print_revision (progname, NP_VERSION);

+

+ printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");

+ printf (COPYRIGHT, copyright, email);

+

+ printf (_("Use ping to check connection statistics for a remote host."));

+

+  printf ("\n\n");

+

+ print_usage ();

+

+ printf (UT_HELP_VRSN);

+ printf (UT_EXTRA_OPTS);

+

+ printf (UT_IPv46);

+

+ printf (" %s\n", "-H, --hostname=HOST");

+  printf ("    %s\n", _("host to ping"));

+  printf (" %s\n", "-w, --warning=THRESHOLD");

+  printf ("    %s\n", _("warning threshold pair"));

+  printf (" %s\n", "-c, --critical=THRESHOLD");

+  printf ("    %s\n", _("critical threshold pair"));

+  printf (" %s\n", "-p, --packets=INTEGER");

+  printf ("    %s ", _("number of ICMP ECHO packets to send"));

+  printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);

+  printf (" %s\n", "-I, --interface=INTERFACE"); /*Olli*/

+  printf ("    %s ", _("Specify the interface which is used for pinging (Requires iputils-ping)")); /*Olli*/

+  printf (" %s\n", "-L, --link");

+  printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));

+

+ printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);

+

+  printf ("\n");

+ printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));

+  printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));

+  printf ("%s\n", _("percentage of packet loss to trigger an alarm state."));

+

+  printf ("\n");

+ printf ("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss"));

+  printf ("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output"));

+  printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));

+  printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));

+

+ printf (UT_SUPPORT);

+}

+

+void

+print_usage (void)

+{

+  printf ("%s\n", _("Usage:"));

+ printf ("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);

+  printf (" [-p packets] [-t timeout] [-4|-6] [-I interface] \n"); /*Olli*/

+}

diff --git a/web/attachments/456808-bug_check_snmp.JPG b/web/attachments/456808-bug_check_snmp.JPG
new file mode 100644
index 0000000..df04f7f
--- /dev/null
+++ b/web/attachments/456808-bug_check_snmp.JPG
diff --git a/web/attachments/456909-nagios-plugins-metadata.patch b/web/attachments/456909-nagios-plugins-metadata.patch
new file mode 100644
index 0000000..421a1fa
--- /dev/null
+++ b/web/attachments/456909-nagios-plugins-metadata.patch
@@ -0,0 +1,315 @@
+commit ba0449fe8534bdcc03d3a15e36c8af711a2a72d2
+Author: Dejan Muhamedagic <dejan@suse.de>
+Date:   Thu Nov 22 15:47:27 2012 +0100
+
+    Support for meta-data (XML)
+    
+    Enables nagios plugins to be deployed as resource agents with
+    pacemaker clusters. The meta-data is defined here:
+    
+    https://github.com/ClusterLabs/resource-agents/blob/master/heartbeat/ra-api-1.dtd
+    
+    This commit does not change behaviour of any plugins.
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 0eb0255..0ef8d50 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -39,12 +39,12 @@ 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 \
+-       popen.h common.h runcmd.c runcmd.h
++EXTRA_DIST = t tests utils.c netutils.c sslutils.c popen.c help.c \
++       utils.h netutils.h popen.h common.h runcmd.c runcmd.h help.h
+ 
+ PLUGINHDRS = common.h
+ 
+-BASEOBJS = utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
++BASEOBJS = utils.o help.o ../lib/libnagiosplug.a ../gl/libgnu.a
+ NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
+ SSLOBJS = sslutils.o
+ NETLIBS = $(NETOBJS) $(SOCKETLIBS)
+@@ -159,6 +159,8 @@ runcmd.o: runcmd.c runcmd.h $(PLUGINHDRS)
+ 
+ utils.o: utils.c utils.h $(PLUGINHDRS)
+ 
++help.o: help.c help.h
++
+ netutils.o: netutils.c netutils.h $(PLUGINHDRS)
+ sslutils.o: sslutils.c netutils.h $(PLUGINHDRS)
+ 
+diff --git a/plugins/help.c b/plugins/help.c
+new file mode 100644
+index 0000000..214707e
+--- /dev/null
++++ b/plugins/help.c
+@@ -0,0 +1,140 @@
++/*
++ * help.c: custom help functions to print help text and XML
++ * meta-data
++ *
++ * Copyright (C) 2012 Dejan Muhamedagic <dejan@hello-penguin.com>
++ *
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ * 
++ * This library 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
++ * Lesser General Public License for more details.
++ * 
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "common.h"
++#include "help.h"
++
++static void meta_long_desc_from_short(const char *, const char *);
++static void meta_long_desc(const char *, const char *);
++static void meta_short_desc(const char *, const char *);
++static void meta_param(const char *, struct parameter_help *);
++static void indent(const char *, const char *);
++
++static void
++meta_long_desc_from_short(const char *lang, const char *s)
++{
++       printf(XML_LONGDESC_BEGIN, lang);
++       printf("%s\n", _(s));
++       printf(XML_LONGDESC_END);
++}
++
++static void
++meta_long_desc(const char *lang, const char *s)
++{
++       printf(XML_LONGDESC_BEGIN, lang);
++       printf("%s", _(s));
++       printf(XML_LONGDESC_END);
++}
++
++static void
++meta_short_desc(const char *lang, const char *s)
++{
++       printf(XML_SHORTDESC_BEGIN, lang);
++       printf("%s", _(s));
++       printf(XML_SHORTDESC_END);
++}
++
++static void
++meta_param(const char *lang, struct parameter_help *ph)
++{
++       printf(XML_PARAMETER_BEGIN, ph->name, ph->unique, ph->required);
++       if (ph->long_desc) {
++               meta_long_desc(lang, ph->long_desc);
++       } else {
++               meta_long_desc_from_short(lang, ph->short_desc);
++       }
++       meta_short_desc(lang, ph->short_desc);
++       printf(XML_PARAMETER_CONTENT, ph->type, ph->dflt_value);
++       printf(XML_PARAMETER_END);
++}
++
++void
++print_meta_data(struct help_head *hh, struct parameter_help *ph)
++{
++       struct parameter_help *p;
++
++       printf(XML_START, hh->name);
++       if (hh->long_desc) {
++               meta_long_desc(LANG, hh->long_desc);
++       } else {
++               meta_long_desc_from_short(LANG, hh->short_desc);
++       }
++       meta_short_desc(LANG, hh->short_desc);
++       printf("\n");
++       printf(XML_PARAMETERS_BEGIN);
++       printf("\n");
++       for (p = ph; p->short_desc; p++) {
++               meta_param(LANG, p);
++               printf("\n");
++       }
++       printf(XML_PARAMETERS_END);
++       printf("\n");
++       printf(XML_ACTIONS);
++       printf("\n");
++       printf(XML_END);
++}
++
++static void
++indent(const char *s, const char *tab)
++{
++       const char *p, *q;
++       int len;
++
++       if (!s )
++               return;
++       for (p = s; p < s+strlen(s) && *p; p = q+1) {
++               q = strchr(p, '\n');
++               if( q ) {
++                       printf("%s%.*s", tab, q-p+1, p);
++               } else {
++                       printf("%s%s\n", tab, p);
++               }
++       }
++}
++
++void
++print_help_head(struct help_head *hh)
++{
++       if (hh->long_desc) {
++               printf(_(hh->long_desc));
++       } else {
++               printf("%s\n", _(hh->short_desc));
++       }
++}
++
++void
++print_parameters_help(struct parameter_help *ph)
++{
++       struct parameter_help *p;
++
++       for (p = ph; p->short_desc; p++) {
++               if (p->short_opt) {
++                       printf(" -%c, --%s=%s\n", (unsigned char)(p->short_opt),
++                               p->name, p->value_desc);
++               } else {
++                       printf(" --%s=%s\n", p->name, p->value_desc);
++               }
++               indent(_(p->long_desc), "    ");
++               printf(UT_METADATA);
++       }
++}
+diff --git a/plugins/help.h b/plugins/help.h
+new file mode 100644
+index 0000000..4486424
+--- /dev/null
++++ b/plugins/help.h
+@@ -0,0 +1,108 @@
++/*
++ * help.h: custom help functions to print help text and XML
++ * meta-data
++ *
++ * Copyright (C) 2012 Dejan Muhamedagic <dejan@hello-penguin.com>
++ *
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ * 
++ * This library 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
++ * Lesser General Public License for more details.
++ * 
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef NP_HELP_H
++#define NP_HELP_H
++/* Header file for nagios plugins help.c */
++
++/* This file should be included in all plugins */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <getopt.h>
++
++/*
++ * The generic constants for XML
++ */
++
++#define XML_START \
++       "<?xml version=\"1.0\"?>\n" \
++       "<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n" \
++       "<resource-agent name=\"%s\">\n" \
++       "<version>1.0</version>\n\n"
++#define XML_ACTIONS \
++       "<actions>\n" \
++       "<action name=\"start\"   timeout=\"20\" />\n" \
++       "<action name=\"stop\"    timeout=\"15\" />\n" \
++       "<action name=\"status\"  timeout=\"20\" />\n" \
++       "<action name=\"monitor\" timeout=\"20\" interval=\"60\" />\n" \
++       "<action name=\"meta-data\"  timeout=\"15\" />\n" \
++       "</actions>\n"
++#define XML_END \
++       "</resource-agent>\n"
++
++/* <parameters>?</parameters> */
++#define XML_PARAMETERS_BEGIN "<parameters>\n"
++#define XML_PARAMETERS_END "</parameters>\n"
++
++/* <parameter name="ipaddr" required="1" unique="1">
++   <content type="string" default="value"/>
++   ?
++   </parameter>
++ */
++#define XML_PARAMETER_BEGIN \
++       "<parameter name=\"%s\" unique=\"%d\" required=\"%d\">\n"
++#define XML_PARAMETER_CONTENT \
++       "<content type=\"%s\" default=\"%s\" />\n"
++#define XML_PARAMETER_END "</parameter>\n"
++
++/* <shortdesc lang="en">?</shortdesc> */
++#define XML_SHORTDESC_BEGIN \
++       "<shortdesc lang=\"%s\">"
++#define XML_SHORTDESC_END "</shortdesc>\n"
++
++/* <longdesc lang="en">?</longdesc> */
++#define XML_LONGDESC_BEGIN \
++       "<longdesc lang=\"%s\">\n"
++#define XML_LONGDESC_END "</longdesc>\n"
++
++#define LANG "en"
++
++#define UT_METADATA _("\
++ --metadata\n\
++    Print resource agent meta-data.\n")
++
++struct parameter_help {
++       const char *name;
++       int short_opt;
++       const char *short_desc;
++       int unique;
++       int required;
++       const char *type;
++       const char *dflt_value;
++       const char *value_desc;
++       const char *long_desc;
++};
++
++struct help_head {
++       const char *name;
++       const char *short_desc;
++       const char *long_desc;
++};
++
++void print_meta_data(struct help_head *, struct parameter_help *);
++void print_parameters_help(struct parameter_help *);
++void print_help_head(struct help_head *);
++
++#endif /* NP_HELP_H */
+diff --git a/plugins/utils.h b/plugins/utils.h
+index 822be94..f0d0e50 100644
+--- a/plugins/utils.h
++++ b/plugins/utils.h
+@@ -24,6 +24,8 @@ suite of plugins. */
+ #define np_extra_opts(acptr,av,pr) av
+ #endif
+ 
++#include "help.h"
++
+ /* Standardize version information, termination */
+ 
+ void support (void);
diff --git a/web/attachments/456910-nagios-plugins-check_http_metadata.patch b/web/attachments/456910-nagios-plugins-check_http_metadata.patch
new file mode 100644
index 0000000..2cda3e5
--- /dev/null
+++ b/web/attachments/456910-nagios-plugins-check_http_metadata.patch
@@ -0,0 +1,351 @@
+commit 77d700600f51880583484b0e7e56b0c896e0d132
+Author: Dejan Muhamedagic <dejan@suse.de>
+Date:   Fri Nov 23 11:45:14 2012 +0100
+
+    check_http: add support for metadata
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 9231a55..cc9f39f 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -135,6 +135,227 @@ char *perfd_size (int page_len);
+ void print_help (void);
+ void print_usage (void);
+ 
++static struct help_head resource_meta = {
++       "http",
++       "Test the HTTP service",
++       "This plugin tests the HTTP service on the specified host. It can test\n"
++       "normal (http) and secure (https) servers, follow redirects, search for\n"
++       "strings and regular expressions, check connection times, and report on\n"
++       "certificate expiration times.\n"
++};
++
++static struct parameter_help options_help[] = {
++       /* hostname */
++       {
++               "hostname", 'H',
++               "Host name",
++               0, 1, "string", "", "ADDRESS",
++               "Host name argument for servers using host headers (virtual host)\n"
++               "Append a port to include it in the header (eg: example.com:5000)\n"
++       },
++       /* IP-address */
++       {
++               "IP-address", 'I',
++               "IP address or name",
++               0, 0, "string", "", "ADDRESS",
++               "IP address or name (use numeric address if possible to bypass DNS lookup).\n"
++       },
++       /* port */
++       {
++               "port", 'p',
++               "Port number (default: 80)",
++               0, 0, "integer", "80", "INTEGER",
++       },
++       /* use-ipv4 */
++       {
++               "use-ipv4", '4',
++               "Use IPv4 connection",
++               0, 0, "boolean", "false", "",
++       },
++       /* use-ipv6 */
++       {
++               "use-ipv6", '6',
++               "Use IPv6 connection",
++               0, 0, "boolean", "false", "",
++       },
++#ifdef HAVE_SSL
++       /* ssl */
++       {
++               "ssl", 'S',
++               "Connect via SSL.",
++               0, 0, "string", "", "VERSION",
++               "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents\n"
++               "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3).\n"
++       },
++       /* sni */
++       {
++               "sni", 0,
++               "Enable SSL/TLS hostname extension support (SNI)",
++               0, 0, "boolean", "false", "",
++       },
++       /* certificate */
++       {
++               "certificate", 'C',
++               "Minimum number of days a certificate has to be valid",
++               0, 0, "integer", "", "INTEGER",
++               "Minimum number of days a certificate has to be valid. Port defaults to 443\n"
++               "(when this option is used the URL is not checked.)\n"
++       },
++#endif
++       /* expect */
++       {
++               "expect", 'e',
++               "list of strings of which at least one must match",
++               0, 0, "string", "", "STRING",
++               "Comma-delimited list of strings, at least one of them is expected in\n"
++               "the first (status) line of the server response (default: HTTP/1.)\n"
++               "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)\n"
++       },
++       /* string */
++       {
++               "string", 's',
++               "String to expect in the content",
++               0, 0, "string", "", "STRING",
++       },
++       /* url */
++       {
++               "url", 'u',
++               "URL to GET or POST (default: /)",
++               0, 0, "string", "/", "PATH",
++       },
++       /* post */
++       {
++               "post", 'P',
++               "URL encoded http POST data",
++               0, 0, "string", "", "STRING",
++       },
++       /* method */
++       {
++               "method", 'j',
++               "Set HTTP method.",
++               0, 0, "string", "", "STRING",
++       },
++       /* no-body */
++       {
++               "no-body", 'N',
++               "Don't wait for document body",
++               0, 0, "boolean", "false", "",
++               "Don't wait for document body: stop reading after headers.\n"
++               "(Note that this still does an HTTP GET or POST, not a HEAD.)\n"
++       },
++       /* max-age */
++       {
++               "max-age", 'M',
++               "maximum age of document",
++               0, 0, "string", "", "SECONDS",
++               "Warn if document is more than SECONDS old. the number can also be of\n"
++               "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days.\n"
++       },
++       /* content-type */
++       {
++               "content-type", 'T',
++               "specify Content-Type header media type when POSTing",
++               0, 0, "string", "", "STRING",
++       },
++       /* linespan */
++       {
++               "linespan", 'l',
++               "Allow regex to span newlines (must precede -r or -R)",
++               0, 0, "boolean", "false", "",
++       },
++       /* regex */
++       {
++               "regex", 'r',
++               "Search page for regex STRING",
++               0, 0, "boolean", "false", "",
++       },
++       /* eregi */
++       {
++               "eregi", 'R',
++               "Search page for case-insensitive regex STRING",
++               0, 0, "string", "", "STRING",
++       },
++       /* invert-regex */
++       {
++               "invert-regex", 0,
++               "Return CRITICAL if found, OK if not",
++               0, 0, "boolean", "false", "",
++       },
++       /* authorization */
++       {
++               "authorization", 'a',
++               "Username:password on sites with basic authentication",
++               0, 0, "string", "", "AUTH_PAIR",
++       },
++       /* proxy_authorization */
++       {
++               "proxy_authorization", 'b',
++               "Username:password on proxy-servers with basic authentication",
++               0, 0, "string", "", "AUTH_PAIR",
++       },
++       /* useragent */
++       {
++               "useragent", 'A',
++               "String to be sent in http header as \"User Agent\"",
++               0, 0, "string", "", "STRING",
++       },
++       /* header */
++       {
++               "header", 'k',
++               "other tags to be sent in http header",
++               0, 0, "string", "", "STRING",
++               "Any other tags to be sent in http header. Use multiple times for additional headers\n"
++       },
++       /* link */
++       {
++               "link", 'L',
++               "Wrap output in HTML link (obsoleted by urlize)",
++               0, 0, "boolean", "false", "",
++       },
++       /* onredirect */
++       {
++               "onredirect", 'f',
++               "How to handle redirected pages",
++               0, 0, "string", "", "<ok|warning|critical|follow|sticky|stickyport>",
++               "How to handle redirected pages. sticky is like follow but stick to the\n"
++               "specified IP address. stickyport also ensures port stays the same.\n"
++       },
++       /* pagesize */
++       {
++               "pagesize", 'm',
++               "minimum[:maximum] page size",
++               0, 0, "string", "", "INTEGER<:INTEGER>",
++               "Minimum page size required (bytes) : Maximum page size required (bytes)\n"
++       },
++       /* warning */
++       {
++               "warning", 'w',
++               "Response time to result in warning status (seconds)",
++               0, 0, "string", "", "DOUBLE",
++       },
++       /* critical */
++       {
++               "critical", 'c',
++               "Response time to result in critical status (seconds)",
++               0, 0, "string", "", "DOUBLE",
++       },
++       /* timeout */
++       {
++               "timeout", 't',
++               "Seconds before connection times out (default: 10)",
++               0, 0, "integer", "10", "INTEGER",
++       },
++       /* extra-opts */
++       {
++               "extra-opts", 0,
++               "ini file with extra options",
++               0, 0, "string", "", "string",
++               "Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
++               "for usage and examples.\n"
++       },
++       {}
++};
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -151,6 +372,12 @@ main (int argc, char **argv)
+             NP_VERSION, VERSION);
+ 
+   /* Parse extra opts if any */
++  if (argc==2 && !strcmp(argv[1], "--metadata")) {
++    /* dump metadata and exit */
++    print_meta_data(&resource_meta, options_help);
++    exit(0);
++  }
++
+   argv=np_extra_opts (&argc, argv, progname);
+ 
+   if (process_arguments (argc, argv) == ERROR)
+@@ -1319,10 +1546,7 @@ print_help (void)
+   printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+   printf (COPYRIGHT, copyright, email);
+ 
+-  printf ("%s\n", _("This plugin tests the HTTP service on the specified host. It can test"));
+-  printf ("%s\n", _("normal (http) and secure (https) servers, follow redirects, search for"));
+-  printf ("%s\n", _("strings and regular expressions, check connection times, and report on"));
+-  printf ("%s\n", _("certificate expiration times."));
++  print_help_head(&resource_meta);
+ 
+   printf ("\n\n");
+ 
+@@ -1333,80 +1557,7 @@ print_help (void)
+   printf ("\n");
+ 
+   printf (UT_HELP_VRSN);
+-  printf (UT_EXTRA_OPTS);
+-
+-  printf (" %s\n", "-H, --hostname=ADDRESS");
+-  printf ("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
+-  printf ("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
+-  printf (" %s\n", "-I, --IP-address=ADDRESS");
+-  printf ("    %s\n", _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
+-  printf (" %s\n", "-p, --port=INTEGER");
+-  printf ("    %s", _("Port number (default: "));
+-  printf ("%d)\n", HTTP_PORT);
+-
+-  printf (UT_IPv46);
+-
+-#ifdef HAVE_SSL
+-  printf (" %s\n", "-S, --ssl=VERSION");
+-  printf ("    %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
+-  printf ("    %s\n", _("auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."));
+-  printf (" %s\n", "--sni");
+-  printf ("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+-  printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
+-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
+-  printf ("    %s\n", _("(when this option is used the URL is not checked.)\n"));
+-#endif
+-
+-  printf (" %s\n", "-e, --expect=STRING");
+-  printf ("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
+-  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", "-s, --string=STRING");
+-  printf ("    %s\n", _("String to expect in the content"));
+-  printf (" %s\n", "-u, --url=PATH");
+-  printf ("    %s\n", _("URL to GET or POST (default: /)"));
+-  printf (" %s\n", "-P, --post=STRING");
+-  printf ("    %s\n", _("URL encoded http POST data"));
+-  printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE)");
+-  printf ("    %s\n", _("Set HTTP method."));
+-  printf (" %s\n", "-N, --no-body");
+-  printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));
+-  printf ("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
+-  printf (" %s\n", "-M, --max-age=SECONDS");
+-  printf ("    %s\n", _("Warn if document is more than SECONDS old. the number can also be of"));
+-  printf ("    %s\n", _("the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."));
+-  printf (" %s\n", "-T, --content-type=STRING");
+-  printf ("    %s\n", _("specify Content-Type header media type when POSTing\n"));
+-
+-  printf (" %s\n", "-l, --linespan");
+-  printf ("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
+-  printf (" %s\n", "-r, --regex, --ereg=STRING");
+-  printf ("    %s\n", _("Search page for regex STRING"));
+-  printf (" %s\n", "-R, --eregi=STRING");
+-  printf ("    %s\n", _("Search page for case-insensitive regex STRING"));
+-  printf (" %s\n", "--invert-regex");
+-  printf ("    %s\n", _("Return CRITICAL if found, OK if not\n"));
+-
+-  printf (" %s\n", "-a, --authorization=AUTH_PAIR");
+-  printf ("    %s\n", _("Username:password on sites with basic authentication"));
+-  printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
+-  printf ("    %s\n", _("Username:password on proxy-servers with basic authentication"));
+-  printf (" %s\n", "-A, --useragent=STRING");
+-  printf ("    %s\n", _("String to be sent in http header as \"User Agent\""));
+-  printf (" %s\n", "-k, --header=STRING");
+-  printf ("    %s\n", _("Any other tags to be sent in http header. Use multiple times for additional headers"));
+-  printf (" %s\n", "-L, --link");
+-  printf ("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
+-  printf (" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky|stickyport>");
+-  printf ("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
+-  printf ("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
+-  printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
+-  printf ("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
+-
+-  printf (UT_WARN_CRIT);
+-
+-  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
++  print_parameters_help(options_help);
+ 
+   printf (UT_VERBOSE);
+ 
+@@ -1467,4 +1618,5 @@ print_usage (void)
+   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");
++  printf (" %s --metadata\n", progname);
+ }
diff --git a/web/attachments/46039-check_nwstat.diff b/web/attachments/46039-check_nwstat.diff
new file mode 100644
index 0000000..7f02eac
--- /dev/null
+++ b/web/attachments/46039-check_nwstat.diff
@@ -0,0 +1,163 @@
+*** nagios-plugins-1.3.0/plugins/check_nwstat.c Sat Feb 15 13:48:45 2003

+--- nagios-plugins-1.3.0-patched/plugins/check_nwstat.c Wed Mar 26 19:02:28 2003

+***************

+*** 63,68 ****

+--- 63,73 ----

+       VKNP<vol> = KB of not yet purgeable space on volume <vol>\n\

+       ABENDS   = number of abended threads (NW 5.x only)\n\

+       CSPROCS  = number of current service processes (NW 5.x only)\n\

++      TSYNC    = timesync status \n\

++      LRUS     = LRU sitting time in seconds\n\

++      DCB      = dirty cache buffers as a percentage of the total\n\

++      TCB      = dirty cache buffers as a percentage of the original\n\

++ 

+  -w, --warning=INTEGER\n\

+    Threshold which will result in a warning status\n\

+  -c, --critical=INTEGER\n\

+***************

+*** 84,90 ****

+    extension for NetWare be loaded on the Novell servers you wish to check.\n\

+    (available from http://www.engr.wisc.edu/~drews/mrtg/)\n\

+  - Values for critical thresholds should be lower than warning thresholds\n\

+!   when the following variables are checked: VPF, VKF, LTCH, CBUFF, and LRUM.\n"

+  

+  #include "config.h"

+  #include "common.h"

+--- 89,95 ----

+    extension for NetWare be loaded on the Novell servers you wish to check.\n\

+    (available from http://www.engr.wisc.edu/~drews/mrtg/)\n\

+  - Values for critical thresholds should be lower than warning thresholds\n\

+!   when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, TCB, LRUS and LRUM.\n"

+  

+  #include "config.h"

+  #include "common.h"

+***************

+*** 114,119 ****

+--- 119,128 ----

+  #define CHECK_VPNP          20 /* check % not yet purgeable space on volume */

+  #define CHECK_ABENDS        21 /* check abended thread count */

+  #define CHECK_CSPROCS       22 /* check number of current service processes */

++ #define CHECK_TSYNC         23 /* check timesync status 0=no 1=yes in sync to the network */

++ #define CHECK_LRUS          24 /* check LRU sitting time in seconds */

++ #define CHECK_DCB           25 /* check dirty cache buffers as a percentage of the total */

++ #define CHECK_TCB           26 /* check total cache buffers as a percentage of the original */

+  

+  #define PORT 9999

+  

+***************

+*** 140,145 ****

+--- 149,157 ----

+        char *temp_buffer=NULL;

+        char *netware_version=NULL;

+  

++       int total_cache_buffers=0;

++       int dirty_cache_buffers=0;

++         int time_sync_status=0;

+        int open_files=0;

+        int abended_threads=0;

+        int max_service_processes=0;

+***************

+*** 602,607 ****

+--- 614,683 ----

+  

+                asprintf(&output_message,"%d current service processes (%d max)",current_service_processes,max_service_processes);

+  

++       /* check # Timesync Status */

++         } else if (vars_to_check==CHECK_TSYNC) {

++ 

++               asprintf(&send_buffer,"S22\r\n");

++               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));

++               if(result!=STATE_OK)

++                       return result;

++ 

++               time_sync_status=atoi(recv_buffer);

++ 

++               if(time_sync_status==0) {

++                       result=STATE_CRITICAL;

++                       asprintf(&output_message,"Critical: Time not in sync with network!");

++               }

++               else {

++                       asprintf(&output_message,"OK! Time in sync with network!");

++               }

++ 

++       /* check LRU sitting time in secondss */

++       } else if (vars_to_check==CHECK_LRUS) {

++ 

++               send_buffer = strscpy(send_buffer,"S4\r\n");

++               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));

++               if(result!=STATE_OK)

++                       return result;

++               lru_time=strtoul(recv_buffer,NULL,10);

++ 

++               if(check_critical_value==TRUE && lru_time <= critical_value)

++                       result=STATE_CRITICAL;

++               else if(check_warning_value==TRUE && lru_time <= warning_value)

++                       result=STATE_WARNING;

++               asprintf(&output_message,"LRU sitting time = %lu seconds",lru_time);

++ 

++ 

++       /* check % dirty cache buffers as a percentage of the total*/

++       } else if (vars_to_check==CHECK_DCB) {

++ 

++               send_buffer = strscpy(send_buffer,"S6\r\n");

++               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));

++               if(result!=STATE_OK)

++                       return result;

++               dirty_cache_buffers=atoi(recv_buffer);

++ 

++               if(check_critical_value==TRUE && dirty_cache_buffers <= critical_value)

++                       result=STATE_CRITICAL;

++               else if(check_warning_value==TRUE && dirty_cache_buffers <= warning_value)

++                       result=STATE_WARNING;

++               asprintf(&output_message,"dirty cache buffers = %d%% of the total",dirty_cache_buffers);

++ 

++       /* check % total cache buffers as a percentage of the original*/

++       } else if (vars_to_check==CHECK_TCB) {

++ 

++               send_buffer = strscpy(send_buffer,"S7\r\n");

++               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));

++               if(result!=STATE_OK)

++                       return result;

++               total_cache_buffers=atoi(recv_buffer);

++ 

++               if(check_critical_value==TRUE && total_cache_buffers <= critical_value)

++                       result=STATE_CRITICAL;

++               else if(check_warning_value==TRUE && total_cache_buffers <= warning_value)

++                       result=STATE_WARNING;

++               asprintf(&output_message,"total cache buffers = %d%% of the original",total_cache_buffers);

++               

+        } else {

+  

+                output_message = strscpy(output_message,"Nothing to check!\n");

+***************

+*** 706,717 ****

+--- 782,799 ----

+                                        vars_to_check=CHECK_CONNS;

+                                else if(!strcmp(optarg,"LTCH"))

+                                        vars_to_check=CHECK_LTCH;

++                               else if(!strcmp(optarg,"DCB"))

++                                       vars_to_check=CHECK_DCB;

++                               else if(!strcmp(optarg,"TCB"))

++                                       vars_to_check=CHECK_TCB;

+                                else if(!strcmp(optarg,"CBUFF"))

+                                        vars_to_check=CHECK_CBUFF;

+                                else if(!strcmp(optarg,"CDBUFF"))

+                                        vars_to_check=CHECK_CDBUFF;

+                                else if(!strcmp(optarg,"LRUM"))

+                                        vars_to_check=CHECK_LRUM;

++                               else if(!strcmp(optarg,"LRUS"))

++                                       vars_to_check=CHECK_LRUS;

+                                else if(strncmp(optarg,"VPF",3)==0){

+                                        vars_to_check=CHECK_VPF;

+                                        volume_name = strscpy(volume_name,optarg+3);

+***************

+*** 769,774 ****

+--- 851,858 ----

+                                        vars_to_check=CHECK_ABENDS;

+                                else if(!strcmp(optarg,"CSPROCS"))

+                                        vars_to_check=CHECK_CSPROCS;

++                               else if(!strcmp(optarg,"TSYNC"))

++                                       vars_to_check=CHECK_TSYNC;

+                                else

+                                        return ERROR;

+                                break;

diff --git a/web/attachments/462789-nagios_plugin.patch b/web/attachments/462789-nagios_plugin.patch
new file mode 100644
index 0000000..3499051
--- /dev/null
+++ b/web/attachments/462789-nagios_plugin.patch
@@ -0,0 +1,47 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -1246,12 +1246,20 @@
+
+ AC_MSG_CHECKING([for number of cpus])
+ AC_TRY_COMPILE([#include <unistd.h>],
+-       [sysconf(_SC_NPROCESSORS_CONF) > 0;],
+-       AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus])
+-       AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
++       [sysconf(_SC_NPROCESSORS_ONLN) > 0;],
++       AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_ONLN,1,[Define if sysconf returns number of cpus])
++       AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_ONLN)]),
+        AC_MSG_RESULT([cannot calculate])
+        )
+
++AC_TRY_COMPILE([#include <unistd.h>],
++        [sysconf(_SC_NPROCESSORS_CONF) > 0;],
++        AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus])
++        AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
++        AC_MSG_RESULT([cannot calculate])
++        )
++
++
+ AC_PATH_PROG(PATH_TO_UPTIME,uptime)
+ AC_ARG_WITH(uptime_command,
+             ACX_HELP_STRING([--with-uptime-command=PATH],
+diff --git a/plugins/common.h b/plugins/common.h
+--- a/plugins/common.h
++++ b/plugins/common.h
+@@ -82,10 +82,14 @@
+    getting that data
+    Will return -1 if cannot get data
+ */
+-#ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF
++#ifdef HAVE_SYSCONF__SC_NPROCESSORS_ONLN
+ #define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_ONLN)
+ #else
+-#define GET_NUMBER_OF_CPUS() -1
++# ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF
++#  define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
++# else
++#  define GET_NUMBER_OF_CPUS() -1
++# endif
+ #endif
+
+ #ifdef TIME_WITH_SYS_TIME
diff --git a/web/attachments/463009-NegSSLVers.patch b/web/attachments/463009-NegSSLVers.patch
new file mode 100644
index 0000000..c19d8ce
--- /dev/null
+++ b/web/attachments/463009-NegSSLVers.patch
@@ -0,0 +1,55 @@
+--- nagios-plugins-1.4.16/plugins/sslutils.c    2012-06-27 19:32:47.000000000 +0200
++++ nagios-plugins-1.4.16b/plugins/sslutils.c   2013-04-30 12:05:14.000000000 +0200
+@@ -46,8 +46,21 @@
+ 
+ int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version) {
+        const SSL_METHOD *method = NULL;
++       long ver_option = 0;
+ 
+        switch (version) {
++       case -3: /* Anything *but* SSLv3 */
++               method = SSLv23_client_method();
++               ver_option = SSL_OP_NO_SSLv3;
++               break;
++       case -2: /* Anything *but* SSLv2 */
++               method = SSLv23_client_method();
++               ver_option = SSL_OP_NO_SSLv2;
++               break;
++       case -1: /* Anything *but* TLSv1 */
++               method = SSLv23_client_method();
++               ver_option = SSL_OP_NO_TLSv1;
++               break;
+        case 0: /* Deafult to auto negotiation */
+                method = SSLv23_client_method();
+                break;
+@@ -83,6 +96,7 @@
+ #ifdef SSL_OP_NO_TICKET
+        SSL_CTX_set_options(c, SSL_OP_NO_TICKET);
+ #endif
++       if (ver_option) SSL_CTX_set_options(c, ver_option);
+        if ((s = SSL_new(c)) != NULL) {
+ #ifdef SSL_set_tlsext_host_name
+                if (host_name != NULL)
+--- nagios-plugins-1.4.16/plugins/check_http.c  2012-06-27 19:32:47.000000000 +0200
++++ nagios-plugins-1.4.16b/plugins/check_http.c 2013-04-30 12:08:48.000000000 +0200
+@@ -312,8 +312,8 @@
+         ssl_version = 0;
+       else {
+         ssl_version = atoi(optarg);
+-        if (ssl_version < 1 || ssl_version > 3)
+-            usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));
++        if (ssl_version < -3 || ssl_version > 3)
++            usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2), 3 (SSLv3) and their negatives (exclude that version)"));
+       }
+       if (specify_port == FALSE)
+         server_port = HTTPS_PORT;
+@@ -1348,7 +1348,8 @@
+ #ifdef HAVE_SSL
+   printf (" %s\n", "-S, --ssl=VERSION");
+   printf ("    %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
+-  printf ("    %s\n", _("auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."));
++  printf ("    %s\n", _("auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3) for positive values, or"));
++  printf ("    %s\n", _("use of the respective protocol in auto-negotiation when negative."));
+   printf (" %s\n", "--sni");
+   printf ("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+   printf (" %s\n", "-C, --certificate=INTEGER");
diff --git a/web/attachments/463371-nagios-plugins-check_http_ntlm.patch.gz b/web/attachments/463371-nagios-plugins-check_http_ntlm.patch.gz
new file mode 100644
index 0000000..e1ca573
--- /dev/null
+++ b/web/attachments/463371-nagios-plugins-check_http_ntlm.patch.gz
diff --git a/web/attachments/463805-check_http.c.diff b/web/attachments/463805-check_http.c.diff
new file mode 100644
index 0000000..a56e1d7
--- /dev/null
+++ b/web/attachments/463805-check_http.c.diff
@@ -0,0 +1,26 @@
+--- check_http.c.orig   2012-06-27 19:32:47.000000000 +0200
++++ check_http.c        2013-06-25 21:08:19.000000000 +0200
+@@ -304,21 +304,22 @@
+       /* Fall through to -S option */
+ #endif
+     case 'S': /* use SSL */
+ #ifndef HAVE_SSL
+       usage4 (_("Invalid option - SSL is not available"));
+-#endif
++#else
+       use_ssl = TRUE;
+       if (optarg == NULL || c != 'S')
+         ssl_version = 0;
+       else {
+         ssl_version = atoi(optarg);
+         if (ssl_version < 1 || ssl_version > 3)
+             usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));
+       }
+       if (specify_port == FALSE)
+         server_port = HTTPS_PORT;
++#endif
+       break;
+     case SNI_OPTION:
+       use_sni = TRUE;
+       break;
+     case 'f': /* onredirect */
diff --git a/web/attachments/49410-nagios-check_http-header-patch.txt b/web/attachments/49410-nagios-check_http-header-patch.txt
new file mode 100644
index 0000000..c2d9556
--- /dev/null
+++ b/web/attachments/49410-nagios-check_http-header-patch.txt
@@ -0,0 +1,75 @@
+--- check_http.c        2003-05-02 18:28:50.000000000 -0500
++++ check_http_orig.c   2003-02-22 01:22:02.000000000 -0600
+@@ -41,7 +41,7 @@
+ certificate expiration times.\n"
+ 
+ #define OPTIONS "\
+-(-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>] [-E header]\n\
++(-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
+             [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+             [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+             [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
+@@ -61,8 +61,6 @@
+    URL to GET or POST (default: /)\n\
+  -p, --port=INTEGER\n\
+    Port number (default: %d)\n\
+- -E, --extra-header=HEADER\n\
+-   Extra HTTP header (name: value)\n\
+  -P, --post=STRING\n\
+    URL encoded http POST data\n\
+  -w, --warning=INTEGER\n\
+@@ -222,7 +220,6 @@
+ int sd;
+ char *http_method = "GET";
+ char *http_post_data = "";
+-char *http_extra_headers = NULL;
+ char buffer[MAX_INPUT_BUFFER];
+ 
+ void print_usage (void);
+@@ -305,7 +302,6 @@
+                {"nohtml", no_argument, 0, 'n'},
+                {"ssl", no_argument, 0, 'S'},
+                {"verbose", no_argument, 0, 'v'},
+-               {"extra-header", required_argument, 0, 'E'},
+                {"post", required_argument, 0, 'P'},
+                {"IP-address", required_argument, 0, 'I'},
+                {"string", required_argument, 0, 's'},
+@@ -335,7 +331,7 @@
+                        strcpy (argv[c], "-n");
+        }
+ 
+-#define OPTCHARS "Vvht:c:w:H:E:P:I:a:e:p:s:R:r:u:f:C:nlLS"
++#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLS"
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+@@ -434,17 +430,6 @@
+                        strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        user_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+-               case 'E': /* extra HTTP header as name: value */
+-                 if (strstr (optarg, ": ") == NULL)
+-                               usage2 ("invalid HTTP header syntax: should be of the form 'name: value'", optarg);
+-                       if (http_extra_headers == NULL) {
+-                               asprintf (&http_extra_headers, "%s\r\n", optarg);
+-                       } else {
+-                               char *old_headers = http_extra_headers;
+-                               asprintf (&http_extra_headers, "%s%s\r\n", old_headers, optarg);
+-                               free (old_headers);
+-                       }
+-                       break;
+                case 'P': /* HTTP POST data in URL encoded format */
+                        asprintf (&http_method, "%s", "POST");
+                        asprintf (&http_post_data, "%s", optarg);
+@@ -610,11 +595,6 @@
+                asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
+        }
+ 
+-       /* send extra headers if requested */
+-       if (http_extra_headers != NULL) {
+-               asprintf (&buf, "%s%s", buf, http_extra_headers);
+-       }
+-
+        /* either send http POST data */
+        if (strlen (http_post_data)) {
+                asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
diff --git a/web/attachments/49900-check_http_patch.txt b/web/attachments/49900-check_http_patch.txt
new file mode 100644
index 0000000..84b9205
--- /dev/null
+++ b/web/attachments/49900-check_http_patch.txt
@@ -0,0 +1,47 @@
+Index: check_http.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
+retrieving revision 1.32
+diff -c -r1.32 check_http.c
+*** check_http.c        23 Apr 2003 04:58:38 -0000      1.32
+--- check_http.c        8 May 2003 15:55:08 -0000
+***************
+*** 630,645 ****
+                pagesize += i;
+        }
+  
+!       if (i < 0) {
+  #ifdef HAVE_SSL
+!               sslerr=SSL_get_error(ssl, i);
+!               if ( sslerr == SSL_ERROR_SSL ) {
+!                       terminate (STATE_WARNING, "Client Certificate Required\n");
+!               } else {
+                        terminate (STATE_CRITICAL, "Error in recv()");
+                }
+- #else
+-               terminate (STATE_CRITICAL, "Error in recv()");
+  #endif
+        }
+  
+--- 630,650 ----
+                pagesize += i;
+        }
+  
+!       if (i < 0 && errno != ECONNRESET) {
+  #ifdef HAVE_SSL
+!               if (use_ssl) {
+!                       sslerr=SSL_get_error(ssl, i);
+!                       if ( sslerr == SSL_ERROR_SSL ) {
+!                               terminate (STATE_WARNING, "Client Certificate Required\n");
+!                       } else {
+!                               terminate (STATE_CRITICAL, "Error in recv()");
+!                       }
+!               }
+!               else {
+! #endif
+                        terminate (STATE_CRITICAL, "Error in recv()");
++ #ifdef HAVE_SSL
+                }
+  #endif
+        }
+  
diff --git a/web/attachments/49902-Http.java b/web/attachments/49902-Http.java
new file mode 100644
index 0000000..5f2c076
--- /dev/null
+++ b/web/attachments/49902-Http.java
@@ -0,0 +1,12 @@
+import java.net.*;

+public class Http {

+        private static final String EOL = "\r\n";

+        public static void main(String args[]) throws Exception {

+                ServerSocket server = new ServerSocket(8911);

+                while (true) {

+                        Socket sock = server.accept();

+                        sock.getOutputStream().write(("HTTP/1.0 " + HttpURLConnection.HTTP_OK + EOL + "Content-type: text/html" + EOL + EOL + "Some example text").getBytes());

+                        sock.close();

+                }

+        }

+}
\ No newline at end of file
diff --git a/web/attachments/49931-check_disk.patch b/web/attachments/49931-check_disk.patch
new file mode 100644
index 0000000..44ea1c4
--- /dev/null
+++ b/web/attachments/49931-check_disk.patch
@@ -0,0 +1,53 @@
+--- check_disk.c.orig   Mon Mar 24 13:23:39 2003
++++ check_disk.c        Mon Mar 24 13:26:47 2003
+@@ -55,6 +55,7 @@
+ char *exclude_device = "";
+ int verbose = 0;
+ int display_mntp = FALSE;
++int local = FALSE;
+ 
+ 
+ int
+@@ -75,7 +76,11 @@
+        if (process_arguments (argc, argv) != OK)
+                usage ("Could not parse arguments\n");
+ 
+-       asprintf (&command_line, "%s %s", DF_COMMAND, path);
++        if (local) {
++               asprintf (&command_line, "%s -l %s", DF_COMMAND, path);
++       } else {
++               asprintf (&command_line, "%s %s", DF_COMMAND, path);
++       }
+ 
+        if (verbose>0)
+                printf ("%s ==> ", command_line);
+@@ -169,6 +174,7 @@
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
++               {"local", no_argument, 0, 'l'},
+                {"mountpoint", no_argument, 0, 'm'},
+                {"exclude_device", required_argument, 0, 'x'},
+                {"quiet", no_argument, 0, 'q'},
+@@ -187,9 +193,9 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "+?Vqhvt:c:w:p:x:m", long_options, &option_index);
++                       getopt_long (argc, argv, "+?Vqhvt:c:w:p:x:lm", long_options, &option_index);
+ #else
+-               c = getopt (argc, argv, "+?Vqhvt:c:w:p:x:m");
++               c = getopt (argc, argv, "+?Vqhvt:c:w:p:x:lm");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -247,6 +253,9 @@
+                        break;
+                case 'm': /* display mountpoint */
+                        display_mntp = TRUE;
++                       break;
++               case 'l':
++                       local = TRUE;
+                        break;
+                case 'x':                                                                       /* exclude path or partition */
+                        exclude_device = optarg;
diff --git a/web/attachments/49981-check_mailq.diff b/web/attachments/49981-check_mailq.diff
new file mode 100644
index 0000000..314577e
--- /dev/null
+++ b/web/attachments/49981-check_mailq.diff
@@ -0,0 +1,93 @@
+295a296,379
+> elsif ( $mailq eq "postfix" ) {
+> 
+>      ## open mailq
+>         if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
+>                 if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+>                         print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+>                         exit $ERRORS{'UNKNOWN'};
+>                 }
+>         }elsif( defined $utils::PATH_TO_MAILQ){
+>                 unless (-x $utils::PATH_TO_MAILQ) {
+>                         print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+>                         exit $ERRORS{'UNKNOWN'};
+>                 }
+>         } else {
+>                 print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+>                 exit $ERRORS{'UNKNOWN'};
+>         }
+> 
+> 
+>         @lines = reverse <MAILQ>;
+> 
+>         # close qmail-qstat
+>         close MAILQ;
+>         # declare an error if we also get a non-zero return code from mailq
+>         # unless already set to critical
+>         if ( $? ) {
+>                 $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"}  ;
+>                 print "STDERR $?: $!\n" if $verbose;
+>                 $msg = "$state: (stderr)\n";
+>         }
+> 
+>         ## shut off the alarm
+>         alarm(0);
+> 
+>         # check queue length
+>         if ($lines[0]=~/Kbytes in (\d+)/) {
+>                 $msg_q = $1 ;
+>       }elsif ($lines[0]=~/Mail queue is empty/) {
+>               $msg_q = 0;
+>         }else{
+>                 print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n";
+>                 exit   $ERRORS{'UNKNOWN'};
+>         }
+> 
+>         # check messages not processed
+>         #if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) {
+>         #        my $msg_p = $1;
+>         #}else{
+>         #        print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n";
+>         #        exit  $ERRORS{'UNKNOWN'};
+>         #}
+> 
+>         # check queue length(s)
+>         if ($msg_q == 0){
+>                 $msg = "OK: mailq reports queue is empty";
+>                 $state = $ERRORS{'OK'};
+>         } else {
+>                 print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
+> 
+>                 # overall queue length
+>                 if ($msg_q < $opt_w) {
+>                         $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+>                         $state = $ERRORS{'OK'};
+>                 }elsif  ($msg_q >= $opt_w  && $msg_q < $opt_c) {
+>                         $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+>                         $state = $ERRORS{'WARNING'};
+>                 }else {
+>                         $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+>                         $state = $ERRORS{'CRITICAL'};
+>                 }
+> 
+>                 # check messages not yet preprocessed (only compare is $opt_W and $opt_C
+>                 # are defined)
+> 
+>                 #if (defined $opt_W) {
+>                 #        $msg .= "[Preprocessed = $msg_p]";
+>                 #        if ($msg_p >= $opt_W && $msg_p < $opt_C ) {
+>                 #                $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"}  ;
+>                 #        }elsif ($msg_p >= $opt_C ) {
+>                 #                $state = $ERRORS{"CRITICAL"} ;
+>                 #        }
+>                 #}
+>         }
+> } # end of ($mailq eq "postfixl")
+445c529
+<               if ($opt_M =~ /sendmail/ || $opt_M =~ /qmail/ ) {
+---
+>               if ($opt_M =~ /sendmail/ || $opt_M =~ /qmail/ || $opt_M =~ /postfix/ ) {
+477c561
+<       print "-M (--mailserver) = [ sendmail | qmail ] (default = sendmail)\n";
+---
+>       print "-M (--mailserver) = [ sendmail | qmail | postfix ] (default = sendmail)\n";
diff --git a/web/attachments/50322-check_nwstat.c.patch b/web/attachments/50322-check_nwstat.c.patch
new file mode 100644
index 0000000..4c11b08
--- /dev/null
+++ b/web/attachments/50322-check_nwstat.c.patch
@@ -0,0 +1,83 @@
+--- check_nwstat.c.old  2003-05-14 11:26:39.000000000 +0100
++++ check_nwstat.c      2003-05-14 11:41:07.000000000 +0100
+@@ -24,7 +24,7 @@
+  *****************************************************************************/
+ 
+ const char *progname = "check_nwstat";
+-#define REVISION "$Revision: 1.6 $"
++#define REVISION "$Revision: 1.7 $"
+ #define COPYRIGHT "Copyright (c) 1999-2001 Ethan Galstad"
+ 
+ #define SUMMARY "\
+@@ -51,6 +51,7 @@
+      CDBUFF   = current number of dirty cache buffers\n\
+      LRUM     = LRU sitting time in minutes\n\
+      DSDB     = check to see if DS Database is open\n\
++     DSVER    = NDS version\n\
+      LOGINS   = check to see if logins are enabled\n\
+      UPRB     = used packet receive buffers\n\
+      PUPRB    = percent (of max) used packet receive buffers\n\
+@@ -67,6 +68,7 @@
+      LRUS     = LRU sitting time in seconds\n\
+      DCB      = dirty cache buffers as a percentage of the total\n\
+      TCB      = dirty cache buffers as a percentage of the original\n\
++     UPTIME   = server uptime\n\
+ -w, --warning=INTEGER\n\
+   Threshold which will result in a warning status\n\
+ -c, --critical=INTEGER\n\
+@@ -123,6 +125,8 @@
+ #define CHECK_LRUS          24 /* check LRU sitting time in seconds */
+ #define CHECK_DCB           25 /* check dirty cache buffers as a percentage of the total */
+ #define CHECK_TCB           26 /* check total cache buffers as a percentage of the original */
++#define CHECK_DSVER         27 /* check NDS version */
++#define CHECK_UPTIME        28 /* check server uptime */
+ 
+ #define PORT 9999
+ 
+@@ -664,7 +668,7 @@
+                asprintf(&output_message,"dirty cache buffers = %d%% of the total",dirty_cache_buffers);
+ 
+        /* check % total cache buffers as a percentage of the original*/
+-       } else if (vars_to_check==CHECK_TCB) {
++        } else if (vars_to_check==CHECK_TCB) {
+ 
+                send_buffer = strscpy(send_buffer,"S7\r\n");
+                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+@@ -678,6 +682,26 @@
+                        result=STATE_WARNING;
+                asprintf(&output_message,"total cache buffers = %d%% of the original",total_cache_buffers);
+                
++        } else if (vars_to_check==CHECK_DSVER) {
++               asprintf(&send_buffer,"S13\r\n");
++               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
++               if(result!=STATE_OK)
++                       return result;
++
++               recv_buffer[strlen(recv_buffer)-1]=0;
++
++               asprintf(&output_message,"NDS Version %s",recv_buffer);
++
++        } else if (vars_to_check==CHECK_UPTIME) {
++               asprintf(&send_buffer,"UPTIME\r\n");
++               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
++               if(result!=STATE_OK)
++                       return result;
++
++               recv_buffer[strlen(recv_buffer)-1]=0;
++
++               asprintf(&output_message,"Up %s",recv_buffer);
++
+        } else {
+ 
+                output_message = strscpy(output_message,"Nothing to check!\n");
+@@ -847,6 +871,10 @@
+                                        vars_to_check=CHECK_CSPROCS;
+                                else if(!strcmp(optarg,"TSYNC"))
+                                        vars_to_check=CHECK_TSYNC;
++                               else if(!strcmp(optarg,"DSVER"))
++                                       vars_to_check=CHECK_DSVER;
++                               else if(!strcmp(optarg,"UPTIME"))
++                                       vars_to_check=CHECK_UPTIME;
+                                else
+                                        return ERROR;
+                                break;
diff --git a/web/attachments/50702-check_pop3.patch b/web/attachments/50702-check_pop3.patch
new file mode 100644
index 0000000..2c897e3
--- /dev/null
+++ b/web/attachments/50702-check_pop3.patch
@@ -0,0 +1,213 @@
+*** check_pop3.pl.orig  2002-02-27 22:42:53.000000000 -0800
+--- check_pop3.pl       2003-05-19 14:57:06.000000000 -0700
+***************
+*** 23,32 ****
+  #                             with perl -wT and 'use strict'
+  # 2000/01/20  RM              Corrected POP3 Exit State.
+  # 2000/01/21  RM              Fix Exit Codes Again!!
+  # ------------------------------------------------------------------------------
+  
+  # -----------------------------------------------------------------[ Require ]--
+! require 5.004;
+  
+  # --------------------------------------------------------------------[ Uses ]--
+  use Socket;
+--- 23,34 ----
+  #                             with perl -wT and 'use strict'
+  # 2000/01/20  RM              Corrected POP3 Exit State.
+  # 2000/01/21  RM              Fix Exit Codes Again!!
++ # 2003/05/17  CS              Cleaned up little, simplifed logic flow, better 
++ #                               checking of return status from server.
+  # ------------------------------------------------------------------------------
+  
+  # -----------------------------------------------------------------[ Require ]--
+! use 5.004;
+  
+  # --------------------------------------------------------------------[ Uses ]--
+  use Socket;
+***************
+*** 37,43 ****
+  $ENV{BASH_ENV} = "";
+  $|=1;
+  # ------------------------------------------------------------------[ Global ]--
+! my $TIMEOUT = 60;
+        
+  # -------------------------------------------------------------------[ usage ]--
+  sub usage
+--- 39,46 ----
+  $ENV{BASH_ENV} = "";
+  $|=1;
+  # ------------------------------------------------------------------[ Global ]--
+! my $TIMEOUT = 30;
+! my $DEBUG = 0;
+        
+  # -------------------------------------------------------------------[ usage ]--
+  sub usage
+***************
+*** 65,78 ****
+        my $that;
+        my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
+  
+!       if (!socket(ClientSocket,AF_INET, SOCK_STREAM, $proto)) { die $!; }
+        $sockaddr = 'S n a4 x8';
+        $this = pack($sockaddr, AF_INET, 0, $thisaddr);
+        $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
+!       if (!bind(ClientSocket, $this)) { print "Connection Refused"; exit 2; }
+!       if (!connect(ClientSocket, $that)) { print "Connection Refused"; exit 2; }
+!       select(ClientSocket); $| = 1; select(STDOUT);
+!       return \*ClientSocket;
+  }
+  
+  # ====================================================================[ MAIN ]==
+--- 68,88 ----
+        my $that;
+        my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
+  
+!       if (!socket(POPS,AF_INET, SOCK_STREAM, $proto)) {
+!               err("$!");
+!       }
+        $sockaddr = 'S n a4 x8';
+        $this = pack($sockaddr, AF_INET, 0, $thisaddr);
+        $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
+!       if (!bind(POPS, $this)) {
+!               err("$!");
+!       }
+!       if (!connect(POPS, $that)) {
+!               err("$!");
+!       }
+!       select(POPS); $|=1;
+!       select(STDOUT); $|=1;
+!       return \*POPS;
+  }
+  
+  # ====================================================================[ MAIN ]==
+***************
+*** 86,92 ****
+  
+        # Just in case of problems, let's not hang Nagios
+        $SIG{'ALRM'} = sub {
+!               print "Something is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
+                exit -1;
+        };
+        
+--- 96,102 ----
+  
+        # Just in case of problems, let's not hang Nagios
+        $SIG{'ALRM'} = sub {
+!               print "POP3 Error: Timeout after $TIMEOUT seconds\n";
+                exit -1;
+        };
+        
+***************
+*** 94,144 ****
+  
+        chop($hostname = `hostname`);
+        my ($name, $alias, $proto) = getprotobyname('tcp');
+!       my $ClientSocket = &bindRemote($remotehost,$remoteport,$hostname);
+!       
+! 
+! print ClientSocket "user $username\n";
+! 
+! #Debug Server
+! #print "user $username\n";
+! 
+! #Sleep or 3 secs, incase server is slow.
+! sleep 3;
+  
+! print ClientSocket "pass $password\n";
+! 
+! #Debug Server
+! #print "pass $password\n";
+! 
+! while (<ClientSocket>) {
+  
+! print ClientSocket "pass $password\n";
+  
+! #Debug Server
+! #print $_;
+  
+! err($_) if (m/\-ERR\s+(.*)\s+.*/);
+! message($_) if (m/\+OK Mailbox open,\s+(.*\d)\s+messages.*/);
+! }
+  }
+  
+! sub message 
+  {
+!       my $answer = "UNKNOWN";
+!       $answer = "Pop3 OK - Total Messages On Server :- $1";   
+!       alarm(0);
+!       print ClientSocket "quit\n";
+!       print "$answer";
+!       exit 0;
+  }
+  
+  sub err
+  {
+!       my $answer = "UNKNOWN";
+!       $answer = "Pop3 Error :- $1";
+        alarm(0);
+!       print ClientSocket "quit\n";
+!       print "$answer";
+        exit 2;
+  }
+  
+--- 104,162 ----
+  
+        chop($hostname = `hostname`);
+        my ($name, $alias, $proto) = getprotobyname('tcp');
+!       my $POPS = &bindRemote($remotehost,$remoteport,$hostname);
+  
+!       # Wait for server to come ready
+!       alarm($TIMEOUT);
+!       $_ = <POPS>;
+!       if (! /^.OK/) { err($_, *POPS); }
+!       print STDERR "<< $_" if $DEBUG;
+  
+!       # Send login name
+!       alarm($TIMEOUT);
+!       print STDERR ">> user $username\n" if $DEBUG;
+!       print POPS "user $username\n";
+!       $_ = <POPS>;
+!       if (! /^.OK/) { err($_, *POPS); }
+!       print STDERR "<< $_" if $DEBUG;
+  
+!       # Send login password
+!       alarm($TIMEOUT);
+!       print STDERR ">> pass $password\n" if $DEBUG;
+!       print POPS "pass $password\n";
+!       $_ = <POPS>;
+!       if (! /^.OK/) { err($_, *POPS); }
+!       print STDERR "<< $_" if $DEBUG;
+!       
+!       # Return the good news
+!       print "POP3 OK - $_";
+  
+!       logout(*POPS);
+  }
+  
+! sub logout 
+  {
+!       my $pops = shift;
+! 
+!       print STDERR ">> quit\n" if $DEBUG;
+!       print $pops "quit\n";
+!       $_ = <$$pops>;
+!       print STDERR "<< $_" if $DEBUG;
+!       close($pops);
+!       print STDERR "\nClosed socket\n" if $DEBUG;
+! 
+  }
+  
+  sub err
+  {
+!       my ($msg, $pops) = @_;
+! 
+        alarm(0);
+!       print "POP3 Error: $msg";
+! 
+!       if (defined($pops)) {
+!               logout($pops);
+!       }
+        exit 2;
+  }
+  
diff --git a/web/attachments/50703-check_disk_smb.patch b/web/attachments/50703-check_disk_smb.patch
new file mode 100644
index 0000000..55f4403
--- /dev/null
+++ b/web/attachments/50703-check_disk_smb.patch
@@ -0,0 +1,40 @@
+*** check_disk_smb      2003-05-19 15:04:55.000000000 -0700
+--- check_disk_smb.orig 2003-05-19 15:04:43.000000000 -0700
+***************
+*** 205,221 ****
+        $answer = "Result from smbclient not suitable\n";
+        $state = "UNKNOWN";
+        foreach (@lines) {
+!               if (/(Access denied|NT_STATUS_LOGON_FAILURE)/) {
+                        $answer = "Access Denied\n";
+                        $state = "CRITICAL";
+                        last;
+                }
+!               if (/(Unknown host \w*|Connection.*failed)/) {
+!                       $answer = "$1\n";
+                        $state = "CRITICAL";
+                        last;
+                }
+!               if (/(You specified an invalid share name|NT_STATUS_BAD_NETWORK_NAME)/) {
+                        $answer = "Invalid share name \\\\$host\\$share\n";
+                        $state = "CRITICAL";
+                        last;
+--- 205,222 ----
+        $answer = "Result from smbclient not suitable\n";
+        $state = "UNKNOWN";
+        foreach (@lines) {
+!               if (/Access denied/) {
+                        $answer = "Access Denied\n";
+                        $state = "CRITICAL";
+                        last;
+                }
+!               if (/(Unknown host \w*)/) {
+!                       $answer = "$1\n";_
+! 
+                        $state = "CRITICAL";
+                        last;
+                }
+!               if (/(You specified an invalid share name)/) {
+                        $answer = "Invalid share name \\\\$host\\$share\n";
+                        $state = "CRITICAL";
+                        last;
diff --git a/web/attachments/50746-perf.patch b/web/attachments/50746-perf.patch
new file mode 100644
index 0000000..72f1aad
--- /dev/null
+++ b/web/attachments/50746-perf.patch
@@ -0,0 +1,386 @@
+Only in nagios-plugins-1.3.0/plugins: Makefile
+Only in nagios-plugins-1.3.0/plugins: check_by_ssh
+Only in nagios-plugins-1.3.0/plugins: check_by_ssh.o
+Only in nagios-plugins-1.3.0/plugins: check_dig
+Only in nagios-plugins-1.3.0/plugins: check_dig.o
+Only in nagios-plugins-1.3.0/plugins: check_disk
+diff -u nagios-plugins-1.3.0-orig/plugins/check_disk.c nagios-plugins-1.3.0/plugins/check_disk.c
+--- nagios-plugins-1.3.0-orig/plugins/check_disk.c      2003-02-15 13:48:44.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_disk.c   2003-05-20 12:51:58.000000000 +0200
+@@ -28,6 +28,8 @@
+  *     initailize usp to -1, eliminate 'found' variable
+  *     accept any filename/filesystem
+  *     use sscanf, drop while loop
++ *  - Modification by www.datux.nl 2003-01-24
++ *     added performance data output
+  *
+  *****************************************************************************/
+ 
+@@ -64,6 +66,9 @@
+        int total_disk = -1;
+        int used_disk = -1;
+        int free_disk = -1;
++       int perf_total_disk = 0;
++       int perf_free_disk = 0;
++       int perf_used_disk = 0;
+        int result = STATE_UNKNOWN;
+        int disk_result = STATE_UNKNOWN;
+        char *command_line = "";
+@@ -96,6 +101,7 @@
+                if (!index (input_buffer, '/'))
+                        continue;
+ 
++               /* did we get some usefull output from the 'df' process? */
+                if (sscanf (input_buffer, "%s %d %d %d %d%% %s", file_system,
+                     &total_disk, &used_disk, &free_disk, &usp, mntp) == 6 ||
+                    sscanf (input_buffer, "%s %*s %d %d %d %d%% %s", file_system,
+@@ -118,6 +124,9 @@
+                                          free_disk, 100 - usp, display_mntp ? mntp : file_system);
+ 
+                        result = max_state (result, disk_result);
++                       perf_total_disk+=total_disk;
++                       perf_free_disk+=free_disk;
++                       perf_used_disk+=used_disk;
+                }
+ 
+                else {
+@@ -147,8 +156,14 @@
+        else if (result == STATE_UNKNOWN)
+                printf ("Unable to read output\n%s\n%s\n", command_line, input_buffer);
+        else
+-               printf ("DISK %s%s\n", state_text (result), output);
+-
++               printf ("DISK %s%s|total=%d,used=%d,free=%d,used_perc=%f,free_perc=%f\n", 
++                   state_text (result), 
++                   output, 
++                   perf_total_disk, 
++                   perf_used_disk, 
++                   perf_free_disk, 
++                   100-((float)perf_free_disk*100/(float)perf_total_disk),
++                   ((float)perf_free_disk*100/(float)perf_total_disk));
+        return result;
+ }
+ 
+Only in nagios-plugins-1.3.0/plugins: check_disk.o
+Only in nagios-plugins-1.3.0/plugins: check_dns
+Only in nagios-plugins-1.3.0/plugins: check_dns.o
+Only in nagios-plugins-1.3.0/plugins: check_dummy
+Only in nagios-plugins-1.3.0/plugins: check_dummy.o
+Only in nagios-plugins-1.3.0/plugins: check_ftp
+Only in nagios-plugins-1.3.0/plugins: check_http
+diff -u nagios-plugins-1.3.0-orig/plugins/check_http.c nagios-plugins-1.3.0/plugins/check_http.c
+--- nagios-plugins-1.3.0-orig/plugins/check_http.c      2003-02-22 08:22:02.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_http.c   2003-05-20 12:51:58.000000000 +0200
+@@ -21,6 +21,9 @@
+  *
+  * $Id: check_http.c,v 1.24 2003/02/21 21:59:17 tonvoon Exp $
+  *
++ * Sun Feb  9 17:11:53 CET 2003 Modified by Edwin Eefting (edwin@datux.nl)
++ *                             fixed performance data: no spaces please :)
++ *
+  *****************************************************************************/
+ 
+ const char *progname = "check_http";
+@@ -795,7 +798,7 @@
+                        else if (onredirect == STATE_CRITICAL)
+                                printf ("HTTP CRITICAL");
+                        elapsed_time = delta_time (tv);
+-                       asprintf (&msg, ": %s - %7.3f second response time %s%s|time=%7.3f\n",
++                       asprintf (&msg, ": %s - %7.3f second response time %s%s|time=%f\n",
+                                 status_line, elapsed_time, timestamp,
+                           (display_html ? "</A>" : ""), elapsed_time);
+                        terminate (onredirect, msg);
+@@ -807,7 +810,7 @@
+                
+        /* check elapsed time */
+        elapsed_time = delta_time (tv);
+-       asprintf (&msg, "HTTP problem: %s - %7.3f second response time %s%s|time=%7.3f\n",
++       asprintf (&msg, "HTTP problem: %s - %7.3f second response time %s%s|time=%f\n",
+                       status_line, elapsed_time, timestamp,
+                       (display_html ? "</A>" : ""), elapsed_time);
+        if (check_critical_time == TRUE && elapsed_time > critical_time)
+@@ -835,14 +838,14 @@
+        if (strlen (regexp)) {
+                errcode = regexec (&preg, page, REGS, pmatch, 0);
+                if (errcode == 0) {
+-                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%f\n",
+                                status_line, elapsed_time,
+                                timestamp, (display_html ? "</A>" : ""), elapsed_time);
+                        exit (STATE_OK);
+                }
+                else {
+                        if (errcode == REG_NOMATCH) {
+-                               printf ("HTTP CRITICAL: pattern not found%s|time=%7.3f\n",
++                               printf ("HTTP CRITICAL: pattern not found%s|time=%f\n",
+                                        (display_html ? "</A>" : ""), elapsed_time);
+                                exit (STATE_CRITICAL);
+                        }
+@@ -856,7 +859,7 @@
+ #endif
+ 
+        /* We only get here if all tests have been passed */
+-       asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++       asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%f\n",
+                        status_line, (float)elapsed_time,
+                        timestamp, (display_html ? "</A>" : ""), elapsed_time);
+        terminate (STATE_OK, msg);
+Only in nagios-plugins-1.3.0/plugins: check_http.c.rej
+Only in nagios-plugins-1.3.0/plugins: check_http.c~
+Only in nagios-plugins-1.3.0/plugins: check_http.o
+Only in nagios-plugins-1.3.0/plugins: check_imap
+Only in nagios-plugins-1.3.0/plugins: check_load
+diff -u nagios-plugins-1.3.0-orig/plugins/check_load.c nagios-plugins-1.3.0/plugins/check_load.c
+--- nagios-plugins-1.3.0-orig/plugins/check_load.c      2003-02-18 23:16:06.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_load.c   2003-05-20 12:51:58.000000000 +0200
+@@ -19,6 +19,9 @@
+  *                mods by Ethan Galstad (nagios@nagios.org)
+  * 08/18/1999 - Integrated some code with common plugin utilities
+  *                mods by Ethan Galstad (nagios@nagios.org)
++ * 20/01/2003 - Now returns performance data 
++ *                mods by Edwin Eefting (www.DatuX.nl)
++ *
+  * $Date: 2003/02/18 22:10:55 $
+  * Note: The load format is the same used by "uptime" and "w"
+  *
+@@ -139,6 +142,10 @@
+        }
+        if ((la1 >= wload1) || (la5 >= wload5) || (la15 >= wload15)) {
+                printf ("WARNING - %s\n", status_line);
++
++       /* performance data */
++       printf ("|load1=%.2f,load5=%.2f,load15=%.2f", la1, la5, la15);
++
+                return STATE_WARNING;
+        }
+        printf ("OK - %s\n", status_line);
+Only in nagios-plugins-1.3.0/plugins: check_load.o
+Only in nagios-plugins-1.3.0/plugins: check_mrtg
+Only in nagios-plugins-1.3.0/plugins: check_mrtg.o
+Only in nagios-plugins-1.3.0/plugins: check_mrtgtraf
+Only in nagios-plugins-1.3.0/plugins: check_mrtgtraf.o
+Only in nagios-plugins-1.3.0/plugins: check_mysql
+Only in nagios-plugins-1.3.0/plugins: check_mysql.o
+Only in nagios-plugins-1.3.0/plugins: check_nagios
+Only in nagios-plugins-1.3.0/plugins: check_nagios.o
+Only in nagios-plugins-1.3.0/plugins: check_nntp
+Only in nagios-plugins-1.3.0/plugins: check_nt
+Only in nagios-plugins-1.3.0/plugins: check_nt.o
+Only in nagios-plugins-1.3.0/plugins: check_nwstat
+Only in nagios-plugins-1.3.0/plugins: check_nwstat.o
+Only in nagios-plugins-1.3.0/plugins: check_overcr
+Only in nagios-plugins-1.3.0/plugins: check_overcr.o
+Only in nagios-plugins-1.3.0/plugins: check_ping
+diff -u nagios-plugins-1.3.0-orig/plugins/check_ping.c nagios-plugins-1.3.0/plugins/check_ping.c
+--- nagios-plugins-1.3.0-orig/plugins/check_ping.c      2003-02-15 13:48:45.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_ping.c   2003-05-20 12:51:58.000000000 +0200
+@@ -8,6 +8,10 @@
+ *
+ * $Id: check_ping.c,v 1.11 2003/01/13 12:15:16 kdebisschop Exp $
+ *
++* updated Mon Jan 20 19:03:57 CET 2003 by Edwin Eefting (DatuX.nl)
++*  -minor bugfixes
++*  -now returns performance data
++*
+ *****************************************************************************/
+ 
+ const char *progname = "check_ping";
+@@ -18,7 +22,7 @@
+ #define SUMMARY "Use ping to check connection statistics for a remote host.\n"
+ 
+ #define OPTIONS "\
+--H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
++-H <host_address> -w <wrta>,<wpl>% -c <crta>,<cpl>%\n\
+        [-p packets] [-t timeout] [-L]\n"
+ 
+ #define LONGOPTIONS "\
+@@ -135,14 +139,19 @@
+                                                state_text (result), warn_text, pl, rta);
+        if (display_html == TRUE)
+                printf ("</A>");
+-       printf ("\n");
++
++       /* print performance data */
++       printf("|loss=%d",pl);
++       if (pl != 100)
++           printf(",rta=%f",rta);
++       printf("\n");
+ 
+        if (verbose)
+                printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
+ 
+        return result;
+ }
+-
++
+ 
+ /* process command-line arguments */
+ int
+@@ -340,7 +349,7 @@
+        if (max_packets == -1)
+                max_packets = DEFAULT_MAX_PACKETS;
+ 
+-       max_seconds = crta / 1000.0 * max_packets + max_packets;
++       max_seconds = crta / 1000.0 * max_packets + max_packets + 10;
+        if (max_seconds > timeout_interval)
+                timeout_interval = (int)max_seconds;
+ 
+Only in nagios-plugins-1.3.0/plugins: check_ping.o
+Only in nagios-plugins-1.3.0/plugins: check_pop
+Only in nagios-plugins-1.3.0/plugins: check_procs
+diff -u nagios-plugins-1.3.0-orig/plugins/check_procs.c nagios-plugins-1.3.0/plugins/check_procs.c
+--- nagios-plugins-1.3.0-orig/plugins/check_procs.c     2003-02-15 13:48:45.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_procs.c  2003-05-20 12:51:58.000000000 +0200
+@@ -32,6 +32,9 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
++* feb-9-2003 modified by Edwin Eefting (www.DatuX.nl)  edwin@datux.nl
++*            returns performance data
++*
+ ******************************************************************************/
+ 
+ const char *progname = "check_procs";
+@@ -197,6 +200,9 @@
+                return result;
+        }
+ 
++       //add performance data to "format string"
++       asprintf(&fmt,"%s|procs=%d\n",fmt,procs);
++       
+        if (verbose && (options & STAT))
+                printf ("%s ", statopts);
+        if (verbose && (options & PROG))
+@@ -427,6 +433,7 @@
+                options |= STAT;
+        }
+ 
++
+        return validate_arguments ();
+ }
+ 
+@@ -457,10 +464,10 @@
+ 
+        if (options == 0) {
+                options = 1;
+-               asprintf (&fmt, "%%s - %%d processes running\n");
++               asprintf (&fmt, "%%s - %%d processes running");
+        }
+        else {
+-               asprintf (&fmt, "%%s - %%d processes running with %s\n", fmt);
++               asprintf (&fmt, "%%s - %%d processes running with %s", fmt);
+        }
+ 
+        return options;
+Only in nagios-plugins-1.3.0/plugins: check_procs.o
+Only in nagios-plugins-1.3.0/plugins: check_real
+Only in nagios-plugins-1.3.0/plugins: check_real.o
+Only in nagios-plugins-1.3.0/plugins: check_smtp
+Only in nagios-plugins-1.3.0/plugins: check_smtp.o
+Only in nagios-plugins-1.3.0/plugins: check_ssh
+Only in nagios-plugins-1.3.0/plugins: check_ssh.o
+Only in nagios-plugins-1.3.0/plugins: check_swap
+diff -u nagios-plugins-1.3.0-orig/plugins/check_swap.c nagios-plugins-1.3.0/plugins/check_swap.c
+--- nagios-plugins-1.3.0-orig/plugins/check_swap.c      2003-02-18 06:35:52.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_swap.c   2003-05-20 14:02:11.000000000 +0200
+@@ -23,6 +23,9 @@
+  *
+  * $Id: check_swap.c,v 1.9 2003/02/18 03:46:15 sghosh Exp $
+  *
++ * feb 9 2003 - Modified by Edwin Eefting (www.DatuX.nl) edwin@datux.nl
++ *              Returns performance data
++ *
+  *****************************************************************************/
+ 
+ #include "common.h"
+@@ -51,7 +54,7 @@
+ int
+ main (int argc, char **argv)
+ {
+-       int percent_used, percent;
++       float percent_used, percent;
+        long unsigned int total_swap = 0, used_swap = 0, free_swap = 0;
+        long unsigned int total, used, free;
+        int result = STATE_OK;
+@@ -93,8 +96,8 @@
+                result = max_state (STATE_CRITICAL, result);
+        else if (percent_used >= warn_percent || free_swap <= warn_size)
+                result = max_state (STATE_WARNING, result);
+-       asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
+-                 used_swap, total_swap);
++       asprintf (&status, "%s %2.0f%% (%lu out of %lu)|user_perc=%f,user=%d,total=%d", status, percent_used,
++                 used_swap, total_swap, percent_used, used_swap, total_swap);
+        fclose (fp);
+ #else
+ #ifdef HAVE_SWAP
+@@ -146,8 +149,8 @@
+                result = max_state (STATE_CRITICAL, result);
+        else if (percent_used >= warn_percent || free_swap <= warn_size)
+                result = max_state (STATE_WARNING, result);
+-       asprintf (&status, "%s %2d%% (%lu out of %lu)",
+-                                               status, percent_used, used_swap, total_swap);
++       asprintf (&status, "%s %2.0f%% (%lu out of %lu)|used_perc=%f,user=%d,total=%d",
++                                               status, percent_used, used_swap, total_swap, percent_used, used_swap, total_swap);
+ 
+        /* If we get anything on STDERR, at least set warning */
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+Only in nagios-plugins-1.3.0/plugins: check_swap.c.rej
+Only in nagios-plugins-1.3.0/plugins: check_swap.c~
+Only in nagios-plugins-1.3.0/plugins: check_swap.o
+Only in nagios-plugins-1.3.0/plugins: check_tcp
+Only in nagios-plugins-1.3.0/plugins: check_tcp.o
+Only in nagios-plugins-1.3.0/plugins: check_time
+Only in nagios-plugins-1.3.0/plugins: check_time.o
+Only in nagios-plugins-1.3.0/plugins: check_udp
+Only in nagios-plugins-1.3.0/plugins: check_udp.o
+Only in nagios-plugins-1.3.0/plugins: check_ups
+Only in nagios-plugins-1.3.0/plugins: check_ups.o
+Only in nagios-plugins-1.3.0/plugins: check_users
+diff -u nagios-plugins-1.3.0-orig/plugins/check_users.c nagios-plugins-1.3.0/plugins/check_users.c
+--- nagios-plugins-1.3.0-orig/plugins/check_users.c     2003-02-15 13:48:46.000000000 +0100
++++ nagios-plugins-1.3.0/plugins/check_users.c  2003-05-20 12:51:58.000000000 +0200
+@@ -42,6 +42,9 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
++ * feb-9-2003 modified by Edwin Eefting (www.DatuX.nl) edwin@datux.nl
++ *           returns performance data
++ *
+  *****************************************************************************/
+ 
+ #include "common.h"
+@@ -120,8 +123,8 @@
+        if (result == STATE_UNKNOWN)
+                printf ("Unable to read output\n");
+        else
+-               printf ("USERS %s - %d users currently logged in\n", state_text (result),
+-                                               users);
++               printf ("USERS %s - %d users currently logged in|users=%d\n", state_text (result),
++                                               users,users);
+ 
+        return result;
+ }
+Only in nagios-plugins-1.3.0/plugins: check_users.o
+Only in nagios-plugins-1.3.0/plugins: check_vsz
+Only in nagios-plugins-1.3.0/plugins: check_vsz.o
+Only in nagios-plugins-1.3.0/plugins: common.h
+Only in nagios-plugins-1.3.0/plugins: config.h
+Only in nagios-plugins-1.3.0/plugins: negate
+Only in nagios-plugins-1.3.0/plugins: negate.o
+Only in nagios-plugins-1.3.0/plugins: netutils.h
+Only in nagios-plugins-1.3.0/plugins: netutils.o
+Only in nagios-plugins-1.3.0/plugins: perf.patch
+Only in nagios-plugins-1.3.0/plugins: popen.h
+Only in nagios-plugins-1.3.0/plugins: popen.o
+Only in nagios-plugins-1.3.0/plugins: stamp-h1
+Only in nagios-plugins-1.3.0/plugins: stamp-h2
+Only in nagios-plugins-1.3.0/plugins: stamp-h3
+Only in nagios-plugins-1.3.0/plugins: stamp-h4
+Only in nagios-plugins-1.3.0/plugins: stamp-h5
+Only in nagios-plugins-1.3.0/plugins: stamp-h6
+Common subdirectories: nagios-plugins-1.3.0-orig/plugins/t and nagios-plugins-1.3.0/plugins/t
+Only in nagios-plugins-1.3.0/plugins: urlize
+Only in nagios-plugins-1.3.0/plugins: urlize.o
+Only in nagios-plugins-1.3.0/plugins: utils.h
+Only in nagios-plugins-1.3.0/plugins: utils.o
+Only in nagios-plugins-1.3.0/plugins: version.h
diff --git a/web/attachments/50795-perf.patch b/web/attachments/50795-perf.patch
new file mode 100644
index 0000000..feaa2fc
--- /dev/null
+++ b/web/attachments/50795-perf.patch
@@ -0,0 +1,329 @@
+Only in nagios-client/nagios-plugins-1.3.0/plugins: Makefile
+diff -u nagios-plugins-1.3.0-orig/plugins/check_disk.c nagios-client/nagios-plugins-1.3.0/plugins/check_disk.c
+--- nagios-plugins-1.3.0-orig/plugins/check_disk.c      2003-02-15 13:48:44.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_disk.c     2003-05-20 12:51:58.000000000 +0200
+@@ -28,6 +28,8 @@
+  *     initailize usp to -1, eliminate 'found' variable
+  *     accept any filename/filesystem
+  *     use sscanf, drop while loop
++ *  - Modification by www.datux.nl 2003-01-24
++ *     added performance data output
+  *
+  *****************************************************************************/
+ 
+@@ -64,6 +66,9 @@
+        int total_disk = -1;
+        int used_disk = -1;
+        int free_disk = -1;
++       int perf_total_disk = 0;
++       int perf_free_disk = 0;
++       int perf_used_disk = 0;
+        int result = STATE_UNKNOWN;
+        int disk_result = STATE_UNKNOWN;
+        char *command_line = "";
+@@ -96,6 +101,7 @@
+                if (!index (input_buffer, '/'))
+                        continue;
+ 
++               /* did we get some usefull output from the 'df' process? */
+                if (sscanf (input_buffer, "%s %d %d %d %d%% %s", file_system,
+                     &total_disk, &used_disk, &free_disk, &usp, mntp) == 6 ||
+                    sscanf (input_buffer, "%s %*s %d %d %d %d%% %s", file_system,
+@@ -118,6 +124,9 @@
+                                          free_disk, 100 - usp, display_mntp ? mntp : file_system);
+ 
+                        result = max_state (result, disk_result);
++                       perf_total_disk+=total_disk;
++                       perf_free_disk+=free_disk;
++                       perf_used_disk+=used_disk;
+                }
+ 
+                else {
+@@ -147,8 +156,14 @@
+        else if (result == STATE_UNKNOWN)
+                printf ("Unable to read output\n%s\n%s\n", command_line, input_buffer);
+        else
+-               printf ("DISK %s%s\n", state_text (result), output);
+-
++               printf ("DISK %s%s|total=%d,used=%d,free=%d,used_perc=%f,free_perc=%f\n", 
++                   state_text (result), 
++                   output, 
++                   perf_total_disk, 
++                   perf_used_disk, 
++                   perf_free_disk, 
++                   100-((float)perf_free_disk*100/(float)perf_total_disk),
++                   ((float)perf_free_disk*100/(float)perf_total_disk));
+        return result;
+ }
+ 
+diff -u nagios-plugins-1.3.0-orig/plugins/check_http.c nagios-client/nagios-plugins-1.3.0/plugins/check_http.c
+--- nagios-plugins-1.3.0-orig/plugins/check_http.c      2003-02-22 08:22:02.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_http.c     2003-05-20 12:51:58.000000000 +0200
+@@ -21,6 +21,9 @@
+  *
+  * $Id: perf.patch,v 1.1 2003/05/20 17:45:04 psy Exp $
+  *
++ * Sun Feb  9 17:11:53 CET 2003 Modified by Edwin Eefting (edwin@datux.nl)
++ *                             fixed performance data: no spaces please :)
++ *
+  *****************************************************************************/
+ 
+ const char *progname = "check_http";
+@@ -795,7 +798,7 @@
+                        else if (onredirect == STATE_CRITICAL)
+                                printf ("HTTP CRITICAL");
+                        elapsed_time = delta_time (tv);
+-                       asprintf (&msg, ": %s - %7.3f second response time %s%s|time=%7.3f\n",
++                       asprintf (&msg, ": %s - %7.3f second response time %s%s|time=%f\n",
+                                 status_line, elapsed_time, timestamp,
+                           (display_html ? "</A>" : ""), elapsed_time);
+                        terminate (onredirect, msg);
+@@ -807,7 +810,7 @@
+                
+        /* check elapsed time */
+        elapsed_time = delta_time (tv);
+-       asprintf (&msg, "HTTP problem: %s - %7.3f second response time %s%s|time=%7.3f\n",
++       asprintf (&msg, "HTTP problem: %s - %7.3f second response time %s%s|time=%f\n",
+                       status_line, elapsed_time, timestamp,
+                       (display_html ? "</A>" : ""), elapsed_time);
+        if (check_critical_time == TRUE && elapsed_time > critical_time)
+@@ -835,14 +838,14 @@
+        if (strlen (regexp)) {
+                errcode = regexec (&preg, page, REGS, pmatch, 0);
+                if (errcode == 0) {
+-                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++                       printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%f\n",
+                                status_line, elapsed_time,
+                                timestamp, (display_html ? "</A>" : ""), elapsed_time);
+                        exit (STATE_OK);
+                }
+                else {
+                        if (errcode == REG_NOMATCH) {
+-                               printf ("HTTP CRITICAL: pattern not found%s|time=%7.3f\n",
++                               printf ("HTTP CRITICAL: pattern not found%s|time=%f\n",
+                                        (display_html ? "</A>" : ""), elapsed_time);
+                                exit (STATE_CRITICAL);
+                        }
+@@ -856,7 +859,7 @@
+ #endif
+ 
+        /* We only get here if all tests have been passed */
+-       asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
++       asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%f\n",
+                        status_line, (float)elapsed_time,
+                        timestamp, (display_html ? "</A>" : ""), elapsed_time);
+        terminate (STATE_OK, msg);
+Only in nagios-client/nagios-plugins-1.3.0/plugins: check_http.c.rej
+Only in nagios-client/nagios-plugins-1.3.0/plugins: check_http.c~
+diff -u nagios-plugins-1.3.0-orig/plugins/check_load.c nagios-client/nagios-plugins-1.3.0/plugins/check_load.c
+--- nagios-plugins-1.3.0-orig/plugins/check_load.c      2003-02-18 23:16:06.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_load.c     2003-05-20 18:59:25.000000000 +0200
+@@ -19,6 +19,9 @@
+  *                mods by Ethan Galstad (nagios@nagios.org)
+  * 08/18/1999 - Integrated some code with common plugin utilities
+  *                mods by Ethan Galstad (nagios@nagios.org)
++ * 20/01/2003 - Now returns performance data 
++ *                mods by Edwin Eefting (www.DatuX.nl)
++ *
+  * $Date: 2003/05/20 17:45:04 $
+  * Note: The load format is the same used by "uptime" and "w"
+  *
+@@ -132,13 +135,15 @@
+ #endif
+                return STATE_UNKNOWN;
+        }
+-       asprintf(&status_line, "load average: %.2f, %.2f, %.2f", la1, la5, la15);
++       asprintf(&status_line, "load average: %.2f, %.2f, %.2f|load1=%.2f,load5=%.2f,load15=%.2f", la1, la5, la15, la1, la5, la15);
+        if ((la1 >= cload1) || (la5 >= cload5) || (la15 >= cload15)) {
+                printf("CRITICAL - %s\n", status_line);
+                return STATE_CRITICAL;
+        }
+        if ((la1 >= wload1) || (la5 >= wload5) || (la15 >= wload15)) {
+                printf ("WARNING - %s\n", status_line);
++
++
+                return STATE_WARNING;
+        }
+        printf ("OK - %s\n", status_line);
+diff -u nagios-plugins-1.3.0-orig/plugins/check_ping.c nagios-client/nagios-plugins-1.3.0/plugins/check_ping.c
+--- nagios-plugins-1.3.0-orig/plugins/check_ping.c      2003-02-15 13:48:45.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_ping.c     2003-05-20 12:51:58.000000000 +0200
+@@ -8,6 +8,10 @@
+ *
+ * $Id: perf.patch,v 1.1 2003/05/20 17:45:04 psy Exp $
+ *
++* updated Mon Jan 20 19:03:57 CET 2003 by Edwin Eefting (DatuX.nl)
++*  -minor bugfixes
++*  -now returns performance data
++*
+ *****************************************************************************/
+ 
+ const char *progname = "check_ping";
+@@ -18,7 +22,7 @@
+ #define SUMMARY "Use ping to check connection statistics for a remote host.\n"
+ 
+ #define OPTIONS "\
+--H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
++-H <host_address> -w <wrta>,<wpl>% -c <crta>,<cpl>%\n\
+        [-p packets] [-t timeout] [-L]\n"
+ 
+ #define LONGOPTIONS "\
+@@ -135,14 +139,19 @@
+                                                state_text (result), warn_text, pl, rta);
+        if (display_html == TRUE)
+                printf ("</A>");
+-       printf ("\n");
++
++       /* print performance data */
++       printf("|loss=%d",pl);
++       if (pl != 100)
++           printf(",rta=%f",rta);
++       printf("\n");
+ 
+        if (verbose)
+                printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
+ 
+        return result;
+ }
+-
++
+ 
+ /* process command-line arguments */
+ int
+@@ -340,7 +349,7 @@
+        if (max_packets == -1)
+                max_packets = DEFAULT_MAX_PACKETS;
+ 
+-       max_seconds = crta / 1000.0 * max_packets + max_packets;
++       max_seconds = crta / 1000.0 * max_packets + max_packets + 10;
+        if (max_seconds > timeout_interval)
+                timeout_interval = (int)max_seconds;
+ 
+diff -u nagios-plugins-1.3.0-orig/plugins/check_procs.c nagios-client/nagios-plugins-1.3.0/plugins/check_procs.c
+--- nagios-plugins-1.3.0-orig/plugins/check_procs.c     2003-02-15 13:48:45.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_procs.c    2003-05-20 12:51:58.000000000 +0200
+@@ -32,6 +32,9 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
++* feb-9-2003 modified by Edwin Eefting (www.DatuX.nl)  edwin@datux.nl
++*            returns performance data
++*
+ ******************************************************************************/
+ 
+ const char *progname = "check_procs";
+@@ -197,6 +200,9 @@
+                return result;
+        }
+ 
++       //add performance data to "format string"
++       asprintf(&fmt,"%s|procs=%d\n",fmt,procs);
++       
+        if (verbose && (options & STAT))
+                printf ("%s ", statopts);
+        if (verbose && (options & PROG))
+@@ -427,6 +433,7 @@
+                options |= STAT;
+        }
+ 
++
+        return validate_arguments ();
+ }
+ 
+@@ -457,10 +464,10 @@
+ 
+        if (options == 0) {
+                options = 1;
+-               asprintf (&fmt, "%%s - %%d processes running\n");
++               asprintf (&fmt, "%%s - %%d processes running");
+        }
+        else {
+-               asprintf (&fmt, "%%s - %%d processes running with %s\n", fmt);
++               asprintf (&fmt, "%%s - %%d processes running with %s", fmt);
+        }
+ 
+        return options;
+diff -u nagios-plugins-1.3.0-orig/plugins/check_swap.c nagios-client/nagios-plugins-1.3.0/plugins/check_swap.c
+--- nagios-plugins-1.3.0-orig/plugins/check_swap.c      2003-02-18 06:35:52.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_swap.c     2003-05-20 14:02:11.000000000 +0200
+@@ -23,6 +23,9 @@
+  *
+  * $Id: perf.patch,v 1.1 2003/05/20 17:45:04 psy Exp $
+  *
++ * feb 9 2003 - Modified by Edwin Eefting (www.DatuX.nl) edwin@datux.nl
++ *              Returns performance data
++ *
+  *****************************************************************************/
+ 
+ #include "common.h"
+@@ -51,7 +54,7 @@
+ int
+ main (int argc, char **argv)
+ {
+-       int percent_used, percent;
++       float percent_used, percent;
+        long unsigned int total_swap = 0, used_swap = 0, free_swap = 0;
+        long unsigned int total, used, free;
+        int result = STATE_OK;
+@@ -93,8 +96,8 @@
+                result = max_state (STATE_CRITICAL, result);
+        else if (percent_used >= warn_percent || free_swap <= warn_size)
+                result = max_state (STATE_WARNING, result);
+-       asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
+-                 used_swap, total_swap);
++       asprintf (&status, "%s %2.0f%% (%lu out of %lu)|user_perc=%f,user=%d,total=%d", status, percent_used,
++                 used_swap, total_swap, percent_used, used_swap, total_swap);
+        fclose (fp);
+ #else
+ #ifdef HAVE_SWAP
+@@ -146,8 +149,8 @@
+                result = max_state (STATE_CRITICAL, result);
+        else if (percent_used >= warn_percent || free_swap <= warn_size)
+                result = max_state (STATE_WARNING, result);
+-       asprintf (&status, "%s %2d%% (%lu out of %lu)",
+-                                               status, percent_used, used_swap, total_swap);
++       asprintf (&status, "%s %2.0f%% (%lu out of %lu)|used_perc=%f,user=%d,total=%d",
++                                               status, percent_used, used_swap, total_swap, percent_used, used_swap, total_swap);
+ 
+        /* If we get anything on STDERR, at least set warning */
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+Only in nagios-client/nagios-plugins-1.3.0/plugins: check_swap.c.rej
+Only in nagios-client/nagios-plugins-1.3.0/plugins: check_swap.c~
+diff -u nagios-plugins-1.3.0-orig/plugins/check_users.c nagios-client/nagios-plugins-1.3.0/plugins/check_users.c
+--- nagios-plugins-1.3.0-orig/plugins/check_users.c     2003-02-15 13:48:46.000000000 +0100
++++ nagios-client/nagios-plugins-1.3.0/plugins/check_users.c    2003-05-20 12:51:58.000000000 +0200
+@@ -42,6 +42,9 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
++ * feb-9-2003 modified by Edwin Eefting (www.DatuX.nl) edwin@datux.nl
++ *           returns performance data
++ *
+  *****************************************************************************/
+ 
+ #include "common.h"
+@@ -120,8 +123,8 @@
+        if (result == STATE_UNKNOWN)
+                printf ("Unable to read output\n");
+        else
+-               printf ("USERS %s - %d users currently logged in\n", state_text (result),
+-                                               users);
++               printf ("USERS %s - %d users currently logged in|users=%d\n", state_text (result),
++                                               users,users);
+ 
+        return result;
+ }
+Only in nagios-client/nagios-plugins-1.3.0/plugins: common.h
+Only in nagios-client/nagios-plugins-1.3.0/plugins: config.h
+Only in nagios-client/nagios-plugins-1.3.0/plugins: netutils.h
+Only in nagios-client/nagios-plugins-1.3.0/plugins: perf.patch
+Only in nagios-client/nagios-plugins-1.3.0/plugins: popen.h
+Only in nagios-client/nagios-plugins-1.3.0/plugins: stamp-h1
+Only in nagios-client/nagios-plugins-1.3.0/plugins: stamp-h2
+Only in nagios-client/nagios-plugins-1.3.0/plugins: stamp-h3
+Only in nagios-client/nagios-plugins-1.3.0/plugins: stamp-h4
+Only in nagios-client/nagios-plugins-1.3.0/plugins: stamp-h5
+Only in nagios-client/nagios-plugins-1.3.0/plugins: stamp-h6
+Common subdirectories: nagios-plugins-1.3.0-orig/plugins/t and nagios-client/nagios-plugins-1.3.0/plugins/t
+Only in nagios-client/nagios-plugins-1.3.0/plugins: utils.h
+Only in nagios-client/nagios-plugins-1.3.0/plugins: version.h
diff --git a/web/attachments/50884-check_nwstat.c.diff b/web/attachments/50884-check_nwstat.c.diff
new file mode 100644
index 0000000..8e0b55a
--- /dev/null
+++ b/web/attachments/50884-check_nwstat.c.diff
@@ -0,0 +1,83 @@
+--- check_nwstat.old    2003-05-21 11:52:20.000000000 +0100
++++ check_nwstat.c      2003-05-21 12:58:12.000000000 +0100
+@@ -24,7 +24,7 @@
+  *****************************************************************************/
+ 
+ const char *progname = "check_nwstat";
+-#define REVISION "$Revision: 1.7 $"
++#define REVISION "$Revision: 1.8 $"
+ #define COPYRIGHT "Copyright (c) 1999-2001 Ethan Galstad"
+ 
+ #define SUMMARY "\
+@@ -69,6 +69,8 @@
+      DCB      = dirty cache buffers as a percentage of the total\n\
+      TCB      = dirty cache buffers as a percentage of the original\n\
+      UPTIME   = server uptime\n\
++     NLM:<nlm> = check if NLM is loaded (e.g. \"NLM:TSANDS.NLM\")\n\
++     NLMVER:<nlm> = check NLM version\n\
+ -w, --warning=INTEGER\n\
+   Threshold which will result in a warning status\n\
+ -c, --critical=INTEGER\n\
+@@ -127,11 +129,14 @@
+ #define CHECK_TCB           26 /* check total cache buffers as a percentage of the original */
+ #define CHECK_DSVER         27 /* check NDS version */
+ #define CHECK_UPTIME        28 /* check server uptime */
++#define CHECK_NLM           29 /* check NLM loaded */
++#define CHECK_NLMVER        30 /* check NLM version */
+ 
+ #define PORT 9999
+ 
+ char *server_address=NULL;
+ char *volume_name=NULL;
++char *nlm_name=NULL;
+ int server_port=PORT;
+ unsigned long warning_value=0L;
+ unsigned long critical_value=0L;
+@@ -702,6 +707,32 @@
+ 
+                asprintf(&output_message,"Up %s",recv_buffer);
+ 
++        } else if (vars_to_check==CHECK_NLM) {
++                asprintf(&send_buffer,"S23:%s\r\n",nlm_name);
++                result=process_tcp_request(server_address,server_port,send_buff\
++er,recv_buffer,sizeof(recv_buffer));
++                if(result!=STATE_OK)
++                        return result;
++                if(!strcmp(recv_buffer,"1\n")) {
++                        asprintf(&output_message,"Module %s is loaded",nlm_name);
++               } else {
++                       result=STATE_CRITICAL;
++                        asprintf(&output_message,"Module %s is not loaded",nlm_name);
++                }
++       } else if (vars_to_check==CHECK_NLMVER) {
++               asprintf(&send_buffer,"S24:%s\r\n",nlm_name);
++                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
++                if(result!=STATE_OK)
++                       return result;
++
++                recv_buffer[strlen(recv_buffer)-1]=0;
++                if(strcmp(recv_buffer,"-1")) {
++                        asprintf(&output_message,"%s version %s",nlm_name,recv_buffer);
++                } else {
++                       result=STATE_CRITICAL;
++                        asprintf(&output_message,"Module %s is not loaded",nlm_name);
++               }
++
+        } else {
+ 
+                output_message = strscpy(output_message,"Nothing to check!\n");
+@@ -875,6 +906,14 @@
+                                        vars_to_check=CHECK_DSVER;
+                                else if(!strcmp(optarg,"UPTIME"))
+                                        vars_to_check=CHECK_UPTIME;
++                               else if(strncmp(optarg,"NLM:",4)==0) {
++                                       vars_to_check=CHECK_NLM;
++                                       nlm_name=strscpy(nlm_name,optarg+4);
++                                }
++                               else if(strncmp(optarg,"NLMVER:",7)==0) {
++                                       vars_to_check=CHECK_NLMVER;
++                                        nlm_name=strscpy(nlm_name,optarg+7);
++                                }
+                                else
+                                        return ERROR;
+                                break;
diff --git a/web/attachments/50888-check_nwstat.c.diff b/web/attachments/50888-check_nwstat.c.diff
new file mode 100644
index 0000000..ec41c30
--- /dev/null
+++ b/web/attachments/50888-check_nwstat.c.diff
@@ -0,0 +1,65 @@
+--- check_nwstat.old    2003-05-21 11:52:20.000000000 +0100
++++ check_nwstat.c      2003-05-21 13:18:21.000000000 +0100
+@@ -24,7 +24,7 @@
+  *****************************************************************************/
+ 
+ const char *progname = "check_nwstat";
+-#define REVISION "$Revision: 1.7 $"
++#define REVISION "$Revision: 1.8 $"
+ #define COPYRIGHT "Copyright (c) 1999-2001 Ethan Galstad"
+ 
+ #define SUMMARY "\
+@@ -69,6 +69,7 @@
+      DCB      = dirty cache buffers as a percentage of the total\n\
+      TCB      = dirty cache buffers as a percentage of the original\n\
+      UPTIME   = server uptime\n\
++     NLM:<nlm> = check if NLM is loaded and report version (e.g. \"NLM:TSANDS.NLM\")\n\
+ -w, --warning=INTEGER\n\
+   Threshold which will result in a warning status\n\
+ -c, --critical=INTEGER\n\
+@@ -127,11 +128,13 @@
+ #define CHECK_TCB           26 /* check total cache buffers as a percentage of the original */
+ #define CHECK_DSVER         27 /* check NDS version */
+ #define CHECK_UPTIME        28 /* check server uptime */
++#define CHECK_NLM           29 /* check NLM loaded */
+ 
+ #define PORT 9999
+ 
+ char *server_address=NULL;
+ char *volume_name=NULL;
++char *nlm_name=NULL;
+ int server_port=PORT;
+ unsigned long warning_value=0L;
+ unsigned long critical_value=0L;
+@@ -702,6 +705,20 @@
+ 
+                asprintf(&output_message,"Up %s",recv_buffer);
+ 
++        } else if (vars_to_check==CHECK_NLM) {
++               asprintf(&send_buffer,"S24:%s\r\n",nlm_name);
++                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
++                if(result!=STATE_OK)
++                       return result;
++
++                recv_buffer[strlen(recv_buffer)-1]=0;
++                if(strcmp(recv_buffer,"-1")) {
++                        asprintf(&output_message,"Module %s version %s is loaded",nlm_name,recv_buffer);
++                } else {
++                       result=STATE_CRITICAL;
++                        asprintf(&output_message,"Module %s is not loaded",nlm_name);
++               }
++
+        } else {
+ 
+                output_message = strscpy(output_message,"Nothing to check!\n");
+@@ -875,6 +892,10 @@
+                                        vars_to_check=CHECK_DSVER;
+                                else if(!strcmp(optarg,"UPTIME"))
+                                        vars_to_check=CHECK_UPTIME;
++                               else if(strncmp(optarg,"NLM:",4)==0) {
++                                       vars_to_check=CHECK_NLM;
++                                       nlm_name=strscpy(nlm_name,optarg+4);
++                                }
+                                else
+                                        return ERROR;
+                                break;
diff --git a/web/attachments/50922-check_dns.c.patch b/web/attachments/50922-check_dns.c.patch
new file mode 100644
index 0000000..e1ea021
--- /dev/null
+++ b/web/attachments/50922-check_dns.c.patch
@@ -0,0 +1,27 @@
+*** check_dns.c?rev=1.13        Wed May 21 13:09:44 2003

+--- check_dns.c Wed May 21 13:13:13 2003

+***************

+*** 180,189 ****

+        }

+  

+        /* compare to expected address */

+!       if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {

+!               result = STATE_CRITICAL;

+!               asprintf(&output, "expected %s but got %s", expected_address, address);

+                }

+        

+        elapsed_time = delta_time (tv);

+  

+--- 180,191 ----

+        }

+  

+        /* compare to expected address */

+!       if (result == STATE_OK && match_expected_address) {

+!               if ((address == NULL) || strcmp(address, expected_address)) {

+!                       result = STATE_CRITICAL;

+!                       asprintf(&output, "expected %s but got %s", expected_address, address);

+                }

++       }

+        

+        elapsed_time = delta_time (tv);

+  

diff --git a/web/attachments/51758-check_softraid.pl b/web/attachments/51758-check_softraid.pl
new file mode 100644
index 0000000..22652a0
--- /dev/null
+++ b/web/attachments/51758-check_softraid.pl
@@ -0,0 +1,176 @@
+#!/usr/bin/perl -w
+#
+# check_softraid.pl - Nagios plugin to check software RAID status on Linux
+#
+#
+# Copyright (C) 2003  Kenny Root
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#
+# Report bugs to: kenny@the-b.org, nagiosplug-help@lists.sf.net
+#
+# 30-05-2003 Version 0.2
+#
+#
+
+use strict;
+use Getopt::Long;
+use lib "nagios/plugins";
+use utils qw($TIMEOUT %ERRORS &print_revision &support);
+use vars qw($PROGNAME $MDSTAT $VERSION $opt_h $opt_V $exitstatus $exitstring);
+Getopt::Long::Configure('bundling');
+
+$PROGNAME="check_softraid";
+$VERSION="0.2";
+$MDSTAT="/proc/mdstat";
+
+# Paranoia: clear out our environment variables.
+$ENV{'PATH'} = '';
+$ENV{'BASH_ENV'} = '';
+$ENV{'ENV'} = '';
+
+# Set the exit status to 0 (OK) until proven otherwise.
+$exitstatus = $ERRORS{'OK'};
+$exitstring = '';
+
+# Create a timeout in case we can't read the mdstat file.
+$SIG{'ALRM'} = sub {
+        print ("ERROR: Cannot read $MDSTAT\n");
+        exit $ERRORS{'UNKNOWN'};
+};
+alarm($TIMEOUT);
+
+GetOptions("V" => \$opt_V, "version" => \$opt_V,
+           "h" => \$opt_h, "help" => \$opt_h);
+
+# Print out the program version if requested.
+if ($opt_V) {
+        print_revision($PROGNAME,$VERSION);
+        exit $ERRORS{'OK'};
+}
+
+# Print usage information if requested.
+if ($opt_h) {
+        print_help();
+        exit $ERRORS{'OK'};
+}
+
+# Don't be tricked into opening a symlink.
+if (! -f $MDSTAT) {
+        print "$MDSTAT is not a regular file!\n";
+        exit $ERRORS{'UNKNOWN'};
+}
+
+open(MDSTAT, "< $MDSTAT");
+
+# Initialize the hash that will hold all the information about the status
+# of each RAID device.
+my %raid = ();
+
+while (readline(*MDSTAT)) {
+        chomp;
+
+        # Parse each line in the mdstat.  Each RAID device should have three
+        #  lines.  One for the personality and disk status, the second for
+        #  the RAID personality's status.  The third line is for things like
+        #  resync.
+        # md1 : active raid1 hda2[1] hdb2[2]
+        #       82348723 blocks [2/2] [UU]
+        #
+        if ($_ =~ /^(md[0-9]*) : ([^ ]*) ([^ ]*)( \(read-only\))? ([^\[]*\[.*)/) {
+                my $device = $1;
+                $raid{$device}{status} = $2;
+                $raid{$device}{personality} = $3;
+                my $diskstring = $5;
+
+                # Split the disk status string into each disk, record those
+                # into an array for possible parsing during the RAID status
+                # line.  Also record if they're flagged as faulty disks.
+                my @raiddisks = split(/ /, $diskstring);
+                for my $eachdisknum (0 .. $#raiddisks) {
+
+                        # Each disk status would like like "hda2[1]" or
+                        # "hda2[1](F)" for a faulty disk.
+                        if ($raiddisks[$eachdisknum] =~ /([^\[]*)\[([0-9]*)\](\(F\))?$/) {
+                                my $diskname = $1;
+                                push @{$raid{$device}{disks}}, $diskname;
+
+                                # Record if this device is marked as faulted.
+                                if (defined $3 and ($3 eq "(F)")) {
+                                        push @{$raid{$device}{faulted}}, $diskname;
+                                }
+                        }
+                }
+
+                # If the RAID device is active, the RAID personality should
+                # have a status message as the second line.  Let's parse that.
+                if ($raid{$device}{status} eq "active") {
+                        my $syncstatusline = <MDSTAT>;
+                        chomp $syncstatusline;
+
+                        # RAID1 and RAID5 personalities have a status line that
+                        # tells you whether you're out of sync or not.  Parse
+                        # that.
+                        if ($syncstatusline =~ / \[([0-9]*)\/([0-9]*)\] \[([^\]]*)\]/) {
+                                # Record the number of total disks, number of
+                                # disks operational, and compute the current
+                                # operational capacity.
+                                $raid{$device}{totaldisks} = $1;
+                                $raid{$device}{operationaldisks} = $2;
+                                $raid{$device}{capacity} = ($2 * 100) / $1;
+
+                                # Each operational disk is listed as "U"
+                                # while each out-of-sync disk is listed as "_"
+                                my $diskstatusstring = $3;
+                                my @diskstatuses = split //, $diskstatusstring;
+                                foreach my $disknumber (0 .. $#diskstatuses) {
+                                        if (substr($diskstatusstring, $disknumber, 1) eq "_") {
+                                                push @{$raid{$device}{desync}}, @{$raid{$device}{disks}}[$disknumber];
+                                        }
+                                }
+                        }
+                }
+        }
+}
+close(MDSTAT);
+
+foreach my $device (sort keys %raid) {
+        if ($raid{$device}{status} eq "active") {
+                if (exists $raid{$device}{faulted}) {
+                        $exitstring = $exitstring . "$device has faulted disks " . join(" ", @{$raid{$device}{faulted}}) . ". ";
+                        $exitstatus = $ERRORS{'CRITICAL'};
+                } elsif (exists $raid{$device}{desync}) {
+                        $exitstring = $exitstring . "$device has desynced disks " . join(" ", @{$raid{$device}{desync}}) . ". ";
+                        $exitstatus = $ERRORS{'WARNING'} if ($exitstatus != $ERRORS{'CRITICAL'});
+                }
+        }
+}
+
+if ($exitstring eq "") {
+        $exitstring = "All RAID disks OK.";
+}
+
+print $exitstring . "\n";
+exit $exitstatus;
+
+sub print_help {
+        printf "$PROGNAME plugin for Nagios monitors Linux's software RAID \n";
+        printf "status for the local machine.\n";
+        printf "\nUsage:\n";
+        printf "\t-V (--version)\tPlugin version\n";
+        printf "\t-h (--help)\tThis usage help.\n\n";
+        print_revision($PROGNAME, $VERSION);
+}
diff --git a/web/attachments/51759-nagios-plugins-1.3.0-softraid.patch b/web/attachments/51759-nagios-plugins-1.3.0-softraid.patch
new file mode 100644
index 0000000..db16ad5
--- /dev/null
+++ b/web/attachments/51759-nagios-plugins-1.3.0-softraid.patch
@@ -0,0 +1,86 @@
+diff -ur nagios-plugins-1.3.0/command.cfg.in nagios-plugins-1.3.0.new/command.cfg.in
+--- nagios-plugins-1.3.0/command.cfg.in 2003-02-15 06:48:38.000000000 -0600
++++ nagios-plugins-1.3.0.new/command.cfg.in     2003-05-30 15:16:04.000000000 -0500
+@@ -90,6 +90,7 @@
+ command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$
+ command[check_procs_zombie]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s Z
+ command[check_procs_httpd]=@libexecdir@/check_procs -w 5:$ARG1$ -c 1:$ARG2$ -C httpd
++command[check_softraid]=@libexecdir@/check_softraid
+ command[check_vsz]=@libexecdir@/check_vsz -w 8096 -c 16182 -C httpd
+ 
+ # An example of using check_by_ssh as an active service check
+diff -ur nagios-plugins-1.3.0/nagios-plugins.spec nagios-plugins-1.3.0.new/nagios-plugins.spec
+--- nagios-plugins-1.3.0/nagios-plugins.spec    2003-03-01 23:01:26.000000000 -0600
++++ nagios-plugins-1.3.0.new/nagios-plugins.spec        2003-05-30 15:14:58.000000000 -0500
+@@ -126,6 +126,7 @@
+ %{_prefix}/lib/nagios/plugins/check_rpc
+ %{_prefix}/lib/nagios/plugins/check_sensors
+ %{_prefix}/lib/nagios/plugins/check_smtp
++%{_prefix}/lib/nagios/plugins/check_softraid
+ %{_prefix}/lib/nagios/plugins/check_ssh
+ %{_prefix}/lib/nagios/plugins/check_swap
+ %{_prefix}/lib/nagios/plugins/check_tcp
+diff -ur nagios-plugins-1.3.0/nagios-plugins.spec.in nagios-plugins-1.3.0.new/nagios-plugins.spec.in
+--- nagios-plugins-1.3.0/nagios-plugins.spec.in 2003-03-01 22:40:29.000000000 -0600
++++ nagios-plugins-1.3.0.new/nagios-plugins.spec.in     2003-05-30 15:16:23.000000000 -0500
+@@ -126,6 +126,7 @@
+ %{_prefix}/lib/nagios/plugins/check_rpc
+ %{_prefix}/lib/nagios/plugins/check_sensors
+ %{_prefix}/lib/nagios/plugins/check_smtp
++%{_prefix}/lib/nagios/plugins/check_softraid
+ %{_prefix}/lib/nagios/plugins/check_ssh
+ %{_prefix}/lib/nagios/plugins/check_swap
+ %{_prefix}/lib/nagios/plugins/check_tcp
+Only in nagios-plugins-1.3.0.new/plugins-scripts: check_softraid.pl
+diff -ur nagios-plugins-1.3.0/plugins-scripts/Makefile.am nagios-plugins-1.3.0.new/plugins-scripts/Makefile.am
+--- nagios-plugins-1.3.0/plugins-scripts/Makefile.am    2003-02-15 06:48:49.000000000 -0600
++++ nagios-plugins-1.3.0.new/plugins-scripts/Makefile.am        2003-05-30 15:14:18.000000000 -0500
+@@ -6,11 +6,13 @@
+ 
+ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
+        check_log check_ntp check_oracle check_rpc check_sensors check_wave \
+-       check_ifstatus check_ifoperstatus check_mailq utils.sh utils.pm
++       check_ifstatus check_ifoperstatus check_mailq check_softraid \
++       utils.sh utils.pm
+ 
+ EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
+        check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
+-       check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl utils.sh.in utils.pm.in t
++       check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_softraid.pl \
++       utils.sh.in utils.pm.in t
+ 
+ TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)
+ 
+diff -ur nagios-plugins-1.3.0/plugins-scripts/Makefile.in nagios-plugins-1.3.0.new/plugins-scripts/Makefile.in
+--- nagios-plugins-1.3.0/plugins-scripts/Makefile.in    2003-03-01 23:01:26.000000000 -0600
++++ nagios-plugins-1.3.0.new/plugins-scripts/Makefile.in        2003-05-30 15:14:04.000000000 -0500
+@@ -130,12 +130,14 @@
+ 
+ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
+        check_log check_ntp check_oracle check_rpc check_sensors check_wave \
+-       check_ifstatus check_ifoperstatus check_mailq utils.sh utils.pm
++       check_ifstatus check_ifoperstatus check_mailq check_softraid \
++       utils.sh utils.pm
+ 
+ 
+ EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
+        check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
+-       check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl utils.sh.in utils.pm.in t
++       check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_softraid.pl \
++       utils.sh.in utils.pm.in t
+ 
+ 
+ TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
+diff -ur nagios-plugins-1.3.0/REQUIREMENTS nagios-plugins-1.3.0.new/REQUIREMENTS
+--- nagios-plugins-1.3.0/REQUIREMENTS   2003-02-28 22:45:51.000000000 -0600
++++ nagios-plugins-1.3.0.new/REQUIREMENTS       2003-05-30 15:16:55.000000000 -0500
+@@ -53,6 +53,9 @@
+        - Requires the NET-SNMP package available from 
+          http://net-snmp.sourceforge.net
+ 
++check_softraid:
++       - Requires Linux with MD softraid RAID compiled in.  Reads /proc/mdstat
++
+ check_ifstatus/check_ifoperstatus
+     - Requires Net::SNMP perl module
+           http://www.perl.com/CPAN/modules/by-authors/id/D/DT/DTOWN/
diff --git a/web/attachments/51804-check_dns.c.patch.rev2 b/web/attachments/51804-check_dns.c.patch.rev2
new file mode 100644
index 0000000..65334e8
--- /dev/null
+++ b/web/attachments/51804-check_dns.c.patch.rev2
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378819066" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378819066" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378819066" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378819066" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378819066');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=741296&group_id=29880&atid=397597&file_id=51804"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/52602-nagios.time.diff b/web/attachments/52602-nagios.time.diff
new file mode 100644
index 0000000..f6ccc62
--- /dev/null
+++ b/web/attachments/52602-nagios.time.diff
@@ -0,0 +1,89 @@
+--- /tmp/nagios-plugins-1.3.0/plugins/check_time.c      2003-02-15 23:48:46.000000000 +1100
++++ nagios-plugins-1.3.0/plugins/check_time.c   2003-06-06 10:43:32.000000000 +1000
+@@ -61,7 +61,7 @@
+ int check_critical_diff = FALSE;
+ int server_port = TIME_PORT;
+ char *server_address = NULL;
+-
++int use_udp = FALSE;
+ 
+ int process_arguments (int, char **);
+ void print_usage (void);
+@@ -85,7 +85,13 @@
+        time (&start_time);
+ 
+        /* try to connect to the host at the given port number */
+-       if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK) {
++       if (use_udp) {
++               result = my_udp_connect (server_address, server_port, &sd);
++       } else {
++               result = my_tcp_connect (server_address, server_port, &sd);
++       }
++
++       if (result != STATE_OK) {
+                if (check_critical_time == TRUE)
+                        result = STATE_CRITICAL;
+                else if (check_warning_time == TRUE)
+@@ -94,7 +100,21 @@
+                        result = STATE_UNKNOWN;
+                terminate (result,
+                           "TIME UNKNOWN - could not connect to server %s, port %d\n",
+-                          server_address, server_port);
++                          server_address, server_port);
++       }
++
++       if (use_udp) {
++               if (send (sd, "", 0, 0) < 0) {
++                       if (check_critical_time == TRUE)
++                               result = STATE_CRITICAL;
++                       else if (check_warning_time == TRUE)
++                               result = STATE_WARNING;
++                       else
++                               result = STATE_UNKNOWN;
++                       terminate (result,
++                                  "TIME UNKNOWN - could not send UDP request to server %s, port %d\n",
++                                  server_address, server_port);
++               }
+        }
+ 
+        /* watch for the connection string */
+@@ -170,6 +190,7 @@
+                {"timeout", required_argument, 0, 't'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
++               {"udp", no_argument, 0, 'u'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -193,10 +214,10 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "hVH:w:c:W:C:p:t:", long_options,
++                       getopt_long (argc, argv, "hVH:w:c:W:C:p:t:u", long_options,
+                                                                         &option_index);
+ #else
+-               c = getopt (argc, argv, "hVH:w:c:W:C:p:t:");
++               c = getopt (argc, argv, "hVH:w:c:W:C:p:t:u");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -275,6 +296,9 @@
+                                usage ("Timeout interval must be a nonnegative integer\n");
+                        socket_timeout = atoi (optarg);
+                        break;
++               case 'u':
++               /* udp */
++                       use_udp = TRUE;
+                }
+        }
+ 
+@@ -338,6 +362,8 @@
+                 "    Seconds before connection times out (default: %d)\n"
+                 " -p, --port=INTEGER\n"
+                 "    Port number (default: %d)\n"
++                " -u, --udp\n"
++                "    Use UDP to connect, not TCP\n"
+                 " -h, --help\n"
+                 "    Print detailed help screen\n"
+                 " -V, --version\n"
diff --git a/web/attachments/52944-patches.txt b/web/attachments/52944-patches.txt
new file mode 100644
index 0000000..165ac93
--- /dev/null
+++ b/web/attachments/52944-patches.txt
@@ -0,0 +1,39 @@
+--- src/nagios-plugins-1.3.0/configure.in       2003-03-01 20:58:12.000000000 -0800

++++ configure.in        2003-06-11 14:38:45.444708000 -0700

+@@ -145,11 +145,13 @@

+

+ dnl Check for radius libraries

+ _SAVEDLIBS="$LIBS"

+-AC_CHECK_LIB(radiusclient,rc_read_config)

++AC_CHECK_LIB(radiusclient,rc_read_config,,,$SOCKETLIBS)

+ if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then

+   EXTRAS="$EXTRAS check_radius"

+-       RADIUSLIBS="-lradiusclient"

++       RADIUSLIBS="-lradiusclient $SOCKETLIBS"

++       RADIUSINCLUDE="-I/usr/local/include"

+   AC_SUBST(RADIUSLIBS)

++  AC_SUBST(RADIUSINCLUDE)

+ else

+   AC_MSG_WARN([Skipping radius plugin])

+   AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])

+

+

+

+

+

+

+

+

+

+

+--- src/nagios-plugins-1.3.0/plugins/Makefile.am        2003-02-18 23:15:52.000000000 -0800

++++ Makefile.am 2003-06-11 14:28:22.318808000 -0700

+@@ -2,7 +2,7 @@

+

+ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t

+

+-INCLUDES = -I.. -I$(top_srcdir)/lib @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@

++INCLUDES = -I.. -I$(top_srcdir)/lib @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@

+

+ libexec_PROGRAMS = check_disk check_dummy check_http check_load \

+        check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \

diff --git a/web/attachments/52959-check_ldap.patch b/web/attachments/52959-check_ldap.patch
new file mode 100644
index 0000000..dac7767
--- /dev/null
+++ b/web/attachments/52959-check_ldap.patch
@@ -0,0 +1,121 @@
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
+retrieving revision 1.81
+diff -u -r1.81 configure.in
+--- configure.in        12 Jun 2003 04:16:34 -0000      1.81
++++ configure.in        12 Jun 2003 23:03:02 -0000
+@@ -206,6 +206,7 @@
+   LDAPINCLUDE="-I/usr/include/ldap"
+   AC_SUBST(LDAPLIBS)
+   AC_SUBST(LDAPINCLUDE)
++  AC_CHECK_FUNCS(ldap_set_option)
+   EXTRAS="$EXTRAS check_ldap"
+ else
+   AC_MSG_WARN([Skipping LDAP plugin])
+Index: plugins/check_ldap.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
+retrieving revision 1.6
+diff -u -r1.6 check_ldap.c
+--- plugins/check_ldap.c        12 Mar 2003 02:25:22 -0000      1.6
++++ plugins/check_ldap.c        12 Jun 2003 23:03:02 -0000
+@@ -34,6 +34,9 @@
+ enum {
+        UNDEFINED = -1,
+        DEFAULT_PORT = 389
++#ifdef HAVE_LDAP_SET_OPTION
++       , DEFAULT_PROTOCOL = 2
++#endif
+ };
+ 
+ int process_arguments (int, char **);
+@@ -48,6 +51,9 @@
+ char *ld_passwd = NULL;
+ char *ld_binddn = NULL;
+ unsigned int ld_port = DEFAULT_PORT;
++#ifdef HAVE_LDAP_SET_OPTION
++int ld_protocol = DEFAULT_PROTOCOL;
++#endif
+ int warn_time = UNDEFINED;
+ int crit_time = UNDEFINED;
+ 
+@@ -80,6 +86,14 @@
+                return STATE_CRITICAL;
+        }
+ 
++#ifdef HAVE_LDAP_SET_OPTION
++       /* set ldap options */
++       if (ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &ld_protocol) !=
++                       LDAP_OPT_SUCCESS ) {
++               printf("Could not set protocol version %d\n", ld_protocol);
++               return STATE_CRITICAL;
++       }
++#endif
+        /* bind to the ldap server */
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+                        LDAP_SUCCESS) {
+@@ -141,6 +155,10 @@
+                {"attr", required_argument, 0, 'a'},
+                {"bind", required_argument, 0, 'D'},
+                {"pass", required_argument, 0, 'P'},
++#ifdef HAVE_LDAP_SET_OPTION
++               {"ver2", no_argument, 0, '2'},
++               {"ver3", no_argument, 0, '3'},
++#endif
+                {"port", required_argument, 0, 'p'},
+                {"warn", required_argument, 0, 'w'},
+                {"crit", required_argument, 0, 'c'},
+@@ -156,7 +174,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVt:c:w:H:b:p:a:D:P:", longopts, &option_index);
++               c = getopt_long (argc, argv, "hV23t:c:w:H:b:p:a:D:P:", longopts, &option_index);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -197,6 +215,14 @@
+                case 'c':
+                        crit_time = atoi (optarg);
+                        break;
++#ifdef HAVE_LDAP_SET_OPTION
++               case '2':
++                       ld_protocol = 2;
++                       break;
++               case '3':
++                       ld_protocol = 3;
++                       break;
++#endif
+                default:
+                        usage ("check_ldap: could not parse unknown arguments\n");
+                        break;
+@@ -244,9 +270,18 @@
+                 "\t-D [--bind] ... ldap bind DN (if required)\n"
+                 "\t-P [--pass] ... ldap password (if required)\n"
+                 "\t-p [--port] ... ldap port (default: %d)\n"
++#ifdef HAVE_LDAP_SET_OPTION
++                "\t-2 [--ver2] ... use ldap porotocol version 2\n"
++                "\t-3 [--ver3] ... use ldap porotocol version 3\n"
++                "\t\t(default protocol version: %d)\n"
++#endif
+                 "\t-w [--warn] ... time in secs. - if the exceeds <warn> the STATE_WARNING will be returned\n"
+                 "\t-c [--crit] ... time in secs. - if the exceeds <crit> the STATE_CRITICAL will be returned\n"
+-                "\n", DEFAULT_PORT);
++                "\n", DEFAULT_PORT
++#ifdef HAVE_LDAP_SET_OPTION
++                    , DEFAULT_PROTOCOL
++#endif
++               );
+ }
+ 
+ 
+@@ -256,5 +291,8 @@
+        printf
+                ("Usage: %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]\n"
+                 "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
++#ifdef HAVE_LDAP_SET_OPTION
++                "         [-2|-3]\n"
++#endif
+                 "(Note: all times are in seconds.)\n", progname);
+ }
diff --git a/web/attachments/54764-check_procs.c.diff b/web/attachments/54764-check_procs.c.diff
new file mode 100644
index 0000000..89171ae
--- /dev/null
+++ b/web/attachments/54764-check_procs.c.diff
@@ -0,0 +1,16 @@
+Index: check_procs.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_procs.c,v
+retrieving revision 1.15
+diff -u -3 -r1.15 check_procs.c
+--- check_procs.c       11 Apr 2003 23:47:39 -0000      1.15
++++ check_procs.c       2 Jul 2003 16:04:21 -0000
+@@ -204,6 +204,8 @@
+                /* Zombie processes do not give a procprog command */
+                if ( cols == 6 && strstr(procstat, zombie) ) {
+                        cols = 7;
++                       input_buffer[pos] = '\n';
++                       input_buffer[pos+1] = 0x0;
+                }
+                if ( cols >= 7 ) {
+                        resultsum = 0;
diff --git a/web/attachments/55352-check_mailq.pl.diff b/web/attachments/55352-check_mailq.pl.diff
new file mode 100644
index 0000000..0af115b
--- /dev/null
+++ b/web/attachments/55352-check_mailq.pl.diff
@@ -0,0 +1,65 @@
+--- check_mailq.pl.org  2003-07-09 15:09:26.000000000 +0200
++++ check_mailq.pl      2003-07-09 15:06:47.000000000 +0200
+@@ -462,8 +462,43 @@
+ 
+ 
+ } # end of ($mailq eq "qmail")
++elsif ( $mailq eq "exim" ) {
++       ## open mailq 
++       if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
++               if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
++                       print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
++                       exit $ERRORS{'UNKNOWN'};
++               }
++       }elsif( defined $utils::PATH_TO_MAILQ){
++               unless (-x $utils::PATH_TO_MAILQ) {
++                       print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
++                       exit $ERRORS{'UNKNOWN'};
++               }
++       } else {
++               print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
++               exit $ERRORS{'UNKNOWN'};
++       }
+ 
+-
++       while (<MAILQ>) {
++           #22m  1.7K 19aEEr-0007hx-Dy <> *** frozen ***
++            #root@exlixams.glups.fr
++
++           if (/\s[\w\d]{6}-[\w\d]{6}-[\w\d]{2}\s/) { # message id 19aEEr-0007hx-Dy
++               $msg_q++ ;
++           }
++       }
++       close(MAILQ) ;
++       if ($msg_q < $opt_w) {
++               $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
++               $state = $ERRORS{'OK'};
++       }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
++               $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
++               $state = $ERRORS{'WARNING'};
++       }else {
++               $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
++               $state = $ERRORS{'CRITICAL'};
++       }
++} # end of ($mailq eq "exim")
+ 
+ # Perfdata support
+ print "$msg |mailq=$msg_q\n";
+@@ -526,7 +561,7 @@
+        }
+ 
+        if (defined $opt_M) {
+-               if ($opt_M =~ /sendmail/ || $opt_M =~ /qmail/ || $opt_M =~ /postfix/ ) {
++               if ($opt_M =~ /sendmail|qmail|postfix|exim/) {
+                        $mailq = $opt_M ;
+                }elsif( $opt_M eq ''){
+                        $mailq = 'sendmail';
+@@ -558,7 +593,7 @@
+        print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
+        print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+        print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
+-       print "-M (--mailserver) = [ sendmail | qmail | postfix ] (default = sendmail)\n";
++       print "-M (--mailserver) = [ sendmail | qmail | postfix | exim ] (default = sendmail)\n";
+        print "-h (--help)\n";
+        print "-V (--version)\n";
+        print "-v (--verbose)   = debugging output\n";
diff --git a/web/attachments/55482-check_smtp.patch b/web/attachments/55482-check_smtp.patch
new file mode 100644
index 0000000..4ce0629
--- /dev/null
+++ b/web/attachments/55482-check_smtp.patch
@@ -0,0 +1,287 @@
+Index: check_smtp.c
+===================================================================
+RCS file: /usr/local/cvs/root/nagios-plugins/plugins/check_smtp.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -r1.1.1.1 -r1.2
+--- check_smtp.c        3 Jul 2003 23:27:44 -0000       1.1.1.1
++++ check_smtp.c        3 Jul 2003 23:35:52 -0000       1.2
+@@ -69,12 +69,80 @@
+ char *server_address = NULL;
+ char *server_expect = NULL;
+ char *from_arg = " ";
++char *authtype = NULL;
++char *authuser = NULL;
++char *authpass = NULL;
+ int warning_time = 0;
+ int check_warning_time = FALSE;
+ int critical_time = 0;
+ int check_critical_time = FALSE;
+ int verbose = FALSE;
+ 
++/* encode64 routine from http://www.experts-exchange.com/Programming/Programming_Languages/C/Q_20245582.html */
++
++/* #define OK                  (0) */
++/* #define FAIL                (-1) */
++#define BUFOVER             (-2)
++#define CHAR64(c)           (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
++static char     basis_64[] =
++"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????";
++static char     index_64[128] = {
++  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
++  52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
++  -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
++  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
++  -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
++  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
++};
++
++static int
++encode64(const char *_in, unsigned inlen, char *_out, unsigned outmax, unsigned *outlen)
++{
++
++  const unsigned char *in = (const unsigned char *) _in;
++  unsigned char  *out = (unsigned char *) _out;
++  unsigned char   oval;
++  char           *blah;
++  unsigned        olen;
++
++  olen = (inlen + 2) / 3 * 4;
++  if (outlen)
++      *outlen = olen;
++  if (outmax < olen)
++      return BUFOVER;
++
++  blah = (char *) out;
++  while (inlen >= 3)
++  {
++/* user provided max buffer size; make sure we don't go over it */
++      *out++ = basis_64[in[0] >> 2];
++      *out++ = basis_64[((in[0] << 4) & 0x30) | (in[1] >> 4)];
++      *out++ = basis_64[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
++      *out++ = basis_64[in[2] & 0x3f];
++      in += 3;
++      inlen -= 3;
++  }
++  if (inlen > 0)
++  {
++/* user provided max buffer size; make sure we don't go over it */
++      *out++ = basis_64[in[0] >> 2];
++      oval = (in[0] << 4) & 0x30;
++      if (inlen > 1)
++          oval |= in[1] >> 4;
++      *out++ = basis_64[oval];
++      *out++ = (inlen < 2) ? '=' : basis_64[(in[1] << 2) & 0x3c];
++      *out++ = '=';
++  }
++
++  if (olen < outmax)
++      *out = '\0';
++
++  return OK;
++
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -151,14 +219,19 @@
+                                                                 && (end_time - start_time) > warning_time) result =
+                                                STATE_WARNING;
+ 
+-                               if (verbose == TRUE)
+-                                       printf ("SMTP %s - %d sec. response time, %s\n",
++                               if (authtype == NULL) {
++                                       if (verbose == TRUE)
++                                               printf ("SMTP %s - %d sec. response time, %s\n",
+                                                                        state_text (result), (int) (end_time - start_time), buffer);
+-                               else
+-                                       printf ("SMTP %s - %d second response time\n", state_text (result),
++                                       else
++                                               printf ("SMTP %s - %d second response time\n", state_text (result),
+                                                                        (int) (end_time - start_time));
++                               }
+                        }
+                }
++       }
++
++       if (result == STATE_OK) {
+ 
+                /* close the connection */
+ 
+@@ -168,6 +241,112 @@
+                /* allow for response to helo command to reach us */
+                recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+                                
++               if (authtype != NULL) {
++                       if (strcmp (authtype, "LOGIN") == 0) {
++                               if (authuser == NULL) {
++                                       result = STATE_CRITICAL;
++                                       printf ("SMTP %s - no authuser specified\n", state_text (result));
++                               } else if (authpass == NULL) {
++                                       result = STATE_CRITICAL;
++                                       printf ("SMTP %s - no authpass specified\n", state_text (result));
++                               } else {
++                                       char abuf[MAX_INPUT_BUFFER];
++                                       unsigned alen;
++                                       int ret;
++                                       do {
++                                               send(sd, "AUTH LOGIN\r\n", strlen("AUTH LOGIN\r\n"), 0);
++                                               if (verbose == TRUE) {
++                                                       printf ("sent AUTH LOGIN\n");
++                                               }
++                                               if ((ret = recv(sd, buffer, MAX_INPUT_BUFFER-1, 0)) == -1) {
++                                                       result = STATE_WARNING;
++                                                       printf ("SMTP %s - recv() failed after AUTH LOGIN\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               buffer[ret] = 0;
++                                               if (verbose == TRUE) {
++                                                       printf ("received %s\n", buffer);
++                                               }
++                                               if (strncmp (buffer, "334", 3) != 0) {
++                                                       result = STATE_CRITICAL;
++                                                       printf ("SMTP %s - Invalid response received from host after AUTH LOGIN\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               if (encode64 (authuser, strlen(authuser), abuf, MAX_INPUT_BUFFER, &alen) != OK) {
++                                                       result = STATE_WARNING;
++                                                       printf ("SMTP %s - Failed to base64-encode authuser\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               strcat (abuf, "\r\n");
++                                               send(sd, abuf, strlen(abuf), 0);
++                                               if (verbose == TRUE) {
++                                                       printf ("sent %s\n", abuf);
++                                               }
++                                               if ((ret = recv(sd, buffer, MAX_INPUT_BUFFER-1, 0)) == -1) {
++                                                       result = STATE_WARNING;
++                                                       printf ("SMTP %s - recv() failed after sending authuser\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               buffer[ret] = 0;
++                                               if (verbose == TRUE) {
++                                                       printf ("received %s\n", buffer);
++                                               }
++                                               if (strncmp (buffer, "334", 3) != 0) {
++                                                       result = STATE_CRITICAL;
++                                                       printf ("SMTP %s - Invalid response received from host after authuser\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               if (encode64 (authpass, strlen(authpass), abuf, MAX_INPUT_BUFFER, &alen) != OK) {
++                                                       result = STATE_WARNING;
++                                                       printf ("SMTP %s - Failed to base64-encode authpass\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               strcat (abuf, "\r\n");
++                                               send(sd, abuf, strlen(abuf), 0);
++                                               if (verbose == TRUE) {
++                                                       printf ("sent %s\n", abuf);
++                                               }
++                                               if ((ret = recv(sd, buffer, MAX_INPUT_BUFFER-1, 0)) == -1) {
++                                                       result = STATE_WARNING;
++                                                       printf ("SMTP %s - recv() failed after sending authpass\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               buffer[ret] = 0;
++                                               if (verbose == TRUE) {
++                                                       printf ("received %s\n", buffer);
++                                               }
++                                               if (strncmp (buffer, "235", 3) != 0) {
++                                                       result = STATE_CRITICAL;
++                                                       printf ("SMTP %s - Invalid response received from host after authpass\n",
++                                                               state_text (result));
++                                                       break;
++                                               }
++                                               break;
++                                       } while (0);
++                                       if (result == STATE_OK) {
++                                               if (verbose == TRUE)
++                                                       printf ("SMTP %s - %d sec. response time, %s\n",
++                                                                       state_text (result), (int) (end_time - start_time), buffer);
++                                               else
++                                                       printf ("SMTP %s - %d second response time\n", state_text (result),
++                                                                       (int) (end_time - start_time));
++                                       }
++                               }
++                       } else {
++                               result = STATE_CRITICAL;
++                               printf ("SMTP %s - authtype %s is not supported\n", state_text (result), authtype);
++                       }
++               }
++       }
++
++       if (result == STATE_OK) {
+ #ifdef SMTP_USE_DUMMYCMD
+                send(sd, from_str, strlen(from_str), 0);
+ 
+@@ -211,6 +390,9 @@
+                {"warning", required_argument, 0, 'w'},
+                {"port", required_argument, 0, 'p'},
+                {"from", required_argument, 0, 'f'},
++               {"authtype", required_argument, 0, 'A'},
++               {"authuser", required_argument, 0, 'U'},
++               {"authpass", required_argument, 0, 'P'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+@@ -233,10 +415,10 @@
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+                c =
+-                       getopt_long (argc, argv, "+hVvt:p:f:e:c:w:H:", long_options,
++                       getopt_long (argc, argv, "+hVvt:p:f:e:c:w:H:A:U:P:", long_options,
+                                                                         &option_index);
+ #else
+-               c = getopt (argc, argv, "+?hVvt:p:f:e:c:w:H:");
++               c = getopt (argc, argv, "+?hVvt:p:f:e:c:w:H:A:U:P:");
+ #endif
+                if (c == -1 || c == EOF)
+                        break;
+@@ -261,6 +443,15 @@
+                case 'f':                                                                       /* from argument */
+                        from_arg = optarg;
+                        break;
++               case 'A':
++                       authtype = optarg;
++                       break;
++               case 'U':
++                       authuser = optarg;
++                       break;
++               case 'P':
++                       authpass = optarg;
++                       break;
+                case 'e':                                                                       /* server expect string on 220  */
+                        server_expect = optarg;
+                        break;
+@@ -355,6 +546,12 @@
+                 "   String to expect in first line of server response (default: %s)\n"
+                 " -f, --from=STRING\n"
+                 "   from address to include in MAIL command (default NULL, Exchange2000 requires one)\n"
++                " -A, --authtype=STRING\n"
++                "   SMTP AUTH type to check (default NULL, only LOGIN supported)\n"
++                " -U, --authuser=STRING\n"
++                "   SMTP AUTH username\n"
++                " -P, --authpass=STRING\n"
++                "   SMTP AUTH password\n"
+                 " -w, --warning=INTEGER\n"
+                 "   Seconds necessary to result in a warning status\n"
+                 " -c, --critical=INTEGER\n"
+@@ -379,7 +576,7 @@
+ print_usage (void)
+ {
+        printf
+-               ("Usage: %s -H host [-e expect] [-p port] [-f from addr] [-w warn] [-c crit] [-t timeout] [-v]\n"
++               ("Usage: %s -H host [-e expect] [-p port] [-A authtype -U authuser -P authpass] [-f from addr] [-w warn] [-c crit] [-t timeout] [-v]\n"
+                 "       %s --help\n"
+                 "       %s --version\n", progname, progname, progname);
+ }
diff --git a/web/attachments/56028-check_disk.patch b/web/attachments/56028-check_disk.patch
new file mode 100644
index 0000000..a29ebea
--- /dev/null
+++ b/web/attachments/56028-check_disk.patch
@@ -0,0 +1,53 @@
+Index: check_disk.c
+===================================================================
+RCS file: /usr/local/cvs/root/nagios-plugins/plugins/check_disk.c,v
+retrieving revision 1.1
+diff -u -u -r1.1 check_disk.c
+--- check_disk.c        3 Jul 2003 23:27:44 -0000       1.1
++++ check_disk.c        17 Jul 2003 02:29:24 -0000
+@@ -307,13 +310,18 @@
+ {
+        int result = STATE_UNKNOWN;
+        /* check the percent used space against thresholds */
+-       if (usp >= 0 && usp >= (100.0 - c_dfp))
++       /* Need to check the percent && the free space against thresholds */
++       if (c_dfp >= 0 && c_df >= 0 && usp >= 0 && usp >= (100.0 - c_dfp) && c_df >= 0 && free_disk <= c_df)
+                result = STATE_CRITICAL;
+-       else if (c_df >= 0 && free_disk <= c_df)
++       else if (c_df < 0 && usp >= 0 && usp >= (100.0 - c_dfp))
+                result = STATE_CRITICAL;
+-       else if (usp >= 0 && usp >= (100.0 - w_dfp))
++       else if (c_dfp < 0 && free_disk <= c_df)
++               result = STATE_CRITICAL;
++       else if (w_dfp >= 0 && w_df >= 0 && usp >= 0 && usp >= (100.0 - w_dfp) && w_df >= 0 && free_disk <= w_df)
++               result = STATE_WARNING;
++       else if (w_df < 0 && usp >= 0 && usp >= (100.0 - w_dfp))
+                result = STATE_WARNING;
+-       else if (w_df >= 0 && free_disk <= w_df)
++       else if (w_dfp < 0 && free_disk <= w_df)
+                result = STATE_WARNING;
+        else if (usp >= 0.0)
+                result = STATE_OK;
+@@ -328,7 +336,9 @@
+                ("Copyright (c) 2000 Ethan Galstad/Karl DeBisschop\n\n"
+                 "This plugin will check the percent of used disk space on a mounted\n"
+                 "file system and generate an alert if percentage is above one of the\n"
+-                "threshold values.\n\n");
++                "threshold values. You can also pass a percent and size thresholds\n" 
++                "separated by a : or , and both values will have to be met before a\n" 
++                "failure occurs\n\n");
+        print_usage ();
+        printf
+                ("\nOptions:\n"
+@@ -352,7 +362,10 @@
+                 "    Show details for command-line debugging (do not use with nagios server)\n"
+                 " -h, --help\n"
+                 "    Print detailed help screen\n"
+-                " -V, --version\n" "    Print version information\n\n");
++                " -V, --version\n" "    Print version information\n"
++                "Examples:\n"
++                       "./check_disk -w10%%:100000 -c5%%:50000 -p /\n"
++                       "Will require that the / partition have less than 10%% free space AND less than 100mb free\n\n");
+        support ();
+ }
+ 
diff --git a/web/attachments/56241-check_oracle.jjm b/web/attachments/56241-check_oracle.jjm
new file mode 100644
index 0000000..3142511
--- /dev/null
+++ b/web/attachments/56241-check_oracle.jjm
@@ -0,0 +1,590 @@
+#!/bin/sh
+#
+# latigid010@yahoo.com
+# 01/06/2000
+#
+#  This Nagios plugin was created to check Oracle status
+#
+
+PROGNAME=`basename $0`
+PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+REVISION=`echo '$Revision: 1.6 $' | sed -e 's/[^0-9.]//g'`
+
+. $PROGPATH/utils.sh
+
+
+function init_var() {
+RETURN_MSG=""
+CHECK_CACHE=no
+CHECK_DB=no
+CHECK_EXTENTS=no
+CHECK_LOGIN=no
+CHECK_NAMES=no
+CHECK_TS=no
+CHECK_TNS=no
+CRIT_LVL=-1
+WARN_LVL=-1
+ORACLE_SID=${ORACLE_SID}
+ORA_USER=""
+ORA_PASS=""
+ORA_TS=""
+ORA_HOST=""
+ORA_NAMES=""
+
+
+# Hunt down a reasonable ORACLE_HOME
+if [ -z "$ORACLE_HOME" ] ; then
+        # Adjust to taste
+        for oratab in /var/opt/oracle/oratab /etc/oratab
+        do
+        [ ! -f $oratab ] && continue
+        ORACLE_HOME=`IFS=:
+                while read SID ORACLE_HOME junk;
+                do
+                        if [ "$SID" = "$2" -o "$SID" = "*" ] ; then
+                                echo $ORACLE_HOME;
+                                exit;
+                        fi;
+                done < $oratab`
+        [ -n "$ORACLE_HOME" ] && break
+        done
+fi
+# Last resort
+[ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle
+
+if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then
+        echo "Cannot determine ORACLE_HOME for sid ${ORACLE_SID}"
+        exit ${STATE_UNKNOWN}
+fi
+PATH=$PATH:$ORACLE_HOME/bin
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
+export ORACLE_HOME PATH LD_LIBRARY_PATH
+}
+
+
+print_usage() {
+  echo "This check_oracle provides a new argument handling scheme."
+  echo "        To use the old scheme - add a "--" before any arguments"
+  echo "Old Usage:"
+  echo "  $PROGNAME --tns <Oracle Sid or Hostname/IP address>"
+  echo "  $PROGNAME --db <ORACLE_SID>"
+  echo "  $PROGNAME --login <ORACLE_SID>"
+  echo "  $PROGNAME --cache <ORACLE_SID> <USER> <PASS> <CRITICAL> <WARNING>"
+  echo "  $PROGNAME --extents <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
+  echo "  $PROGNAME --tablespace <ORACLE_SID> <USER> <PASS> <TABLESPACE> <CRITICAL> <WARNING>"
+  echo "  $PROGNAME --oranames <Hostname>"
+  echo "  $PROGNAME --help"
+  echo "  $PROGNAME --version"
+  echo "The new argument handling takes shorter args + allows chaining of checks"
+  echo "New Usage:"
+  echo "  $PROGNAME [args...]"
+  echo "        -c      Cache Check             -C <ARG>        Critical level"
+  echo "        -d      DB Check                -W <ARG>        Warning level"
+  echo "        -e      Extent Check"   
+  echo "        -l      Listener Check          -u <ARG>        User"
+  echo "        -n      Oranames check          -p <ARG>        Password"
+  echo "        -t      tns names check         -s <ARG>        oracle SID"
+  echo "        -T      Tablespace check        -H <ARG>        Host check"     
+  echo "                        -h      Help"
+}
+
+print_help() {
+  print_revision $PROGNAME $REVISION
+  echo ""
+  print_usage
+  echo ""
+  echo "Check Oracle status"
+  echo ""
+  echo "--tns SID/IP Address"
+  echo "   Check remote TNS server"
+  echo "--db SID"
+  echo "   Check local database (search /bin/ps for PMON process) and check"
+  echo "   filesystem for sgadefORACLE_SID.dbf"
+  echo "--login SID"
+  echo "   Attempt a dummy login and alert if not ORA-01017: invalid username/password"
+  echo "--cache"
+  echo "   Check local database for library and buffer cache hit ratios"
+  echo "       --->  Requires Oracle user/password and SID specified."
+  echo "                --->  Requires select on v_$sysstat and v_$librarycache"
+  echo "--extents"
+  echo "   Check to see if there are extents unable to be extended."
+  echo "--tablespace"
+  echo "   Check local database for tablespace capacity in ORACLE_SID"
+  echo "       --->  Requires Oracle user/password specified."
+  echo "                --->  Requires select on dba_data_files and dba_free_space"
+  echo "--oranames Hostname"
+  echo "   Check remote Oracle Names server"
+  echo "--help"
+  echo "   Print this help screen"
+  echo "--version"
+  echo "   Print version and license information"
+  echo ""
+  echo "If the plugin doesn't work, check that the ORACLE_HOME environment"
+  echo "variable is set, that ORACLE_HOME/bin is in your PATH, and the"
+  echo "tnsnames.ora file is locatable and is properly configured."
+  echo ""
+  echo "When checking local database status your ORACLE_SID is case sensitive."
+  echo ""
+  echo "If you want to use a default Oracle home, add in your oratab file:"
+  echo "*:/opt/app/oracle/product/7.3.4:N"
+  echo ""
+  support
+}
+
+
+check_cache() {
+    if [ ${CRIT_LVL} -gt ${WARN_LVL} ] ; then
+        RETURN_MSG="UNKNOWN - Warning level is less then Crit"
+        return ${STATE_UNKNOWN}
+    fi
+    result=`sqlplus -s ${ORA_USER}/${ORA_PASS}@${ORACLE_SID} << EOF
+set pagesize 0
+select (1-(pr.value/(dbg.value+cg.value)))*100
+from v\\$sysstat pr, v\\$sysstat dbg, v\\$sysstat cg
+where pr.name='physical reads'
+and dbg.name='db block gets'
+and cg.name='consistent gets';
+EOF`
+
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+      error=` echo "$result" | grep "ORA-" | head -1`
+      echo "CRITICAL - $error"
+      exit $STATE_CRITICAL
+    fi
+
+
+    buf_hr=`echo $result | awk '{print int($1)}'`
+    result=`sqlplus -s ${ORA_USER}/${ORA_PASS}@${ORACLE_SID} << EOF
+set pagesize 0
+select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
+from v\\$librarycache lc;
+EOF`
+
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+      error=` echo "$result" | grep "ORA-" | head -1`
+      echo "CRITICAL - $error"
+      exit $STATE_CRITICAL
+    fi
+
+    lib_hr=`echo $result | awk '{print int($1)}'`
+
+    if [ $buf_hr -le ${CRIT_LVL} -o $lib_hr -le ${CRIT_LVL} ] ; then
+        export RETURN_MSG="${ORACLE_SID} CRITICAL - Cache Hit Rates: $lib_hr% Lib -- $buf_hr% Buff"
+        exit $STATE_CRITICAL
+    fi
+    if [ $buf_hr -le ${WARN_LVL} -o $lib_hr -le ${WARN_LVL} ] ; then
+        export RETURN_MSG="${ORACLE_SID} WARNING  - Cache Hit Rates: $lib_hr% Lib -- $buf_hr% Buff"
+        exit $STATE_WARNING
+    fi
+    export RETURN_MSG="${ORACLE_SID} OK - Cache Hit Rates: $lib_hr% Lib -- $buf_hr% Buff"
+
+    return ${STATE_OK}
+
+
+}
+
+check_extents() {
+    if [ ${CRIT_LVL} -lt ${WARN_LVL} ] ; then
+        RETURN_MSG="UNKNOWN - Warning level is higher then Crit"
+        return ${STATE_UNKNOWN}
+    fi
+    result=`sqlplus -s ${ORA_USER}/${ORA_PASS}@${ORACLE_SID} << EOF
+set pagesize 200
+column Sname form a40    heading 'Object Name'
+column Size  form 99,999  heading 'Size'
+column Next  form 99,999 heading 'Next'
+column Tname form a15    heading 'TsName'
+
+select a.owner||'.'||a.segment_name "Sname",
+       a.bytes/1024/1024            "Size",
+       a.next_extent/1024/1024 "Next",
+       a.tablespace_name "TName"
+from  sys.dba_segments a
+where a.tablespace_name not like 'T%MP'   -- Exclude TEMP tablespaces
+and   a.tablespace_name like '%${ORA_TS}%'
+and   next_extent * 1 > (                  -- Cannot extend 1x, can change to 2x...
+                           select max(b.bytes)
+                             from dba_free_space b
+                            where a.tablespace_name = b.tablespace_name)
+order by 3 desc;
+EOF`
+ 
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
+       echo "CRITICAL - $error"
+       exit $STATE_CRITICAL
+    fi
+
+    if [ `echo $result | grep -c "no rows selected"` -eq 1 ]
+    then
+        export RETURN_MSG="${ORACLE_SID} : ${ORA_TS} OK - Extents.  Extensible"
+        return ${STATE_OK}
+    else
+        nn=`expr \`echo "$result" | wc -l\` - 3`
+        export RETURN_MSG="CRIT: Result: $nn objects can't extend"
+        return $STATE_CRITICAL
+    fi
+}
+
+check_tablespace() {
+    if [ ${CRIT_LVL} -lt ${WARN_LVL} ] ; then
+        RETURN_MSG="UNKNOWN - Warning level is more then Crit"
+        return ${STATE_UNKNOWN}
+    fi
+    result=`sqlplus -s ${ORA_USER}/${ORA_PASS}@${ORACLE_SID} << EOF
+set pagesize 0
+select b.free,a.total,100 - trunc(b.free/a.total * 1000) / 10 prc
+from (
+select tablespace_name,sum(bytes)/1024/1024 total
+from dba_data_files group by tablespace_name) A,
+( select tablespace_name,sum(bytes)/1024/1024 free
+from dba_free_space group by tablespace_name) B
+where a.tablespace_name=b.tablespace_name and a.tablespace_name='${ORA_TS}';
+EOF`
+ 
+    if [ -n "`echo $result | grep ORA-`" ] ; then
+       error=` echo "$result" | grep "ORA-" | head -1`
+       echo "CRITICAL - $error"
+       exit $STATE_CRITICAL
+    fi
+
+
+    ts_free=`echo $result | awk '{print int($1)}'` 
+    ts_total=`echo $result | awk '{print int($2)}'` 
+    ts_pct=`echo $result | awk '{print int($3)}'` 
+        
+    ce_ret=${STATE_OK}
+    ce_ret_msg=""
+    if [ ${CHECK_EXTENTS} == "yes" ]
+    then
+        check_extents
+        ce_ret=${?}
+        ce_ret_msg=${RETURN_MSG}
+    fi
+    if [ ${ts_pct} -ge ${CRIT_LVL} ] || [ ${ce_ret} -eq ${STATE_CRITICAL} ] 
+    then
+        RETURN_MSG="${ORACLE_SID} : ${ORA_TS} CRITICAL - $ts_pct% used [ $ts_free / $ts_total MB available ] || ${ce_ret_msg}"
+        return ${STATE_CRITICAL}
+    fi
+    if [ ${ts_pct} -ge ${WARN_LVL} ] || [ ${ce_ret} -eq ${STATE_WARNING} ] 
+    then
+        RETURN_MSG="${ORACLE_SID} : ${ORA_TS} WARNING  - $ts_pct% used [ $ts_free / $ts_total MB available ] || ${ce_ret_msg}"
+        return ${STATE_WARNING}
+    fi
+    if [ $ts_free -eq 0 -a $ts_total -eq 0 -a $ts_pct -eq 0 ] || \
+                [ ${ce_ret} -eq ${STATE_UNKNOWN} ]
+    then
+        RETURN_MSG="No data returned by Oracle - tablespace ${ORA_TS} not found? || ${ce_ret_msg}"
+        return ${STATE_UNKNOWN}
+    fi
+    RETURN_MSG="${ORACLE_SID} : ${ORA_TS} OK - $ts_pct% used [ $ts_free / $ts_total MB available ] || ${ce_ret_msg}"
+    return ${STATE_OK}
+}
+
+check_tns() {
+    tnstarg=""
+    if [ -n "${ORA_HOST}" -a "${ORA_HOST}" != "" ]
+    then
+        tnstarg=${ORA_HOST}
+    elif [ -n "${ORACLE_SID}" ] #-a "${ORACLE_SID}" != "" ]
+    then
+        tnstarg=${ORACLE_SID}
+        RETURN_MSG="set tnstarg = $tnstarg (ORACLE_SID = ${ORACLE_SID})"
+    else
+        RETURN_MSG="Could not determine destination"
+        return $STATE_WARNING
+    fi
+        
+    tnschk=` tnsping ${tnstarg}`
+    tnschk2=` echo  $tnschk | grep -c OK`
+    if [ ${tnschk2} -eq 1 ] ; then 
+        tnschk3=` echo $tnschk | sed -e 's/.*(//' -e 's/).*//'`
+        export RETURN_MSG="OK - reply time ${tnschk3} from ${tnstarg}"
+        return ${STATE_OK}
+    else
+        export RETURN_MSG="No TNS Listener on ${tnstarg}"
+        return $STATE_CRITICAL
+    fi
+}
+
+
+check_oranames() {
+    namesctl status ${ORA_NAMES} | awk '
+    /Server has been running for:/ {
+        msg = "OK: Up"
+        for (i = 6; i <= NF; i++) {
+            msg = msg " " $i
+        }
+        status = '${STATE_OK}'
+    }
+    /error/ {
+        msg = "CRITICAL: " $0
+        status = '$STATE_CRITICAL'
+    }
+    END {
+        print msg
+        RETURN status
+    }'
+}
+
+check_db() {
+    pmonchk=`ps -ef | grep -v grep | grep ${ORACLE_SID} | grep -c pmon`
+    if [ ${pmonchk} -ge 1 ] ; then
+        export RETURN_MSG="${ORACLE_SID} OK - ${pmonchk} PMON process(es) running"
+        return ${STATE_OK}
+    else
+        export RETURN_MSG="${2} Database is DOWN"
+        return $STATE_CRITICAL
+    fi
+}
+
+check_login() {
+    loginchk=`sqlplus dummy/user@${ORACLE_SID} < /dev/null`
+    loginchk2=` echo  ${loginchk} | grep -c ORA-01017`
+    if [ ${loginchk2} -eq 1 ] ; then
+        export RETURN_MSG="OK - dummy login connected"
+        return ${STATE_OK}
+    else
+        loginchk3=` echo "${loginchk}" | grep "ORA-" | head -1`
+        export RETURN_MSG="CRITICAL - ${loginchk3}"
+        return $STATE_CRITICAL
+    fi
+}
+#begin our "main"
+#
+
+init_var
+
+
+while getopts ":cC:dehH:ln:p:s:tT:u:W:" arg ; do
+   case ${arg} in
+
+   c )                          #echo "Cache Received" 
+        CHECK_CACHE=yes
+        ;;
+   C )                          #echo "Critical lvl = ${OPTARG}" 
+        CRIT_LVL=${OPTARG}
+        ;;
+   d )                          #echo "DB Received" 
+        CHECK_DB=yes
+        ;;
+   e )                          #echo "Extents Received" 
+        CHECK_EXTENTS=yes
+        ;;
+   H )                          #echo "Host Received = ${OPTARG}" 
+        ORA_HOST=${OPTARG}
+        ;;
+   h )                          #echo "Help Received" 
+        print_help 
+        exit ${STATE_UNKNOWN}
+        ;;
+   l )                          #echo "Login Received" 
+        CHECK_LOGIN=yes
+        ;;
+   n )                          #echo "oranames Received = $OPTARG}" 
+        CHECK_NAMES=yes
+        ORA_NAMES=${OPTARG}
+        ;;
+   p )                          #echo "Passwd Received = ${OPTARG}" 
+        ORA_PASS=${OPTARG}
+        ;;
+   s )                          #echo "SID Received = ${OPTARG}" 
+        ORACLE_SID=${OPTARG}
+        ;;
+   t )                          #echo "tnsnames Received"
+        CHECK_TNS=yes
+        ;;
+   T )                          #echo "Tablespace Received = ${OPTARG}" 
+        ORA_TS=${OPTARG}
+        CHECK_TS=yes
+        ;;
+   u )                          #echo "User Received = ${OPTARG}"
+        ORA_USER=${OPTARG}
+        ;;
+   W )                          #echo "Warning lvl = ${OPTARG}"
+        WARN_LVL=${OPTARG} 
+        ;;
+   \?)  print_usage 
+        exit ${STATE_UNKNOWN}
+        ;;
+   esac
+done
+
+
+shift $(($OPTIND - 1))
+
+if [ "$1" == "--help" ]
+then
+        print_help
+fi
+
+# "This is where new options can be used - working on compat first
+#  "step through following:"
+if [ -z $1 ] 
+then
+  
+if [ -n ${ORACLE_SID} ] && [ "${ORACLE_SID}" != "" ]
+then
+   if [ -n ${ORA_PASS} -a "${ORA_PASS}" != "" ] || \
+                [ -n ${ORA_USER} -a "${ORA_USER}" != "" ] || \
+                [ -n ${CRIT_LVL} >= 0 ] || [ ${WARN_LVL} >= 0 ]
+   then
+        if [ ${CHECK_CACHE} == "yes" ] && [ ${CHECK_TS} == "no" ]
+        then
+                check_cache
+                ret=${?}
+                echo ${RETURN_MSG}
+                exit ${ret}
+        fi
+        if [ ${CHECK_EXTENTS} == "yes" ] && [ ${CHECK_TS} == "no" ]
+        then
+                echo "call check_Extents"
+                check_extents
+                ret=${?}
+                echo ${RETURN_MSG}
+                exit ${RET}
+        fi
+   else
+        echo "error - not proper args"
+   fi
+   if [ -n ${ORA_TS} ] && [ "${ORA_TS}" != "" ]
+   then
+        if [ ${CHECK_TS} == "yes" ] && [ ${CHECK_CACHE} == "no" ]
+        then
+                check_tablespace
+                ret=${?}
+                echo ${RETURN_MSG}
+                exit ${ret}
+        fi
+        if [ ${CHECK_TS} == "yes" ] && [ ${CHECK_CACHE} == "yes" ]
+        then
+                RETURN_MSG="INVALID: Currently Cache and tablespace checks don't mesh"
+                echo ${RETURN_MSG}
+                exit ${STATE_UNKNOWN}
+        fi
+   fi
+   if [ ${CHECK_LOGIN} == "yes" ]
+   then
+        check_login
+        ret=${?}
+        echo ${RETURN_MSG}
+        exit ${ret}
+   fi
+   if [ ${CHECK_DB} == "yes" ]
+   then
+        check_db
+        ret=${?}
+        echo ${RETURN_MSG}
+        exit ${ret}
+   fi   
+fi 
+else
+   echo "Using old Invocation Methods: \"$*\""
+fi
+
+case "$1" in
+1)
+    cmd='--tns'
+    ;;
+2)
+    cmd='--db'
+    ;;
+*)
+    cmd="$1"
+    ;;
+esac
+
+# Information options
+case "$cmd" in
+--help)
+                print_help
+    exit ${STATE_OK}
+    ;;
+-h)
+                print_help
+    exit ${STATE_OK}
+    ;;
+--db)
+                CHECK_DB=yes
+                ORACLE_SID=$2
+                check_db 
+                ret=${?}
+    echo ${RETURN_MSG}
+    exit $ret
+    ;;
+--cache)
+                CHECK_CACHE=yes
+                ORACLE_SID=$2
+                ORA_USER=$3
+                ORA_PASS=$4
+                CRIT_LVL=$5
+                WARN_LVL=$6
+                check_cache
+                ret=${?}
+    echo ${RETURN_MSG}
+    exit $ret
+    ;;
+--extents)
+                CHECK_EXTENTS=yes
+                ORACLE_SID=$2
+                ORA_USER=$3
+                ORA_PASS=$4
+                CRIT_LVL=$5
+                WARN_LVL=$6
+                check_extents
+                ret=${?}
+    echo ${RETURN_MSG}
+    exit $ret
+    ;;
+--login)
+                CHECK_LOGIN=yes
+                ORACLE_SID=$2
+                check_login
+                ret=${?}
+    echo ${RETURN_MSG}
+    exit $ret
+    ;;
+--oranames)
+                CHECK_NAMES=yes
+                ORA_NAMES=$2
+                check_oranames
+    exit ${?}
+    ;;
+--tablespace)
+                CHECK_TS=yes
+                ORACLE_SID=$2
+                ORA_USER=$3
+                ORA_PASS=$4
+                ORA_TS=$5
+                CRIT_LVL=$6
+                WARN_LVL=$7
+                check_tablespace
+                ret=${?} 
+    echo ${RETURN_MSG}
+    exit $ret
+    ;;
+--tns)
+                CHECK_TNS=yes
+                export ORACLE_SID=$2
+                echo "--tns ${ORACLE_SID} "
+                check_tns
+                ret=${?}
+    echo ${RETURN_MSG}
+    exit $ret
+    ;;
+--version)
+                print_revision $PLUGIN $REVISION
+    exit ${STATE_OK}
+    ;;
+-V)
+                print_revision $PLUGIN $REVISION
+    exit ${STATE_OK}
+    ;;
+*)
+    print_usage
+    exit ${STATE_UNKNOWN}
+    ;;
+esac
+
+
+exit ${STATE_UNKNOWN}
diff --git a/web/attachments/56819-ping.diff b/web/attachments/56819-ping.diff
new file mode 100644
index 0000000..8a849a1
--- /dev/null
+++ b/web/attachments/56819-ping.diff
@@ -0,0 +1,120 @@
+*** check_ping.c.orig   Mon Jan 13 20:15:16 2003
+--- check_ping.c        Wed Jul 23 14:38:19 2003
+***************
+*** 19,25 ****
+  
+  #define OPTIONS "\
+  -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
+!        [-p packets] [-t timeout] [-L]\n"
+  
+  #define LONGOPTIONS "\
+  -H, --hostname=HOST\n\
+--- 19,26 ----
+  
+  #define OPTIONS "\
+  -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
+!        [-p packets] [-t timeout] [-6] [-L]\n"
+!   
+  
+  #define LONGOPTIONS "\
+  -H, --hostname=HOST\n\
+***************
+*** 32,37 ****
+--- 33,40 ----
+     number of ICMP ECHO packets to send (Default: %d)\n\
+  -t, --timeout=INTEGER\n\
+     optional specified timeout in second (Default: %d)\n\
++ -6, --use-ping6\n\
++    use ping6 for ICMPv6 instead of ping for IPv4\n\
+  -L, --link\n\
+     show HTML in the plugin output (obsoleted by urlize)\n\
+  THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel\n\
+***************
+*** 70,81 ****
+--- 73,87 ----
+  char *server_address = NULL;
+  int max_packets = -1;
+  int verbose = FALSE;
++ int ipv6 = FALSE;
+  
+  float rta = UNKNOWN_TRIP_TIME;
+  int pl = UNKNOWN_PACKET_LOSS;
+  
+  char *warn_text = NULL;
+  
++ #define PING6_COMMAND "/sbin/ping6 -n -c %d %s"
++ 
+  int
+  main (int argc, char **argv)
+  {
+***************
+*** 86,98 ****
+                usage ("Could not parse arguments");
+        exit;
+  
+        /* does the host address of number of packets argument come first? */
+  #ifdef PING_PACKETS_FIRST
+        asprintf (&command_line, PING_COMMAND, max_packets, server_address);
+  #else
+        asprintf (&command_line, PING_COMMAND, server_address, max_packets);
+  #endif
+! 
+        /* Set signal handling and alarm */
+        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+                printf ("Cannot catch SIGALRM");
+--- 92,108 ----
+                usage ("Could not parse arguments");
+        exit;
+  
++ #ifdef PING6_COMMAND
++       asprintf (&command_line, ipv6 ? PING6_COMMAND : PING_COMMAND, max_packets, server_address);
++ #else 
++ 
+        /* does the host address of number of packets argument come first? */
+  #ifdef PING_PACKETS_FIRST
+        asprintf (&command_line, PING_COMMAND, max_packets, server_address);
+  #else
+        asprintf (&command_line, PING_COMMAND, server_address, max_packets);
+  #endif
+! #endif
+        /* Set signal handling and alarm */
+        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+                printf ("Cannot catch SIGALRM");
+***************
+*** 157,167 ****
+                {"packets", required_argument, 0, 'p'},
+                {"nohtml", no_argument, 0, 'n'},
+                {"link", no_argument, 0, 'L'},
+                {0, 0, 0, 0}
+        };
+  #endif
+  
+! #define OPTCHARS "Vvht:c:w:H:p:nL"
+  
+        if (argc < 2)
+                return ERROR;
+--- 167,178 ----
+                {"packets", required_argument, 0, 'p'},
+                {"nohtml", no_argument, 0, 'n'},
+                {"link", no_argument, 0, 'L'},
++               {"use-ping6", no_argument, 0, '6'},
+                {0, 0, 0, 0}
+        };
+  #endif
+  
+! #define OPTCHARS "Vvht:c:w:H:p:n6L"
+  
+        if (argc < 2)
+                return ERROR;
+***************
+*** 213,218 ****
+--- 224,232 ----
+                        break;
+                case 'L':       /* show HTML */
+                        display_html = TRUE;
++                       break;
++               case '6':
++                       ipv6 = TRUE;
+                        break;
+                case 'c':
+                        get_threshold (optarg, &crta, &cpl);
diff --git a/web/attachments/57050-check_http.cookies_patch b/web/attachments/57050-check_http.cookies_patch
new file mode 100644
index 0000000..d75778c
--- /dev/null
+++ b/web/attachments/57050-check_http.cookies_patch
@@ -0,0 +1,159 @@
+--- nagios-plugins-1.3.1/plugins/check_http.c   2003-06-30 04:56:08.000000000 -0700
++++ nagios-plugins-1.3.1.DS/plugins/check_http.c        2003-07-27 15:26:14.792132000 -0700
+@@ -44,7 +44,7 @@
+ (-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
+             [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+             [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+-            [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
++            [-s string] [-l] [-k] [-r <regex> | -R <case-insensitive regex>]\n\
+             [-P string]"
+ 
+ #define LONGOPTIONS "\
+@@ -75,6 +75,8 @@
+    Wrap output in HTML link (obsoleted by urlize)\n\
+  -f, --onredirect=<ok|warning|critical|follow>\n\
+    How to handle redirected pages\n%s%s\
++ -k, --keepalive\n\
++   Use Keep-Alive header in every request request\n\
+  -v, --verbose\n\
+     Show details for command-line debugging (do not use with nagios server)\n\
+  -h, --help\n\
+@@ -186,6 +188,10 @@
+ #define URI_HOST "%[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
+ #define URI_PORT ":%[0123456789]"
+ #define URI_PATH "%[-_.!~*'();/?:@&=+$,%#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
++#define HDR_SETCOOKIE "%*[Ss]%*[Ee]%*[Tt]%*[-]%*[Cc]%*[Oo]%*[Kk]%*[Ii]%*[Ee]: "
++#define COOKIE_BODY "%[/a-zA-Z0-9._-=@,: ]"
++#define COOKIE_PATH ";%[/a-zA-Z0-9._-=@,: ]"
++#define COOKIE_DATE ";%[/a-zA-Z0-9._-=@,: ]"
+ enum {
+        MAX_IPV4_HOSTLENGTH = 255,
+        HTTP_PORT = 80,
+@@ -206,6 +212,7 @@
+ char *server_url = "";
+ int server_url_length;
+ int server_expect_yn = 0;
++char *cookies=NULL;
+ char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+ char string_expect[MAX_INPUT_BUFFER] = "";
+ double warning_time = 0;
+@@ -216,6 +223,7 @@
+ int display_html = FALSE;
+ int onredirect = STATE_OK;
+ int use_ssl = FALSE;
++int keepalive = FALSE;
+ int verbose = FALSE;
+ int sd;
+ char *http_method = "GET";
+@@ -309,6 +317,7 @@
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
+                {"linespan", no_argument, 0, 'l'},
++               {"keepalive", no_argument, 0, 'k'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
+                {0, 0, 0, 0}
+@@ -331,7 +340,7 @@
+                        strcpy (argv[c], "-n");
+        }
+ 
+-#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLS"
++#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlkLS"
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+@@ -466,6 +475,9 @@
+                        }
+                        break;
+ #endif
++               case 'k': /* Keep-Alive */
++                       keepalive = TRUE;
++                       break;
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
+@@ -550,6 +562,12 @@
+        char *x = NULL;
+        char *orig_url = NULL;
+        double elapsed_time;
++       char *cpos = "";
++       char cookie_body[255];
++       char cookie_path[255];
++       char cookie_date[255];
++       struct tm tm;
++       char date[255],rest[128];
+ #ifdef HAVE_SSL
+        int sslerr;
+ #endif
+@@ -589,6 +607,16 @@
+        asprintf (&buf, "%sUser-Agent: check_http/%s (nagios-plugins %s)\r\n",
+                  buf, clean_revstring (REVISION), PACKAGE_VERSION);
+ 
++       /* send Collected Cookies */
++       if(cookies)
++       {
++               asprintf (&buf, "%s%s\r\n", buf,cookies);
++       }
++
++       /* send "Connection: Keep-Alive" if need */
++       if(keepalive)
++               asprintf (&buf, "%sConnection: Keep-Alive\r\n", buf); 
++
+        /* optionally send the authentication info */
+        if (strcmp (user_auth, "")) {
+                auth = base64 (user_auth, strlen (user_auth));
+@@ -615,6 +643,9 @@
+        }
+        else {
+ #endif
++       if (verbose)
++               printf ("**** REQUEST ****\n%s\n", buf);
++
+                send (sd, buf, strlen (buf), 0);
+ #ifdef HAVE_SSL
+        }
+@@ -737,6 +768,44 @@
+                        if (onredirect == STATE_DEPENDENT) {
+ 
+                                asprintf (&orig_url, "%s", server_url);
++                                cpos = header;
++                                cookies=NULL;
++                                while (*cpos) {
++                                        cookie_date[0]='\0';
++                                        if (sscanf(cpos, HDR_SETCOOKIE COOKIE_BODY COOKIE_PATH COOKIE_DATE, cookie_body, cookie_path, cookie_date)) {
++                                                if(verbose)
++                                                        printf("Cookie parameters: body=%s path=%s date=%s\n", cookie_body, cookie_path, cookie_date);
++
++                                                if(strlen(cookie_date)>1)
++                                                {
++                                                        sscanf(cookie_date, "%*[Ee]%*[Xx]%*[Pp]%*[Ii]%*[Rr]%*[Ee]%*[Ss]=%*s %s %s %*s", date, rest);
++                                                        strcat(date, " ");
++                                                        strcat(date, rest);
++                                                        strptime(date,"%d-%b-%Y %T",&tm);
++
++                                                        if(verbose)
++                                                                 printf("Cookie Date %d-%d-%d Time  %d:%d:%d\n", tm.tm_mday, tm.tm_mon, tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec);
++                                                if(mktime(&tm) < time(0))
++                                                        {
++                                                                if(verbose)
++                                                                        printf("Ignoring cookie since expired\n");
++
++                                                                cpos += (size_t) strcspn (cpos, "\r\n");
++                                                                cpos += (size_t) strspn (cpos, "\r\n");
++                                                                continue;
++                                                        }
++                                                }
++
++                                                if(cookies)
++                                                        asprintf (&cookies, "%s;%s", cookies, cookie_body);
++                                                else
++                                                        asprintf (&cookies, "Cookie: %s", cookie_body);
++                                        }
++
++                                        cpos += (size_t) strcspn (cpos, "\r\n");
++                                        cpos += (size_t) strspn (cpos, "\r\n");
++                                } /* end while (cpos) */
++
+                                pos = header;
+                                while (pos) {
+                                        server_address = realloc (server_address, MAX_IPV4_HOSTLENGTH + 1);
diff --git a/web/attachments/57482-check_smtp.patch b/web/attachments/57482-check_smtp.patch
new file mode 100644
index 0000000..2c81f99
--- /dev/null
+++ b/web/attachments/57482-check_smtp.patch
@@ -0,0 +1,272 @@
+--- check_smtp-cvs.c    2003-07-31 19:02:23.000000000 -0500
++++ check_smtp.c        2003-07-31 19:02:07.000000000 -0500
+@@ -33,6 +33,7 @@
+ 
+ const char *option_summary = "\
+ -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
++         [-A authtype -U authuser -P authpass]\n\
+          [-w warn] [-c crit] [-t timeout] [-n] [-v] [-4|-6]";
+ 
+ const char *options = "\
+@@ -53,6 +54,12 @@
+  -f, --from=STRING\n\
+    FROM-address to include in MAIL command, required by Exchange 2000\n\
+    (default: '%s')\n\
++ -A, --authtype=STRING\n\
++   SMTP AUTH type to check (default none, only LOGIN supported)\n\
++ -U, --authuser=STRING\n\
++   SMTP AUTH username\n\
++ -P, --authpass=STRING\n\
++   SMTP AUTH password\n\
+  -w, --warning=INTEGER\n\
+    Seconds necessary to result in a warning status\n\
+  -c, --critical=INTEGER\n\
+@@ -89,12 +96,80 @@
+ int smtp_use_dummycmd = 1;
+ char *mail_command = "MAIL ";
+ char *from_arg = " ";
++char *authtype = NULL;
++char *authuser = NULL;
++char *authpass = NULL;
+ int warning_time = 0;
+ int check_warning_time = FALSE;
+ int critical_time = 0;
+ int check_critical_time = FALSE;
+ int verbose = 0;
+ 
++/* encode64 routine from http://www.experts-exchange.com/Programming/Programming_Languages/C/Q_20245582.html */
++
++/* #define OK                  (0) */
++/* #define FAIL                (-1) */
++#define BUFOVER             (-2)
++#define CHAR64(c)           (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
++static char     basis_64[] =
++"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????";
++static char     index_64[128] = {
++  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
++  52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
++  -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
++  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
++  -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
++  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
++};
++
++static int
++encode64(const char *_in, unsigned inlen, char *_out, unsigned outmax, unsigned *outlen)
++{
++
++  const unsigned char *in = (const unsigned char *) _in;
++  unsigned char  *out = (unsigned char *) _out;
++  unsigned char   oval;
++  char           *blah;
++  unsigned        olen;
++
++  olen = (inlen + 2) / 3 * 4;
++  if (outlen)
++      *outlen = olen;
++  if (outmax < olen)
++      return BUFOVER;
++
++  blah = (char *) out;
++  while (inlen >= 3)
++  {
++/* user provided max buffer size; make sure we don't go over it */
++      *out++ = basis_64[in[0] >> 2];
++      *out++ = basis_64[((in[0] << 4) & 0x30) | (in[1] >> 4)];
++      *out++ = basis_64[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
++      *out++ = basis_64[in[2] & 0x3f];
++      in += 3;
++      inlen -= 3;
++  }
++  if (inlen > 0)
++  {
++/* user provided max buffer size; make sure we don't go over it */
++      *out++ = basis_64[in[0] >> 2];
++      oval = (in[0] << 4) & 0x30;
++      if (inlen > 1)
++          oval |= in[1] >> 4;
++      *out++ = basis_64[oval];
++      *out++ = (inlen < 2) ? '=' : basis_64[(in[1] << 2) & 0x3c];
++      *out++ = '=';
++  }
++
++  if (olen < outmax)
++      *out = '\0';
++
++  return OK;
++
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -104,6 +179,7 @@
+        char buffer[MAX_INPUT_BUFFER] = "";
+        char *from_str = NULL;
+        char *helocmd = NULL;
++       char *error_msg = NULL;
+        struct timeval tv;
+ 
+        if (process_arguments (argc, argv) != OK)
+@@ -163,7 +239,97 @@
+ 
+                /* allow for response to helo command to reach us */
+                recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+-                               
++
++               if (authtype != NULL) {
++                       if (strcmp (authtype, "LOGIN") == 0) {
++                               char abuf[MAX_INPUT_BUFFER];
++                               unsigned alen;
++                               int ret;
++                               do {
++                                       if (authuser == NULL) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "no authuser specified";
++                                               break;
++                                       }
++                                       if (authpass == NULL) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "no authpass specified";
++                                               break;
++                                       }
++                                       send(sd, "AUTH LOGIN\r\n", strlen("AUTH LOGIN\r\n"), 0);
++                                       if (verbose == TRUE) {
++                                               printf ("sent AUTH LOGIN\n");
++                                       }
++                                       if ((ret = recv(sd, buffer, MAX_INPUT_BUFFER-1, 0)) == -1) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "recv() failed after AUTH LOGIN";
++                                               break;
++                                       }
++                                       buffer[ret] = 0;
++                                       if (verbose == TRUE) {
++                                               printf ("received %s\n", buffer);
++                                       }
++                                       if (strncmp (buffer, "334", 3) != 0) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "invalid response received after AUTH LOGIN";
++                                               break;
++                                       }
++                                       if (encode64 (authuser, strlen(authuser), abuf, MAX_INPUT_BUFFER, &alen) != OK) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "failed to base64-encode authuser";
++                                               break;
++                                       }
++                                       strcat (abuf, "\r\n");
++                                       send(sd, abuf, strlen(abuf), 0);
++                                       if (verbose == TRUE) {
++                                               printf ("sent %s\n", abuf);
++                                       }
++                                       if ((ret = recv(sd, buffer, MAX_INPUT_BUFFER-1, 0)) == -1) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "recv() failed after sending authuser";
++                                               break;
++                                       }
++                                       buffer[ret] = 0;
++                                       if (verbose == TRUE) {
++                                               printf ("received %s\n", buffer);
++                                       }
++                                       if (strncmp (buffer, "334", 3) != 0) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "invalid response received after authuser";
++                                               break;
++                                       }
++                                       if (encode64 (authpass, strlen(authpass), abuf, MAX_INPUT_BUFFER, &alen) != OK) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "failed to base64-encode authpass";
++                                               break;
++                                       }
++                                       strcat (abuf, "\r\n");
++                                       send(sd, abuf, strlen(abuf), 0);
++                                       if (verbose == TRUE) {
++                                               printf ("sent %s\n", abuf);
++                                       }
++                                       if ((ret = recv(sd, buffer, MAX_INPUT_BUFFER-1, 0)) == -1) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "recv() failed after sending authpass";
++                                               break;
++                                       }
++                                       buffer[ret] = 0;
++                                       if (verbose == TRUE) {
++                                               printf ("received %s\n", buffer);
++                                       }
++                                       if (strncmp (buffer, "235", 3) != 0) {
++                                               result = STATE_CRITICAL;
++                                               error_msg = "invalid response received after authpass";
++                                               break;
++                                       }
++                                       break;
++                               } while (0);
++                       } else {
++                               result = STATE_CRITICAL;
++                               error_msg = "only authtype LOGIN is supported";
++                       }
++               }
++
+                /* sendmail will syslog a "NOQUEUE" error if session does not attempt
+                 * to do something useful. This can be prevented by giving a command
+                 * even if syntax is illegal (MAIL requires a FROM:<...> argument)
+@@ -204,11 +370,21 @@
+                result = STATE_WARNING;
+ 
+        if (verbose)
+-               printf ("SMTP %s - %.3f sec. response time, %s|time=%.3f\n",
+-                       state_text (result), elapsed_time, buffer, elapsed_time);
++               if (error_msg == NULL) {
++                       printf ("SMTP %s - %.3f sec. response time, %s|time=%.3f\n",
++                               state_text (result), elapsed_time, buffer, elapsed_time);
++               } else {
++                       printf ("SMTP %s - %s, %.3f sec. response time, %s|time=%.3f\n",
++                               state_text (result), error_msg, elapsed_time, buffer, elapsed_time);
++               }
+        else
+-               printf ("SMTP %s - %.3f second response time|time=%.3f\n",
+-                       state_text (result), elapsed_time, elapsed_time);
++               if (error_msg == NULL) {
++                       printf ("SMTP %s - %.3f second response time|time=%.3f\n",
++                               state_text (result), elapsed_time, elapsed_time);
++               } else {
++                       printf ("SMTP %s - %s, %.3f second response time|time=%.3f\n",
++                               state_text (result), error_msg, elapsed_time, elapsed_time);
++               }
+ 
+        return result;
+ }
+@@ -233,6 +409,9 @@
+                {"timeout", required_argument, 0, 't'},
+                {"port", required_argument, 0, 'p'},
+                {"from", required_argument, 0, 'f'},
++               {"authtype", required_argument, 0, 'A'},
++               {"authuser", required_argument, 0, 'U'},
++               {"authpass", required_argument, 0, 'P'},
+                {"command", required_argument, 0, 'C'},
+                {"nocommand", required_argument, 0, 'n'},
+                {"verbose", no_argument, 0, 'v'},
+@@ -256,7 +435,7 @@
+        }
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:",
++               c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:A:U:P:",
+                                 long_options, &option_index);
+ 
+                if (c == -1 || c == EOF)
+@@ -282,6 +461,15 @@
+                case 'f':                                                                       /* from argument */
+                        from_arg = optarg;
+                        break;
++               case 'A':
++                       authtype = optarg;
++                       break;
++               case 'U':
++                       authuser = optarg;
++                       break;
++               case 'P':
++                       authpass = optarg;
++                       break;
+                case 'e':                                                                       /* server expect string on 220  */
+                        server_expect = optarg;
+                        break;
diff --git a/web/attachments/57488-check_disk_smb.patch b/web/attachments/57488-check_disk_smb.patch
new file mode 100644
index 0000000..7883520
--- /dev/null
+++ b/web/attachments/57488-check_disk_smb.patch
@@ -0,0 +1,46 @@
+--- ../check_disk_smb.pl        2003-07-02 10:57:29.000000000 -0500
++++ check_disk_smb.pl   2003-07-31 20:06:13.000000000 -0500
+@@ -23,7 +23,7 @@
+ use POSIX;
+ use strict;
+ use Getopt::Long;
+-use vars qw($opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose);
++use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose);
+ use vars qw($PROGNAME);
+ use lib utils.pm ;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
+@@ -40,6 +40,7 @@
+ Getopt::Long::Configure('bundling');
+ GetOptions
+        ("v"   => \$verbose, "verbose"    => \$verbose,
++        "P=s" => \$opt_P,      "Port=s"        => \$opt_P,
+         "V"   => \$opt_V, "version"    => \$opt_V,
+         "h"   => \$opt_h, "help"       => \$opt_h,
+         "w=s" => \$opt_w, "warning=s"  => \$opt_w,
+@@ -58,7 +59,7 @@
+ if ($opt_h) {print_help(); exit $ERRORS{'OK'};}
+ 
+ my $smbclient= "$utils::PATH_TO_SMBCLIENT " ;
+-my $smbclientoptions="";
++my $smbclientoptions = $opt_P ? " -p $opt_P " : " ";
+ 
+ 
+ # Options checking
+@@ -230,7 +231,7 @@
+ 
+ sub print_usage () {
+        print "Usage: $PROGNAME -H <host> -s <share> -u <user> -p <password> 
+-      -w <warn> -c <crit> [-W <workgroup>]\n";
++      -w <warn> -c <crit> [-W <workgroup>] [-P <port>]\n";
+ }
+ 
+ sub print_help () {
+@@ -257,6 +258,8 @@
+       
+ -c, --critical=INTEGER or INTEGER[kMG]
+    Percent of used space at which a critical will be generated (Defaults: 95%)
++-P, --Port=Integer
++   Port to be used to connect to. Some windows boxes use 139, others 445. (Default: none)
+    
+    If thresholds are followed by either a k, M, or G then check to see if that
+    much disk space is available (kilobytes, Megabytes, Gigabytes)
diff --git a/web/attachments/60404-check_nt.patch b/web/attachments/60404-check_nt.patch
new file mode 100644
index 0000000..4e52b76
--- /dev/null
+++ b/web/attachments/60404-check_nt.patch
@@ -0,0 +1,32 @@
+--- check_nt.c  Wed Apr 23 05:51:16 2003
++++ /usr/src/nagios-plugins-1.3.1/plugins/check_nt.c    Tue Sep  2 12:31:02 2003
+@@ -108,13 +108,23 @@
+        alarm(socket_timeout);
+ 
+        if (vars_to_check==CHECK_CLIENTVERSION) {
+-                       
++       /* Amendment, we now optionally check the version and make critical if it's not the correct version */                  
+                asprintf(&send_buffer,strcat(req_password,"&1"));
+-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+-               if(result!=STATE_OK)
+-                       return result;
+-               asprintf(&output_message,recv_buffer);
+-               return_code=STATE_OK;
++               return_code=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
++               if(return_code!=STATE_OK)
++                       return return_code;
++               /* If they have supplied a parameter we need to check it */
++               if (check_value_list==TRUE) {
++                       if(strcmp(recv_buffer, value_list)!=0)
++                               {
++                               asprintf(&output_message,"Wrong client version: Running: %s Required: %s",recv_buffer,value_list);
++                               return_code=STATE_WARNING;
++                               }
++                       }
++               if(return_code==STATE_OK)
++                       {
++                       asprintf(&output_message,recv_buffer);
++                       };
+        }
+        else if(vars_to_check==CHECK_CPULOAD){
+ 
diff --git a/web/attachments/61644-check_apc_ups.pl.diff b/web/attachments/61644-check_apc_ups.pl.diff
new file mode 100644
index 0000000..3ea9a1c
--- /dev/null
+++ b/web/attachments/61644-check_apc_ups.pl.diff
@@ -0,0 +1,141 @@
+298a

+# 802 END INS

+# 802 BEG DEL

+#   $val = `/usr/bin/snmpget $host public $oid 2> /dev/null`;

+#   my @test = split(/ /,$val,3);

+#

+#   return undef unless (defined ($test[2]));

+#

+#   if ($test[2] =~ /\(\d+\)/) {        # Later versions of UCD SNMP

+#     ($val) = ($test[2] =~ /\((\d+)\)/);

+#   } elsif ($test[2] =~ /: \d+/) {

+#     ($val) = ($test[2] =~ /: (\d+)/);

+#   } else {

+#     $val = $test[2];

+#   }

+# 802 END DEL

+.

+297c

+      $val = undef;

+.

+286,295c

+# 802 BEGIN INS

+  my $community="public";

+  my $port="161";

+  my ($session, $error) = Net::SNMP->session(

+               -hostname => $host,

+               -community => $community,

+               -timeout => 2,

+               -port => $port,

+               -translate => undef

+               );

+  if (defined($session)) {

+      my $response=$session->get_request($oid);

+      if (defined($response)) {

+          $val=$response->{$oid};

+      } else {

+          $val = undef;

+      }

+      $session->close;

+.

+277c

+   Output load pct above which a WARNING status will result (default: 50)

+.

+275c

+   Output load pct above which a CRITICAL status will result (default: 85)

+.

+242c

+  print "unknown\]\n";

+.

+239c

+  print "$diagnosticsResultsVals[$data][0]\]\n";

+.

+237c

+print "\[Diag result: ";

+.

+232c

+  print "unknown\]";

+.

+223c

+  print "$data\]";

+.

+221c

+print "\[Output load (%): ";

+.

+216c

+  print "unknown\]";

+.

+213c

+  print "$battReplVals[$data][0]\]";

+.

+211c

+print "\[Battery repl: ";

+.

+206c

+  print "unknown\] ";

+.

+197c

+  print "$data\]";

+.

+195c

+print "\[Battery temp(C): ";

+.

+190c

+  print "unknown\]";

+.

+186c

+    print "$battStatVals[$data][0]\]";

+.

+184c

+    print "$battStatVals[$data][0] ($failcause)\]";

+.

+178c

+print "\[Battery status: ";

+.

+173c

+  print "unknown\]";

+.

+164c

+  printf "%d:%02d:%05.2f\]", $hrs, $mins, $secs;

+.

+159c

+print "\[Rem time: ";

+.

+154c

+  print "unknown\]";

+.

+151c

+  print "$outputStatVals[$data][0]\]";

+.

+149c

+print "\[Output status: ";

+.

+143c

+my $exitval     = $ERRORS{'OK'};

+.

+27a

+# 801 ADD ONE

+{ $^W=0; ($PROGNAME=$0) =~ s!^.*/!!; }

+

+.

+14,16c

+# 802 ADD ONE

+use Net::SNMP;

+use vars qw($opt_V $opt_h $opt_H $opt_T $opt_t $opt_R 

+            $opt_r $opt_L $opt_l $PROGNAME);

+#use lib utils.pm;

+# 801 CHANGE ONE

+use lib '/usr/local/nagios/libexec';

+.

+11c

+#

+# DMH Custom

+# 801 07-07-2003 Fix use lib statement

+#                Fix PROGNAME Assignment

+# 802 07-07-2003 Use Net::SNMP to get the info instead of calling

+#                an external program.

+# 803 09-11-2003 Replaced the output delimiter | with [] as

+#                Nagios was truncating the output and only

+#                displaying the first check's data.

+#

+.

diff --git a/web/attachments/62197-check_rrd.pl b/web/attachments/62197-check_rrd.pl
new file mode 100644
index 0000000..578277c
--- /dev/null
+++ b/web/attachments/62197-check_rrd.pl
@@ -0,0 +1,157 @@
+#!/usr/bin/perl -w
+#-wT
+#
+# check_rrd plugin for nagios (or rather check_rrd but using the current rrd rather than cricket libraries)
+#
+# usage:
+#    check_rrd rrdfile perlexp_warn perlexp_crit perlexp_default [ds]
+#
+# Checks data from an RRD file.
+#
+# Based off the check_rrd_data.pl and the example code in the rrdtool dist.
+#
+# The Perl expressions are expressions to be evaluated in the following cases:
+#
+# - perlexp_crit. The first one, to check if there is a critical situation. If
+# it returns other than "", it will be a critical message.
+# - perlexp_warn. The second one to be evaluated. If returns other than "", a
+# warning will be issued to Nagios.
+# - perlexp_default. If both of the above return "", it will be evaluated, and
+# wathever returns this expression will be returned by the script. NOTE that
+# this is different from the other two cases, to allow the user issue a
+# warning or critical failure even if the other two don't return it.
+#
+# initial version: 28 Nov 2000 by Esteban Manchado Vel�zquez
+# current status: 1.0
+#
+# History
+# 19-Sep-2003   1.0     steveh@brendata.co.uk
+#                       Amended to utilise the RRDs supplied with rrdtool rather than the cricket code
+#
+# Required RRDs from rrdtool distribution be installed (install perl shared when building rrdtool).
+#
+# Copyright Notice: GPL
+#
+
+use strict;
+use lib '/usr/local/nagios/libexec/' ;
+use utils qw(%ERRORS &print_revision);
+use RRDs;
+use Getopt::Long;
+&Getopt::Long::config('auto_abbrev');
+
+my $PROGNAME="check_rrd.pl";
+
+sub usage {
+        print_revision($PROGNAME,'$Revision: 1.0 $ ');
+        print "Nagios Plugin - Check rrd datafile\n";
+        print "=" x 75,"\nERROR: Missing or wrong arguments!\n","=" x 75,"\n";
+        print "check_rrd.pl --file=<file.rrd> --warning=<perl_exp_warn> --critical=<perl_exp_crit> --default=<perl_exp_default> [--dataset=<ds>] [--cf=<cf>] [--expire=<minutes>]\n\n";
+        print "<perl_exp_*> is an expression that gets evaluated with \$_ at the current\n";
+        print "value of the data source. If it returns something other than \"\", there\n";
+        print "will be a warning or a critical failure. Else, the expression\n";
+        print "<perl_exp_default> will be evaluated\n";
+        print "<ds> is the number of the dataset that you wish to use\n";
+        print "<cf> is one of MIN, MAX, AVERAGE or LAST\n";
+        print "<minutes> the maximum time since last rrd update, otherwise WARNING. (5 mins assumed if not specified)\n";
+        exit $ERRORS{'UNKNOWN'};        # Unknown
+}
+
+my $rrdfile;                                            # RRD file to open
+my $cf; #Function to apply
+my $ds; # Dataset to use
+my @data;       # Special data reserved for the expressions, to pass data
+# Perl expressions to evaluate
+my $perl_exp_warn;
+my $perl_exp_crit;
+my $perl_exp_default;
+my $expire;
+my $debug;
+
+# Evaluate Command Line Parameters
+my $status = GetOptions(
+                        "file=s",\$rrdfile,
+                        "critical=s",\$perl_exp_crit,
+                        "warning=s",\$perl_exp_warn,
+                        "default=s",\$perl_exp_default,
+                        "dataset=i",\$ds,
+                        "expire=i",\$expire,
+                        "cf=s",\$cf,
+                        "debug",\$debug
+                        );
+
+$ds =~ s/\$$//g if ($ds);               # Sometimes Nagios gives 1$ as the last parameter
+$cf =~ s/\$$//g if($cf);                # Sometimes Nagios gives 1$ as the last parameter
+$rrdfile =~ s/\$$//g if($rrdfile);      # Sometimes Nagios gives 1$ as the last parameter
+
+$perl_exp_crit =~ s/\$$//g if($perl_exp_crit);          # Sometimes Nagios gives 1$ as the last parameter
+$perl_exp_warn =~ s/\$$//g if($perl_exp_warn);          # Sometimes Nagios gives 1$ as the last parameter
+$perl_exp_default =~ s/\$$//g if($perl_exp_default);            # Sometimes Nagios gives 1$ as the last parameter
+
+usage() if ($status == 0 || ! ($rrdfile && $perl_exp_warn && $perl_exp_crit)); #  && $perl_exp_default)); 
+
+
+        print $perl_exp_crit,"\n" if($debug);
+        print $perl_exp_warn,"\n" if($debug);
+        print $perl_exp_default,"\n" if($debug);
+# Defaults
+$ds=0 if(!($ds));
+$cf="MAX" if(!($cf));
+$expire=5*60 if(!($expire));
+
+if (! $rrdfile) {
+        print "Can't open data file for $rrdfile\n";    # Aaaargh!
+        return $ERRORS{'UNKNOWN'};      # Unknown
+}
+
+if($expire!=0)
+        {
+        my ($last) = RRDs::last($rrdfile);
+        printf("Now: %d Last: %d\n",time(),$last) if ($debug);
+        my $now=time();
+        if($now - $last > $expire*60)
+                {
+                printf("RRD data has not been updated within expiry interval. %d minutes since last update\n",($now-$last)/60);
+                exit $ERRORS{'WARNING'};
+                }
+
+        }
+my ($start,$step,$names,$data) = RRDs::fetch ($rrdfile,$cf);
+my $ERR=RRDs::error;
+if($ERR) {
+        print "ERROR while fetching $rrdfile: $ERR\n"; # Ooops.....
+        exit $ERRORS{'UNKNOWN'};      # Unknown
+}
+
+  my $line = @$data[$#data -1];
+    my $value = @$line[$ds];
+
+my $result;     # Result of the expressions (will be printed)
+
+# First check for critical errors
+$perl_exp_crit =~ /(.*)/;
+$perl_exp_crit = $1;
+        print $perl_exp_crit,"\n" if($debug);
+$result = eval $perl_exp_crit;
+if ($result) {
+        print $result;
+        print $perl_exp_crit,"\n" if($debug);
+        exit 2;         # Critical
+}
+
+# Check for warnings
+$perl_exp_warn =~ /(.*)/;
+$perl_exp_warn = $1;
+        print $perl_exp_warn,"\n" if($debug);
+$result = eval $perl_exp_warn;
+if ($result) {
+        print $result;
+        print $perl_exp_warn,"\n" if($debug);
+        exit 1;         # Warning
+}
+
+$perl_exp_default =~ /(.*)/;
+$perl_exp_default = $1;
+        print $perl_exp_default,"\n" if($debug);
+eval $perl_exp_default; # Normally returns 0 (OK)
+
diff --git a/web/attachments/63089-check_ups.c_diff.gz b/web/attachments/63089-check_ups.c_diff.gz
new file mode 100644
index 0000000..699ac60
--- /dev/null
+++ b/web/attachments/63089-check_ups.c_diff.gz
diff --git a/web/attachments/63596-nagplug-bug.tgz b/web/attachments/63596-nagplug-bug.tgz
new file mode 100644
index 0000000..481f784
--- /dev/null
+++ b/web/attachments/63596-nagplug-bug.tgz
diff --git a/web/attachments/63638-check_ntp.patchfile b/web/attachments/63638-check_ntp.patchfile
new file mode 100644
index 0000000..619b43c
--- /dev/null
+++ b/web/attachments/63638-check_ntp.patchfile
@@ -0,0 +1,29 @@
+*** check_ntp.orig      2003-08-15 08:59:00.000000000 -0400
+--- check_ntp   2003-10-06 21:21:20.000000000 -0400
+##  fixes error parsing ntpq output if 'poll' includes an "m", and 
+##  corrected spelling of "CAndidate"
+***************
+*** 258,268 ****
+                        # number of candidates on <host> for sys.peer
+                        if (/^(\*|\+|\#|o])/) {
+                                ++$candidates;
+!                               print "Candiate count= $candidates\n" if ($verbose);
+                        }
+  
+                        # match sys.peer or pps.peer
+!                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
+                                $syspeer = $2;
+                                $stratum = $4;
+                                $jitter = $11;
+--- 258,268 ----
+                        # number of candidates on <host> for sys.peer
+                        if (/^(\*|\+|\#|o])/) {
+                                ++$candidates;
+!                               print "Candidate count= $candidates\n" if ($verbose);
+                        }
+  
+                        # match sys.peer or pps.peer
+!                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb]+)\s+([-0-9m.]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
+                                $syspeer = $2;
+                                $stratum = $4;
+                                $jitter = $11;
diff --git a/web/attachments/63906-check_linux_raid.patch b/web/attachments/63906-check_linux_raid.patch
new file mode 100644
index 0000000..81fa040
--- /dev/null
+++ b/web/attachments/63906-check_linux_raid.patch
@@ -0,0 +1,26 @@
+Index: check_linux_raid.pl
+===================================================================
+--- check_linux_raid.pl (revision 145)
++++ check_linux_raid.pl (working copy)
+@@ -26,6 +26,12 @@
+ 
+ my %ERRORS=('DEPENDENT'=>4,'UNKNOWN'=>3,'OK'=>0,'WARNING'=>1,'CRITICAL'=>2);
+ 
++# die with an error if we're not on Linux
++if ($^O ne 'linux') {
++    print "This plugin only applicable on Linux.\n";
++    exit $ERRORS{'UNKNOWN'};
++}
++
+ open (MDSTAT, "</proc/mdstat") or die "Failed to open /proc/mdstat";
+ my $found = 0;
+ my $status = "";
+@@ -41,7 +47,7 @@
+             ($finish) = /finish=(.*?min)/;
+         }
+     } else {
+-        if (/$ARGV[0]/) {
++        if (/^$ARGV[0]\s*:/) {
+             $found = 1;
+             if (/active/) {
+                 $active = 1;
diff --git a/web/attachments/66045-check_ping.c.diff b/web/attachments/66045-check_ping.c.diff
new file mode 100644
index 0000000..2fc372f
--- /dev/null
+++ b/web/attachments/66045-check_ping.c.diff
@@ -0,0 +1,5 @@
+395,398d394
+<                                       (input_buffer, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss",                                 
+<                                               &pl) == 1                      
+<                                       /* RedHat 9 as reported by Luiz Felipe E */
+<                               || sscanf                                      
diff --git a/web/attachments/66456-nagios-plugins-1.3.1-check-apc-ups.patch b/web/attachments/66456-nagios-plugins-1.3.1-check-apc-ups.patch
new file mode 100644
index 0000000..ec5f72b
--- /dev/null
+++ b/web/attachments/66456-nagios-plugins-1.3.1-check-apc-ups.patch
@@ -0,0 +1,220 @@
+diff -ruN nagios-plugins-1.3.1/contrib/check_apc_ups.pl nagios-plugins-1.3.1-new/contrib/check_apc_ups.pl
+--- nagios-plugins-1.3.1/contrib/check_apc_ups.pl       2002-08-14 20:02:31.000000000 +0100
++++ nagios-plugins-1.3.1-new/contrib/check_apc_ups.pl   2003-07-14 18:39:57.000000000 +0100
+@@ -9,11 +9,19 @@
+ #   remaining: hh:mm:ss" if all is well, and a list of specific problems
+ #   if something is broken. 
+ 
++BEGIN {
++  if ($0 =~ m/^(.*?)[\/\\]([^\/\\]+)$/) {
++    $runtimedir = $1;
++    $PROGNAME = $2;
++  }
++}
++
++require 5.004;
++use POSIX;
+ use strict;
+ use Getopt::Long;
+-use vars qw($opt_V $opt_h $opt_H $opt_T $opt_t $opt_R $opt_r 
+-  $opt_L $opt_l $PROGNAME);
+-use lib utils.pm;
++use vars qw($opt_V $opt_h $opt_H $opt_T $opt_t $opt_R $opt_r $opt_L $opt_l $community $PROGNAME);
++use lib $main::runtimedir;
+ use utils qw(%ERRORS &print_revision &support &usage);
+ 
+ sub print_help ();
+@@ -24,18 +32,24 @@
+ $ENV{'PATH'}='';
+ $ENV{'BASH_ENV'}=''; 
+ $ENV{'ENV'}='';
++$ENV{'CDPATH'}='';
+ 
+-Getopt::Long::Configure('bundling');
++my $verbose = 0;
++$community="public";
++
++Getopt::Long::Configure('no_ignore_case');
+ GetOptions
+-       ("V"   => \$opt_V, "version"            => \$opt_V,
+-        "h"   => \$opt_h, "help"               => \$opt_h,
+-        "T=s" => \$opt_T, "temp-critical"      => \$opt_T,
+-        "t=s" => \$opt_t, "temp-warning"       => \$opt_t,
+-        "R=s" => \$opt_R, "runtime-critical"   => \$opt_R,
+-        "r=s" => \$opt_r, "runtime-warning"    => \$opt_r,
+-        "L=s" => \$opt_L, "load-critical"      => \$opt_L,
+-        "l=s" => \$opt_l, "load-warning"       => \$opt_l,
+-        "H=s" => \$opt_H, "hostname=s"         => \$opt_H);
++       ("V|version"            => \$opt_V,
++        "h|help"               => \$opt_h,
++        "T|temp-critical:i"    => \$opt_T,
++        "t|temp-warning:i"     => \$opt_t,
++        "R|runtime-critical:i" => \$opt_R,
++        "r|runtime-warning:i"  => \$opt_r,
++        "L|load-critical:i"    => \$opt_L,
++        "l|load-warning:i"     => \$opt_l,
++        "H|hostname=s"         => \$opt_H,
++        "C|community=s"        => \$community,
++        "v|verbose:+"          => \$verbose);
+ 
+ if ($opt_V) {
+        print_revision($PROGNAME,'$Revision: 1.2 $');
+@@ -51,7 +65,7 @@
+ # Defaults
+ 
+ $opt_R *= 60 * 100 if (defined $opt_R);        # Convert minutes to secs/100
+-$opt_r *= 60 * 100 if (defined $opt_R);
++$opt_r *= 60 * 100 if (defined $opt_r);
+ 
+ my $tempcrit    = $opt_T || 60;
+ my $tempwarn    = $opt_t || 40;
+@@ -140,7 +154,8 @@
+   [ "testInProgress",  $ERRORS{'OK'} ],        # 4
+ );
+ 
+-my $exitval     = $ERRORS{'UNKNOWN'};
++my $sep = ", ";
++my $exitval     = $ERRORS{'OK'};
+ my $data;
+ my $onbattery   = 3;
+ 
+@@ -148,10 +163,10 @@
+ 
+ print "Output status: ";
+ if (defined ($data) && defined ($outputStatVals[$data][0])) {
+-  print "$outputStatVals[$data][0] | ";
++  print "$outputStatVals[$data][0]$sep";
+   escalate_exitval($outputStatVals[$data][1]);
+ } else {
+-  print "unknown | ";
++  print "unknown$sep";
+ }
+ 
+ $data = get_snmp_int_val( $upsAdvBatteryRunTimeRemaining );
+@@ -161,7 +176,7 @@
+   my $hrs  = int($data / (60 * 60 * 100)); # Data is hundredths of a second
+   my $mins = int($data / (60 * 100)) % 60;
+   my $secs = ($data % 100) / 100;
+-  printf "%d:%02d:%05.2f | ", $hrs, $mins, $secs;
++  printf "%d:%02d:%05.2f$sep", $hrs, $mins, $secs;
+   if ($data <= $runtimecrit) {
+     escalate_exitval($ERRORS{'CRITICAL'});
+   } elsif ($data <= $runtimewarn) {
+@@ -170,7 +185,7 @@
+     escalate_exitval($ERRORS{'OK'});
+   }
+ } else {
+-  print "unknown | ";
++  print "unknown$sep";
+ }
+ 
+ $data = get_snmp_int_val( $upsBasicBatteryStatus );
+@@ -181,20 +196,20 @@
+   my $fc = get_snmp_int_val( $upsAdvInputLineFailCause );
+   if ($data == $onbattery) {
+     if (defined ($failCauseVals[$fc])) { $failcause = $failCauseVals[$fc]; }
+-    print "$battStatVals[$data][0] ($failcause) | ";
++    print "$battStatVals[$data][0] ($failcause)$sep";
+   } else {
+-    print "$battStatVals[$data][0] | ";
++    print "$battStatVals[$data][0]$sep";
+   }
+   escalate_exitval($battStatVals[$data][1]);
+ } else {
+-  print "unknown | ";
++  print "unknown$sep";
+ }
+ 
+ $data = get_snmp_int_val( $upsAdvBatteryTemperature );
+ 
+ print "Battery temp(C): ";
+ if (defined ($data)) {
+-  print "$data | ";
++  print "$data$sep";
+   if ($data >= $tempcrit) {
+     escalate_exitval($ERRORS{'CRITICAL'});
+   } elsif ($data >= $tempwarn) {
+@@ -203,24 +218,24 @@
+     escalate_exitval($ERRORS{'OK'});
+   }
+ } else {
+-  print "unknown | ";
++  print "unknown$sep";
+ }
+ 
+ $data = get_snmp_int_val( $upsAdvBatteryReplaceIndicator );
+ 
+ print "Battery repl: ";
+ if (defined ($data) && defined ($battReplVals[$data][0])) {
+-  print "$battReplVals[$data][0] | ";
++  print "$battReplVals[$data][0]$sep";
+   escalate_exitval($battReplVals[$data][1]);
+ } else {
+-  print "unknown | ";
++  print "unknown$sep";
+ }
+ 
+ $data = get_snmp_int_val( $upsAdvOutputLoad );
+ 
+ print "Output load (%): ";
+ if (defined ($data)) {
+-  print "$data | ";
++  print "$data$sep";
+   if ($data >= $loadcrit) {
+     escalate_exitval($ERRORS{'CRITICAL'});
+   } elsif ($data >= $loadwarn) {
+@@ -229,19 +244,25 @@
+     escalate_exitval($ERRORS{'OK'});
+   }
+ } else {
+-  print "unknown | ";
++  print "unknown$sep";
+ }
+ 
+ $data = get_snmp_int_val( $upsAdvTestDiagnosticsResults );
+ 
+ print "Diag result: ";
+ if (defined ($data) && defined ($diagnosticsResultsVals[$data][0])) {
+-  print "$diagnosticsResultsVals[$data][0]\n";
++  print "$diagnosticsResultsVals[$data][0]$sep";
+   escalate_exitval($diagnosticsResultsVals[$data][1]);
+ } else {
+-  print "unknown\n";
++  print "unknown$sep";
+ }
+ 
++foreach my $key (keys %ERRORS) {
++  if ($ERRORS{$key} == $exitval) {
++    print "Status $key\n";
++    last;
++  }
++}
+ 
+ exit $exitval;
+ 
+@@ -263,6 +284,8 @@
+        print "
+ -H, --hostname=HOST
+    Name or IP address of host to check
++-C, --community=string
++   Community string to use to query UPS (default: public)
+ -T --temp-critical
+    Battery degrees C above which a CRITICAL status will result (default: 60)
+ -t --temp-warning
+@@ -284,7 +307,7 @@
+   my $val=0;
+   my $oid = shift(@_);
+ 
+-  $val = `/usr/bin/snmpget $host public $oid 2> /dev/null`;
++  $val = `/usr/bin/snmpget -v 1 -c $community $host $oid 2> /dev/null`;
+   my @test = split(/ /,$val,3);
+ 
+   return undef unless (defined ($test[2]));
+@@ -297,6 +320,7 @@
+     $val = $test[2];
+   }
+ 
++  chomp($val);
+   return $val;
+ }
+ 
diff --git a/web/attachments/66458-nagios-plugins-1.3.1-check-breeze.patch b/web/attachments/66458-nagios-plugins-1.3.1-check-breeze.patch
new file mode 100644
index 0000000..49d7beb
--- /dev/null
+++ b/web/attachments/66458-nagios-plugins-1.3.1-check-breeze.patch
@@ -0,0 +1,12 @@
+diff -ruN nagios-plugins-1.3.1/plugins-scripts/check_breeze.pl nagios-plugins-1.3.1-new/plugins-scripts/check_breeze.pl
+--- nagios-plugins-1.3.1/plugins-scripts/check_breeze.pl        2002-10-28 13:05:06.000000000 +0000
++++ nagios-plugins-1.3.1-new/plugins-scripts/check_breeze.pl    2003-07-14 18:39:57.000000000 +0100
+@@ -47,7 +47,7 @@
+ ($opt_C) || ($opt_C = "public") ;
+ 
+ my $sig=0;
+-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
++$sig = `/usr/bin/snmpget -v 1 -OQ -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
+ my @test=split(/ /,$sig);
+ $sig=$test[2];
+ $sig=int($sig);
diff --git a/web/attachments/66459-nagios-plugins-1.3.1-check-dns.patch b/web/attachments/66459-nagios-plugins-1.3.1-check-dns.patch
new file mode 100644
index 0000000..0f3d631
--- /dev/null
+++ b/web/attachments/66459-nagios-plugins-1.3.1-check-dns.patch
@@ -0,0 +1,646 @@
+diff -ruN nagios-plugins-1.3.1/plugins/check_dns.c nagios-plugins-1.3.1-new/plugins/check_dns.c
+--- nagios-plugins-1.3.1/plugins/check_dns.c    2003-05-31 15:39:33.000000000 +0100
++++ nagios-plugins-1.3.1-new/plugins/check_dns.c        2003-07-14 19:59:16.000000000 +0100
+@@ -11,6 +11,7 @@
+  * Notes:
+  *  - Safe popen added by Karl DeBisschop 9-11-99
+  *  - expected-address parameter added by Alex Chaffee - 7 Oct 2002
++ *  - extended to use RESOLVER, HOST or NSLOOKUP by Howard Wilkinson - 24 March 2003
+  *
+  * Command line: (see print_usage)
+  *
+@@ -46,6 +47,28 @@
+ 
+ #include "common.h"
+ #include "popen.h"
++
++#ifdef USE_NSLOOKUP
++#  if !defined(NSLOOKUP_COMMAND)
++#    error "Need NSLOOKUP to use this option"
++#  endif
++#endif
++#ifdef USE_HOST
++#  if !defined(HOST_COMMAND)
++#    error "Need HOST to use this option"
++#  endif
++#endif
++#if defined(USE_NSLOOKUP)
++#  undef USE_HOST
++#  undef USE_RESOLVER
++#elif defined(USE_HOST)
++#  undef USE_RESOLVER
++#elif !defined(USE_RESOLVER)
++#  define USE_NSLOOKUP
++#endif
++#ifdef USE_RESOLVER
++#include "netutils.h"
++#endif
+ #include "utils.h"
+ 
+ const char *progname = "check_dns";
+@@ -58,7 +81,9 @@
+ void print_help (void);
+ int error_scan (char *);
+ 
+-#define ADDRESS_LENGTH 256
++#define ADDRESS_LENGTH 10240
++#define RRTYPE_LENGTH 32
++char record_type[RRTYPE_LENGTH] = "A";
+ char query_address[ADDRESS_LENGTH] = "";
+ char dns_server[ADDRESS_LENGTH] = "";
+ char ptr_server[ADDRESS_LENGTH] = "";
+@@ -69,144 +94,293 @@
+ int
+ main (int argc, char **argv)
+ {
+-       char *command_line = NULL;
+-       char input_buffer[MAX_INPUT_BUFFER];
+-       char *output = NULL;
+-       char *address = NULL;
+-       char *temp_buffer = NULL;
+-       int result = STATE_UNKNOWN;
+-
+-       /* Set signal handling and alarm */
+-       if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+-               printf ("Cannot catch SIGALRM");
+-               return STATE_UNKNOWN;
++  char *command_line = NULL;
++  char input_buffer[MAX_INPUT_BUFFER];
++  char *output = NULL;
++  char *address = NULL;
++  char *temp_buffer = NULL;
++  int result = STATE_UNKNOWN;
++  int linecnt = 0;
++
++  /* Set signal handling and alarm */
++  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
++    printf ("Cannot catch SIGALRM");
++    return STATE_UNKNOWN;
++  }
++  if (process_arguments (argc, argv) != OK) {
++    print_usage ();
++    return STATE_UNKNOWN;
++  }
++  /* get the command to run */
++#ifdef USE_RESOLVER
++#error "THIS CODE DOES NOT WORK"
++  {
++    int i;
++    struct hostent *response;
++    res_init();
++    if (strlen(dns_server)) {
++      if ((response=gethostbyname(dns_server)) == NULL) {
++       printf ("DNS problem = server %s can not be resolved %s\n",
++               dns_server, strerror(h_errno));
++       return STATE_CRITICAL;
++      } else {
++       _res.nscount = response->h_length;
++       for (i = 0; i < response->h_length && i < MAXNS; i++) {
++         if (response->h_addr_list[i] == NULL) {
++           break;
++         }
++         _res.nsaddr_list[i].sin_family      = AF_INET;
++         _res.nsaddr_list[i].sin_port        = NS_DEFAULTPORT;
++         _res.nsaddr_list[i].sin_addr.s_addr = ((struct in_addr *)response->h_addr_list[i])->s_addr;
+        }
+-
+-       if (process_arguments (argc, argv) != OK) {
+-               print_usage ();
+-               return STATE_UNKNOWN;
++      }
++      _res.options &= ~(RES_RECURSE|RES_DEFNAMES);
++    }
++    if ((response=gethostbyname(query_address)) == NULL) {
++      asprintf (&output, "lookup failed with %s", strerror(h_errno));
++      result = STATE_CRITICAL;
++    } else {
++      int len=0;
++      struct in_addr in;
++      for (i = 0; i < response->h_length; i++) {
++       if (response->h_addr_list[i] == NULL) {
++         break;
+        }
+-
+-       /* get the command to run */
+-       asprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND,  query_address, dns_server);
+-
+-       alarm (timeout_interval);
+-       time (&start_time);
+-
+-       if (verbose)
+-               printf ("%s\n", command_line);
+-       /* run the command */
+-       child_process = spopen (command_line);
+-       if (child_process == NULL) {
+-               printf ("Could not open pipe: %s\n", command_line);
+-               return STATE_UNKNOWN;
++       memcpy(&in, ((struct in_addr *)response->h_addr_list[i]), sizeof(in));
++       len+=strlen(inet_ntoa(in))+1;
++      }
++      address =(char *)malloc(len);
++      address[0]='\0';
++      for (i = 0; i < response->h_length; i++) {
++       if (response->h_addr_list[i] == NULL) {
++         break;
+        }
+-
+-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+-       if (child_stderr == NULL)
+-               printf ("Could not open stderr for %s\n", command_line);
+-
+-       /* scan stdout */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+-
+-               if (verbose)
+-                       printf ("%s\n", input_buffer);
+-
+-               if (strstr (input_buffer, ".in-addr.arpa")) {
+-                       if ((temp_buffer = strstr (input_buffer, "name = ")))
+-                               address = strscpy (address, temp_buffer + 7);
+-                       else {
+-                               output = strscpy (output, "Unknown error (plugin)");
+-                               result = STATE_WARNING;
+-                       }
+-               }
+-
+-               /* the server is responding, we just got the host name... */
+-               if (strstr (input_buffer, "Name:")) {
+-
+-                       /* get the host address */
+-                       if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+-                               break;
+-
+-                       if (verbose)
+-                               printf ("%s\n", input_buffer);
+-
+-                       if ((temp_buffer = index (input_buffer, ':'))) {
+-                               temp_buffer++;
+-                               /* Strip leading spaces */
+-                               for (; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
+-                                       /* NOOP */;
+-                               address = strdup (temp_buffer);
+-                               strip (address);
+-                               if (address==NULL || strlen(address)==0)
+-                                       terminate (STATE_CRITICAL,
+-                                                  "DNS CRITICAL - '%s' returned empty host name string\n",
+-                                                  NSLOOKUP_COMMAND);
+-                               result = STATE_OK;
+-                       }
+-                       else {
+-                               output = strdup ("Unknown error (plugin)");
+-                               result = STATE_WARNING;
+-                       }
+-
+-                       break;
+-               }
+-
+-               result = error_scan (input_buffer);
+-               if (result != STATE_OK) {
+-                       output = strscpy (output, 1 + index (input_buffer, ':'));
+-                       break;
+-               }
+-
++       memcpy(&in, ((struct in_addr*)response->h_addr_list[i]), sizeof(in));
++       strcat(address, inet_ntoa(in));
++       strcat(address, ",");
++      }
++      address[strlen(address)-1]='\0';
++      result = STATE_OK;
++    }
++  }
++#endif
++#ifdef USE_NSLOOKUP
++  asprintf (&command_line, "%s -timeout=%d -query=%s %s %s",
++           NSLOOKUP_COMMAND, timeout_interval-1,
++           record_type, query_address, dns_server);
++#endif
++#ifdef USE_HOST
++#error "HOST IS NOT IMPLEMENTED YET"
++  asprintf (&command_line, "%s -W %d -t %s %s %s",
++           HOST_COMMAND, timeout_interval-1,
++           record_type, query_address, dns_server);
++#endif
++  alarm (timeout_interval);
++  time (&start_time);
++  if (verbose)
++    printf ("%s\n", command_line);
++  /* run the command */
++  child_process = spopen (command_line);
++  if (child_process == NULL) {
++    printf ("Could not open pipe: %s\n", command_line);
++    return STATE_UNKNOWN;
++  }
++  child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
++  if (child_stderr == NULL)
++    printf ("Could not open stderr for %s\n", command_line);
++#ifdef USE_NSLOOKUP
++  /* scan stdout */
++  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++    if (verbose)
++      printf ("%s\n", input_buffer);
++    if (linecnt == 0) {
++      /* First line should be server name */
++      if (strstr (input_buffer, "Server:") != input_buffer) {
++       output = strscpy (output, "NSLOOKUP error (plugin) - no Server line found");
++       result = STATE_WARNING;
++      }
++      linecnt++;
++    } else if (linecnt == 1) {
++      /* Next line is server address */
++      if (strstr (input_buffer, "Address:") != input_buffer) {
++       output = (output == NULL)
++         ?strscpy (output, "NSLOOKUP error (plugin) - no Address line found")
++         :strscat (output, ", no Address line found");
++       result = STATE_WARNING;
++      }
++      linecnt++;
++    } else {
++      linecnt++;
++      strip(input_buffer);
++      if (strstr (input_buffer, ".in-addr.arpa")) {
++       if ((temp_buffer = strstr (input_buffer, "name = ")))
++         address = strscpy (address, temp_buffer + 7);
++       else {
++         output = strscpy (output, "Unknown error (plugin)");
++         result = STATE_WARNING;
+        }
+-
+-       /* scan stderr */
+-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+-               if (error_scan (input_buffer) != STATE_OK) {
+-                       result = max_state (result, error_scan (input_buffer));
+-                       output = strscpy (output, 1 + index (input_buffer, ':'));
+-               }
++       continue;
++      } else if ((temp_buffer = strstr (input_buffer, "canonical name ="))) {
++       address = strscat (address, temp_buffer + strlen("cannonical name ="));
++       continue;
++      } else if ((temp_buffer = strstr (input_buffer, "hinfo ="))) {
++       address = strscat (address, temp_buffer + strlen("hinfo ="));
++       continue;
++      } else if ((temp_buffer = strstr (input_buffer, "mail exchanger ="))) {
++       address = strscat (address, temp_buffer + strlen("mail exchanger ="));
++       continue;
++      } else if ((temp_buffer = strstr (input_buffer, "nameserver ="))) {
++       address = strscat (address, temp_buffer + strlen("nameserver ="));
++       continue;
++      } else if ((temp_buffer = strstr (input_buffer, "text ="))) {
++       address = strscat (address, temp_buffer + strlen("text ="));
++       continue;
++      } else if (strcasecmp(record_type, "SOA") == 0) {
++       if (strncasecmp(input_buffer, query_address, strlen(query_address)) == 0) {
++         /* Read in SOA */
++         while(fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++           if (verbose)
++             printf ("%s\n", input_buffer);
++           strip(input_buffer);
++           address = strscat(address, input_buffer+1);
++           if (strstr(input_buffer, "minimum ="))
++             break;
++         }
++         continue;
+        }
+-
+-       /* close stderr */
+-       (void) fclose (child_stderr);
+-
+-       /* close stdout */
+-       if (spclose (child_process)) {
+-               result = max_state (result, STATE_WARNING);
+-               if (!strcmp (output, ""))
+-                       output = strscpy (output, "nslookup returned error status");
++      } else if (strstr (input_buffer, "Name:")) {
++       /* the server is responding, we just got the host name... */
++       /* get the host address */
++       if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
++         break;
++       strip (input_buffer);
++       if (verbose)
++         printf ("%s\n", input_buffer);
++       if ((temp_buffer = index (input_buffer, ':'))) {
++         address = strscpy (address, temp_buffer + 2);
++         strip (address);
++         result = STATE_OK;
++       } else {
++         output = strscpy (output, "Unknown error (plugin)");
++         result = STATE_WARNING;
+        }
+-
+-       /* If we got here, we should have an address string, 
+-          and we can segfault if we do not */
++       continue;
++      }
++    }
++    result = error_scan (input_buffer);
++    if (result != STATE_OK) {
++      output = strscpy (output, 1 + index (input_buffer, ':'));
++      break;
++    }
++  }
++  /* scan stderr */
++  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
++    if (error_scan (input_buffer) != STATE_OK) {
++      result = max_state (result, error_scan (input_buffer));
++      output = strscpy (output, 1 + index (input_buffer, ':'));
++    }
++  }
++  /* close stderr */
++  (void) fclose (child_stderr);
++  /* close stdout */
++  if (spclose (child_process)) {
++    result = max_state (result, STATE_WARNING);
++    if (!strcmp (output, ""))
++      output = strscpy (output, "nslookup returned error status");
++  }
++#endif
++#ifdef USE_HOST
++#error "HOST IS NOT IMPLEMENTED YET"
++  /* scan stdout */
++  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
++    if (verbose)
++      printf ("%s\n", input_buffer);
++    if (strstr (input_buffer, ".in-addr.arpa")) {
++      if ((temp_buffer = strstr (input_buffer, "name = ")))
++       address = strscpy (address, temp_buffer + 7);
++      else {
++       output = strscpy (output, "Unknown error (plugin)");
++       result = STATE_WARNING;
++      }
++    }
++    /* the server is responding, we just got the host name... */
++    if (strstr (input_buffer, "Name:")) {
++      /* get the host address */
++      if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
++       break;
++      if (verbose)
++       printf ("%s\n", input_buffer);
++      if ((temp_buffer = index (input_buffer, ':'))) {
++       temp_buffer++;
++       /* Strip leading spaces */
++       for (; *temp_buffer != '\0' && *temp_buffer == ' '; temp_buffer++)
++         /* NOOP */;
++       address = strdup (temp_buffer);
++       strip (address);
+        if (address==NULL || strlen(address)==0)
+-               terminate (STATE_CRITICAL,
+-                          "DNS CRITICAL - '%s' output parsing exited with no address\n",
+-                          NSLOOKUP_COMMAND);
+-
+-       /* compare to expected address */
+-       if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
+-               result = STATE_CRITICAL;
+-               asprintf(&output, "expected %s but got %s", expected_address, address);
+-       }
+-       
+-       (void) time (&end_time);
+-
+-       if (result == STATE_OK)
+-               printf ("DNS ok - %d seconds response time, Address(es) is/are %s\n",
+-                                               (int) (end_time - start_time), address);
+-       else if (result == STATE_WARNING)
+-               printf ("DNS WARNING - %s\n",
+-                       !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
+-       else if (result == STATE_CRITICAL)
+-               printf ("DNS CRITICAL - %s\n",
+-                       !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
+-       else
+-               printf ("DNS problem - %s\n",
+-                       !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
+-
+-       return result;
++         terminate (STATE_CRITICAL,
++                    "DNS CRITICAL - '%s' returned empty host name string\n",
++                    NSLOOKUP_COMMAND);
++       result = STATE_OK;
++      }
++      else {
++       output = strdup ("Unknown error (plugin)");
++       result = STATE_WARNING;
++      }
++      break;
++    }
++    result = error_scan (input_buffer);
++    if (result != STATE_OK) {
++      output = strscpy (output, 1 + index (input_buffer, ':'));
++      break;
++    }
++  }
++  /* scan stderr */
++  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
++    if (error_scan (input_buffer) != STATE_OK) {
++      result = max (result, error_scan (input_buffer));
++      output = strscpy (output, 1 + index (input_buffer, ':'));
++    }
++  }
++  /* close stderr */
++  (void) fclose (child_stderr);
++  /* close stdout */
++  if (spclose (child_process)) {
++    result = max_state (result, STATE_WARNING); /* was "max" check for problems */
++    if (!strcmp (output, ""))
++      output = strscpy (output, "nslookup returned error status");
++  }
++#endif
++  (void) time (&end_time);
++  if (address) {
++    while (isspace(address[0])) {
++      address=&address[1];
++    }
++  }
++  /* If we got here, we should have an address string, 
++     and we can segfault if we do not */
++  if (address==NULL || strlen(address)==0)
++    terminate (STATE_CRITICAL,
++              "DNS CRITICAL - '%s' output parsing exited with no address\n",
++              NSLOOKUP_COMMAND);
++  /* compare to expected address */
++  if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
++    result = STATE_CRITICAL;
++    asprintf(&output, "expected %s but got %s", expected_address, address);
++  }
++  if (result == STATE_OK)
++    printf ("DNS ok - %d seconds response time, Address(es) is/are %s\n",
++           (int) (end_time - start_time), address);
++  else if (result == STATE_WARNING)
++    printf ("DNS WARNING - %s\n",
++           !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
++  else if (result == STATE_CRITICAL)
++    printf ("DNS CRITICAL - %s\n",
++           !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
++  else
++    printf ("DNS problem - %s\n",
++           !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
++  return result;
+ }
+ 
+ int
+@@ -262,6 +436,13 @@
+        else if (strstr (input_buffer, "Format error"))
+                return STATE_WARNING;
+ 
++       else if (strstr (input_buffer, "No answer"))
++               return STATE_WARNING;
++
++       /* Server is not authoritative for this question */
++       else if (strstr (input_buffer, "Non-authoritative answer"))
++               return STATE_OK;
++
+        else
+                return STATE_OK;
+ 
+@@ -283,7 +464,8 @@
+                {"hostname", required_argument, 0, 'H'},
+                {"server", required_argument, 0, 's'},
+                {"reverse-server", required_argument, 0, 'r'},
+-               {"expected-address", required_argument, 0, 'a'},
++               {"expected-answer", required_argument, 0, 'a'},
++               {"resource-record", required_argument, 0, 'T'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -297,9 +479,9 @@
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+-               c = getopt_long (argc, argv, "hVvt:H:s:r:a:", long_opts, &opt_index);
++               c = getopt_long (argc, argv, "+?hVvt:H:s:r:a:T:", long_opts, &opt_index);
+ #else
+-               c = getopt (argc, argv, "hVvt:H:s:r:a:");
++               c = getopt (argc, argv, "+?hVvt:H:s:r:a:T:");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -352,17 +534,17 @@
+                                terminate (STATE_UNKNOWN, "Input buffer overflow\n");
+                        strcpy (ptr_server, optarg);
+                        break;
+-               case 'a': /* expected address */
+-                       if (is_dotted_quad (optarg) == FALSE) {
+-                               printf ("Invalid expected address\n\n");
+-                               print_usage ();
+-                               exit (STATE_UNKNOWN);
+-                       }
++               case 'a': /* expected answer */
+                        if (strlen (optarg) >= ADDRESS_LENGTH)
+                                terminate (STATE_UNKNOWN, "Input buffer overflow\n");
+                        strcpy (expected_address, optarg);
+                        match_expected_address = TRUE;
+                        break;
++               case 'T': /* Resource record type */
++                       if (strlen (optarg) >= RRTYPE_LENGTH)
++                               terminate (STATE_UNKNOWN, "INput buffer overflow\n");
++                       strcpy (record_type, optarg);
++                       break;
+                }
+        }
+ 
+@@ -402,8 +584,10 @@
+ void
+ print_usage (void)
+ {
+-       printf ("Usage: %s -H host [-s server] [-a expected-address] [-t timeout]\n" "       %s --help\n"
+-                                       "       %s --version\n", progname, progname, progname);
++       printf ("Usage: %s -H host [-s server] [-r reverse-server] [-t timeout] [-T querytype] [-a answer]\n"
++               "       %s --help\n"
++               "       %s --version\n",
++               progname, progname, progname);
+ }
+ 
+ void
+@@ -418,16 +602,28 @@
+                 "   The name or address you want to query\n"
+                 "-s, --server=HOST\n"
+                 "   Optional DNS server you want to use for the lookup\n"
+-                "-a, --expected-address=IP-ADDRESS\n"
+-                "   Optional IP address you expect the DNS server to return\n"
++                "-r, --reverse-server=HOST\n"
++                "   Optional DNS server to do PTR lookup - NOT IMPLEMENTED\n"
+                 "-t, --timeout=INTEGER\n"
+                 "   Seconds before connection times out (default: %d)\n"
++                "-T, --resource-record=QUERYTYPE\n"
++                "   Type of query to issue - default is A - [A,CNAME,HINFO,MINFO,MX,NS,PTR,SOA,TXT,UINFO,WKS,ANY]\n"
++                "-a, --expected-answer=STRING\n"
++                "   String to match from server as answer - be very careful how you specify this\n"
+                 "-h, --help\n"
+                 "   Print detailed help\n"
+                 "-V, --version\n"
+                 "   Print version numbers and license information\n"
+                 "\n"
++#ifdef USE_NSLOOKUP
+                 "This plugin uses the nslookup program to obtain the IP address\n"
++#endif
++#ifdef USE_HOST
++                "This plugin uses the host program to obtain the IP address\n"
++#endif
++#ifdef USE_RESOLVER
++                "This plugin uses the resolver library to obtain the IP address\n"
++#endif
+                 "for the given host/domain query.  A optional DNS server to use may\n"
+                 "be specified.  If no DNS server is specified, the default server(s)\n"
+                 "specified in /etc/resolv.conf will be used.\n", DEFAULT_SOCKET_TIMEOUT);
+diff -ruN nagios-plugins-1.3.1/plugins/check_tcp.c nagios-plugins-1.3.1-new/plugins/check_tcp.c
+--- nagios-plugins-1.3.1/plugins/check_tcp.c    2003-06-10 05:56:47.000000000 +0100
++++ nagios-plugins-1.3.1-new/plugins/check_tcp.c        2003-07-14 18:39:57.000000000 +0100
+@@ -67,7 +67,7 @@
+ void print_usage (void);
+ void print_help (void);
+ int my_recv (void);
+-
++int check_expect(char *);
+ char *progname = "check_tcp";
+ char *SERVICE = NULL;
+ char *SEND = NULL;
+@@ -259,6 +259,7 @@
+                while ((i = my_recv ()) > 0) {
+                        buffer[i] = '\0';
+                        asprintf (&status, "%s%s", status, buffer);
++                       if (server_expect_count > 0 && check_expect(status)) break;
+                        if (buffer[i-2] == '\r' && buffer[i-1] == '\n')
+                                break;
+                        if (maxbytes>0 && strlen(status)>=maxbytes)
+@@ -274,16 +275,11 @@
+                if (status && verbose)
+                        printf ("%s\n", status);
+ 
++               /* - does not do anything!!
+                if (server_expect_count > 0) {
+-                       for (i = 0;; i++) {
+-                               if (verbose)
+-                                       printf ("%d %d\n", i, server_expect_count);
+-                               if (i >= server_expect_count)
+-                                       terminate (STATE_WARNING, "Invalid response from host\n");
+-                               if (strstr (status, server_expect[i]))
+-                                       break;
+-                       }
++                 check_expect(status);
+                }
++               */
+        }
+ 
+        if (server_quit != NULL)
+@@ -608,10 +604,24 @@
+        }
+        else {
+ #endif
+-               i = read (sd, buffer, MAXBUF - 1);
++               i = recv (sd, buffer, MAXBUF - 1, 0);
+ #ifdef HAVE_SSL
+        }
+ #endif
+ 
+        return i;
+ }
++
++int check_expect(char * status) {
++  int i;
++
++  for (i = 0;; i++) {
++    if (verbose)
++      printf ("%d %d\n", i, server_expect_count);
++    if (i >= server_expect_count)
++      terminate (STATE_WARNING, "Invalid response from host\n");
++    if (strstr (status, server_expect[i]))
++      return TRUE;
++  }
++  return FALSE;
++}
diff --git a/web/attachments/66460-nagios-plugins-1.3.1-check-ldap.patch b/web/attachments/66460-nagios-plugins-1.3.1-check-ldap.patch
new file mode 100644
index 0000000..31bf7d1
--- /dev/null
+++ b/web/attachments/66460-nagios-plugins-1.3.1-check-ldap.patch
@@ -0,0 +1,67 @@
+--- ./plugins/check_ldap.c~     2003-01-29 06:16:15.000000000 +0000
++++ ./plugins/check_ldap.c      2003-10-22 11:10:44.000000000 +0100
+@@ -45,8 +45,6 @@
+ char *ld_attr = ld_defattr;
+ char *ld_host = "";
+ char *ld_base = "";
+-char *ld_passwd = NULL;
+-char *ld_binddn = NULL;
+ unsigned int ld_port = DEFAULT_PORT;
+ int warn_time = UNDEFINED;
+ int crit_time = UNDEFINED;
+@@ -74,20 +72,12 @@
+        time (&time0);
+ 
+        /* initialize ldap */
+-       if (!(ld = ldap_open (ld_host, ld_port))) {
++       if (!(ld = ldap_init (ld_host, ld_port))) {
+                /*ldap_perror(ld, "ldap_open"); */
+                printf ("Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
+ 
+-       /* bind to the ldap server */
+-       if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+-                       LDAP_SUCCESS) {
+-               /*ldap_perror(ld, "ldap_bind"); */
+-               printf ("Could not bind to the ldap-server\n");
+-               return STATE_CRITICAL;
+-       }
+-
+        /* do a search of all objectclasses in the base dn */
+        if (ldap_search_s (ld, ld_base, LDAP_SCOPE_BASE, ld_attr, NULL, 0, &result)
+                        != LDAP_SUCCESS) {
+@@ -140,8 +130,6 @@
+                {"host", required_argument, 0, 'H'},
+                {"base", required_argument, 0, 'b'},
+                {"attr", required_argument, 0, 'a'},
+-               {"bind", required_argument, 0, 'D'},
+-               {"pass", required_argument, 0, 'P'},
+                {"port", required_argument, 0, 'p'},
+                {"warn", required_argument, 0, 'w'},
+                {"crit", required_argument, 0, 'c'},
+@@ -159,9 +147,9 @@
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+-               c =     getopt_long (argc, argv, "hVt:c:w:H:b:p:a:D:P:", longopts, &option_index);
++               c =     getopt_long (argc, argv, "hVt:c:w:H:b:p:a:", longopts, &option_index);
+ #else
+-               c = getopt (argc, argv, "+?hVt:c:w:H:b:p:a:D:P:");
++               c = getopt (argc, argv, "+?hVt:c:w:H:b:p:a:");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -191,12 +179,6 @@
+                case 'a':
+                        ld_attr = optarg;
+                        break;
+-               case 'D':
+-                       ld_binddn = optarg;
+-                       break;
+-               case 'P':
+-                       ld_passwd = optarg;
+-                       break;
+                case 'w':
+                        warn_time = atoi (optarg);
+                        break;
diff --git a/web/attachments/66461-nagios-plugins-1.3.1-check-ntp.patch b/web/attachments/66461-nagios-plugins-1.3.1-check-ntp.patch
new file mode 100644
index 0000000..32101d8
--- /dev/null
+++ b/web/attachments/66461-nagios-plugins-1.3.1-check-ntp.patch
@@ -0,0 +1,33 @@
+diff -ruN nagios-plugins-1.3.1/plugins-scripts/check_ntp.pl nagios-plugins-1.3.1-new/plugins-scripts/check_ntp.pl
+--- nagios-plugins-1.3.1/plugins-scripts/check_ntp.pl   2003-05-19 11:16:05.000000000 +0100
++++ nagios-plugins-1.3.1-new/plugins-scripts/check_ntp.pl       2003-07-14 19:46:20.000000000 +0100
+@@ -57,12 +57,19 @@
+ #
+ # Patch for for regex for stratum1 refid.
+ 
++BEGIN {
++       if ($0 =~ m/^(.*?)[\/\\]([^\/\\]+)$/) {
++               $runtimedir = $1;
++               $PROGNAME = $2;
++       }
++}
++
+ require 5.004;
+ use POSIX;
+ use strict;
+ use Getopt::Long;
+ use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_j $opt_k $verbose $PROGNAME $def_jitter);
+-use lib utils.pm; 
++use lib $main::runtimedir; 
+ use utils qw($TIMEOUT %ERRORS &print_revision &support);
+ 
+ $PROGNAME="check_ntp";
+@@ -262,7 +269,7 @@
+                        }
+ 
+                        # match sys.peer or pps.peer
+-                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
++                       if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb]+)\s+([-0-9m.]+)\s+([-0-9.m]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
+                                $syspeer = $2;
+                                $stratum = $4;
+                                $jitter = $11;
diff --git a/web/attachments/66462-nagios-plugins-1.3.1-check-wave.patch b/web/attachments/66462-nagios-plugins-1.3.1-check-wave.patch
new file mode 100644
index 0000000..98c7393
--- /dev/null
+++ b/web/attachments/66462-nagios-plugins-1.3.1-check-wave.patch
@@ -0,0 +1,29 @@
+diff -ruN nagios-plugins-1.3.1/plugins-scripts/check_wave.pl nagios-plugins-1.3.1-new/plugins-scripts/check_wave.pl
+--- nagios-plugins-1.3.1/plugins-scripts/check_wave.pl  2002-10-28 13:05:08.000000000 +0000
++++ nagios-plugins-1.3.1-new/plugins-scripts/check_wave.pl      2003-07-14 18:39:57.000000000 +0100
+@@ -50,21 +50,21 @@
+ ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
+ my $warning = $1 if ($opt_w =~ /([0-9]+)/);
+ 
+-$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
++$low1 = `snmpget -v 1 -OQ -c public $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+ @test = split(/ /,$low1);
+ $low1 = $test[2];
+ 
+-$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
++$med1 = `snmpget -v 1 -OQ -c public $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+ @test = split(/ /,$med1);
+ $med1 = $test[2];
+ 
+-$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
++$high1 = `snmpget -v 1 -OQ -c public $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+ @test = split(/ /,$high1);
+ $high1 = $test[2];
+ 
+ sleep(2);
+ 
+-$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
++$snr = `snmpget -v 1 -OQ -c public $host .1.3.6.1.4.1.762.2.5.2.1.17.1`;
+ @test = split(/ /,$snr);
+ $snr = $test[2];
+ $snr = int($snr*25);
diff --git a/web/attachments/67988-autoconf.dif b/web/attachments/67988-autoconf.dif
new file mode 100644
index 0000000..53972e6
--- /dev/null
+++ b/web/attachments/67988-autoconf.dif
@@ -0,0 +1,26 @@
+diff -Naur nagios-plugins-1.3.1/configure.in nagios-plugins-1.3.1_autoconf_change/configure.in
+--- nagios-plugins-1.3.1/configure.in   2003-07-11 08:12:23.000000000 +0200
++++ nagios-plugins-1.3.1_autoconf_change/configure.in   2003-11-19 10:57:36.000000000 +0100
+@@ -176,9 +176,19 @@
+ _SAVEDLIBS="$LIBS"
+ _SAVEDCPPFLAGS="$CPPFLAGS"
+ AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
+-if test -n "$MYSQL"; then
+-  MYSQLLIBDIR=$MYSQL/lib/mysql
+-  CPPFLAGS="-I$MYSQL/include"
++AC_ARG_WITH(mysqllibdir,--with-mysqllibdir=<dir> sets the path to the mysql libraries,[MYSQLLIBDIR=$withval])
++if test -n "$MYSQL" -o -n "$MYSQLLIBDIR" ; then
++
++  dnl set default library if not supplied
++  if test -z "$MYSQLLIBDIR" ; then
++   MYSQLLIBDIR=$MYSQL/lib/mysql
++  fi
++
++  dnl set default include
++  if test -n "$MYSQL" ; then
++   CPPFLAGS="-I$MYSQL/include"
++  fi
++
+   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz)
+   AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient")
+ elif test -f /usr/lib/libmysqlclient.so; then
diff --git a/web/attachments/67989-multiplier.dif b/web/attachments/67989-multiplier.dif
new file mode 100644
index 0000000..99c510c
--- /dev/null
+++ b/web/attachments/67989-multiplier.dif
@@ -0,0 +1,164 @@
+diff -Naur nagios-plugins-1.3.0-beta2/plugins/check_mrtgtraf.c nagios-plugins-1.3.0-beta2_swl/plugins/check_mrtgtraf.c
+--- nagios-plugins-1.3.0-beta2/plugins/check_mrtgtraf.c 2002-11-15 02:04:51.000000000 +0100
++++ nagios-plugins-1.3.0-beta2_swl/plugins/check_mrtgtraf.c     2003-02-26 14:56:54.000000000 +0100
+@@ -56,6 +56,7 @@
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
++unsigned long adjust_threshold(unsigned long val, char **c);
+ void print_help (void);
+ void print_usage (void);
+ 
+@@ -144,9 +145,9 @@
+        if (expire_minutes > 0
+                        && (current_time - timestamp) >
+                        (expire_minutes * 60)) terminate (STATE_WARNING,
+-                                                                                                                                                               "MRTG data has expired (%d minutes old)\n",
+-                                                                                                                                                               (int) ((current_time - timestamp) /
+-                                                                                                                                                                                        60));
++                       "MRTG data has expired (%d minutes old)\n",
++                       (int) ((current_time - timestamp) /
++                       60));
+ 
+        /* else check the incoming/outgoing rates */
+        if (use_average == TRUE) {
+@@ -160,37 +161,37 @@
+ 
+        /* report incoming traffic in Bytes/sec */
+        if (incoming_rate < 1024) {
+-               strcpy (incoming_speed_rating, "B/s");
++               strcpy (incoming_speed_rating, "b/s");
+                adjusted_incoming_rate = (double) incoming_rate;
+        }
+ 
+        /* report incoming traffic in KBytes/sec */
+        else if (incoming_rate < (1024 * 1024)) {
+-               strcpy (incoming_speed_rating, "KB/s");
++               strcpy (incoming_speed_rating, "Kb/s");
+                adjusted_incoming_rate = (double) (incoming_rate / 1024.0);
+        }
+ 
+        /* report incoming traffic in MBytes/sec */
+        else {
+-               strcpy (incoming_speed_rating, "MB/s");
++               strcpy (incoming_speed_rating, "Mb/s");
+                adjusted_incoming_rate = (double) (incoming_rate / 1024.0 / 1024.0);
+        }
+ 
+        /* report outgoing traffic in Bytes/sec */
+        if (outgoing_rate < 1024) {
+-               strcpy (outgoing_speed_rating, "B/s");
++               strcpy (outgoing_speed_rating, "b/s");
+                adjusted_outgoing_rate = (double) outgoing_rate;
+        }
+ 
+        /* report outgoing traffic in KBytes/sec */
+        else if (outgoing_rate < (1024 * 1024)) {
+-               strcpy (outgoing_speed_rating, "KB/s");
++               strcpy (outgoing_speed_rating, "Kb/s");
+                adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0);
+        }
+ 
+        /* report outgoing traffic in MBytes/sec */
+        else {
+-               strcpy (outgoing_speed_rating, "MB/s");
++               strcpy (outgoing_speed_rating, "Mb/s");
+                adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0 / 1024.0);
+        }
+ 
+@@ -231,6 +232,7 @@
+ process_arguments (int argc, char **argv)
+ {
+        int c;
++       char* modpos;
+ 
+ #ifdef HAVE_GETOPT_H
+        int option_index = 0;
+@@ -283,13 +285,27 @@
+                        else
+                                use_average = TRUE;
+                        break;
+-               case 'c':                                                                       /* warning threshold */
+-                       sscanf (optarg, "%lu,%lu", &incoming_critical_threshold,
+-                                                       &outgoing_critical_threshold);
++               case 'c':                                                                       /* critical threshold */
++                       incoming_critical_threshold = strtoul (optarg, &modpos, 10);
++                       if(*modpos != ',') 
++                               incoming_critical_threshold = adjust_threshold(incoming_critical_threshold,&modpos);
++                       
++                       modpos++;
++
++                       outgoing_critical_threshold = strtoul (modpos, &modpos, 10);
++                       outgoing_critical_threshold = adjust_threshold(outgoing_critical_threshold,&modpos);
++       
+                        break;
+-               case 'w':                                                                       /* critical threshold */
+-                       sscanf (optarg, "%lu,%lu", &incoming_warning_threshold,
+-                                                       &outgoing_warning_threshold);
++               case 'w':                                                                       /* warning threshold */
++                        incoming_warning_threshold = strtoul (optarg, &modpos, 10);
++                        if(*modpos != ',')
++                                incoming_warning_threshold = adjust_threshold(incoming_warning_threshold,&modpos);
++
++                        modpos++;
++
++                        outgoing_warning_threshold = strtoul (modpos, &modpos, 10);
++                        outgoing_warning_threshold = adjust_threshold(outgoing_warning_threshold,&modpos);
++
+                        break;
+                case 'V':                                                                       /* version */
+                        print_revision (PROGNAME, "$Revision: 1.2 $");
+@@ -321,25 +337,48 @@
+        }
+ 
+        if (argc > c && incoming_warning_threshold == 0) {
+-               incoming_warning_threshold = strtoul (argv[c++], NULL, 10);
++               incoming_warning_threshold = strtoul (argv[c++], &modpos, 10);
++               incoming_warning_threshold = adjust_threshold(incoming_warning_threshold,&modpos);
+        }
+ 
+        if (argc > c && incoming_critical_threshold == 0) {
+-               incoming_critical_threshold = strtoul (argv[c++], NULL, 10);
++               incoming_critical_threshold = strtoul (argv[c++], &modpos, 10);
++                incoming_critical_threshold = adjust_threshold(incoming_critical_threshold,&modpos);
+        }
+ 
+        if (argc > c && outgoing_warning_threshold == 0) {
+-               outgoing_warning_threshold = strtoul (argv[c++], NULL, 10);
++               outgoing_warning_threshold = strtoul (argv[c++], &modpos, 10);
++                outgoing_warning_threshold = adjust_threshold(outgoing_warning_threshold,&modpos);
+        }
+        
+        if (argc > c && outgoing_critical_threshold == 0) {
+-               outgoing_critical_threshold = strtoul (argv[c++], NULL, 10);
++               outgoing_critical_threshold = strtoul (argv[c++], &modpos, 10);
++                outgoing_critical_threshold = adjust_threshold(outgoing_critical_threshold,&modpos);
+        }
+ 
+        return validate_arguments ();
+ }
+ 
+-
++unsigned long adjust_threshold(unsigned long val, char **pos)
++{
++       switch(**pos)
++       {
++       case 'K':
++       case 'k': 
++               (*pos)++;
++               return (val*1024L);
++       case 'M':
++       case 'm':
++               (*pos)++;
++               return val*1024L*1024L;
++       case 'G':
++       case 'm':
++               (*pos)++;
++               return val*1024L*1024L*1024L;
++       default:
++               return val;
++       }
++}
+ 
+ 
+ 
diff --git a/web/attachments/68846-check_ldap.c.diff b/web/attachments/68846-check_ldap.c.diff
new file mode 100644
index 0000000..3d47577
--- /dev/null
+++ b/web/attachments/68846-check_ldap.c.diff
@@ -0,0 +1,75 @@
+--- check_ldap.c.orig   2003-01-28 22:16:15.000000000 -0800
++++ check_ldap.c        2003-11-27 01:31:26.810335706 -0800
+@@ -50,6 +50,7 @@
+ unsigned int ld_port = DEFAULT_PORT;
+ int warn_time = UNDEFINED;
+ int crit_time = UNDEFINED;
++int protocol_version = 2;
+ 
+ int
+ main (int argc, char *argv[])
+@@ -58,7 +59,7 @@
+        LDAP *ld;
+        LDAPMessage *result;
+ 
+-       int t_diff;
++       int t_diff,rc;
+        time_t time0, time1;
+ 
+        if (process_arguments (argc, argv) == ERROR)
+@@ -79,6 +80,8 @@
+                printf ("Could not connect to the server at port %i\n", ld_port);
+                return STATE_CRITICAL;
+        }
++        rc = protocol_version; 
++        ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &rc);
+ 
+        /* bind to the ldap server */
+        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
+@@ -145,6 +148,7 @@
+                {"port", required_argument, 0, 'p'},
+                {"warn", required_argument, 0, 'w'},
+                {"crit", required_argument, 0, 'c'},
++                {"protocol", required_argument, 0, 'R'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -159,9 +163,9 @@
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+-               c =     getopt_long (argc, argv, "hVt:c:w:H:b:p:a:D:P:", longopts, &option_index);
++               c =     getopt_long (argc, argv, "hVt:c:w:H:b:p:a:D:P:R:", longopts, &option_index);
+ #else
+-               c = getopt (argc, argv, "+?hVt:c:w:H:b:p:a:D:P:");
++               c = getopt (argc, argv, "+?hVt:c:w:H:b:p:a:D:P:R:");
+ #endif
+ 
+                if (c == -1 || c == EOF)
+@@ -203,6 +207,9 @@
+                case 'c':
+                        crit_time = atoi (optarg);
+                        break;
++                case 'R':
++                        protocol_version = atoi (optarg);
++                        break;
+                default:
+                        usage ("check_ldap: could not parse arguments\n");
+                        break;
+@@ -250,6 +257,7 @@
+                 "\t-D [--bind] ... ldap bind DN (if required)\n"
+                 "\t-P [--pass] ... ldap password (if required)\n"
+                 "\t-p [--port] ... ldap port (default: %d)\n"
++                 "\t-R [--protocol] ... ldap protocol version (default: 2)\n"
+                 "\t-w [--warn] ... time in secs. - if the exceeds <warn> the STATE_WARNING will be returned\n"
+                 "\t-c [--crit] ... time in secs. - if the exceeds <crit> the STATE_CRITICAL will be returned\n"
+                 "\n", DEFAULT_PORT);
+@@ -261,6 +269,7 @@
+ {
+        printf
+                ("Usage: %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]\n"
+-                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n"
++                "         [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout] "
++                 "[-R <protocol number>]\n"
+                 "(Note: all times are in seconds.)\n", progname);
+ }
diff --git a/web/attachments/69716-check_http.c.diff b/web/attachments/69716-check_http.c.diff
new file mode 100644
index 0000000..503f10c
--- /dev/null
+++ b/web/attachments/69716-check_http.c.diff
@@ -0,0 +1,24 @@
+Index: check_http.c

+===================================================================

+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v

+retrieving revision 1.54

+diff -u -r1.54 check_http.c

+--- check_http.c        15 Sep 2003 05:03:47 -0000      1.54

++++ check_http.c        4 Dec 2003 16:00:24 -0000

+@@ -837,11 +837,13 @@

+                /* URI_PATH */

+                else if (sscanf (pos, HD5, url) == 1) {

+                        /* relative url */

++

+                        if ((url[0] != '/')) {

+-                               if ((x = strrchr(url, '/')))

++                               if ((x = strrchr(server_url, '/')))

+                                        *x = '\0';

+-                               asprintf (&server_url, "%s/%s", server_url, url);

++                               asprintf (&url, "%s/%s", server_url, url);

+                        }

++

+                        i = server_port;

+                        strcpy (type, server_type);

+                        strcpy (addr, host_name);

+

diff --git a/web/attachments/71990-check_swap.diff b/web/attachments/71990-check_swap.diff
new file mode 100644
index 0000000..f443476
--- /dev/null
+++ b/web/attachments/71990-check_swap.diff
@@ -0,0 +1 @@
+*** ../nagios-plugins-1.4.0alpha1/plugins/check_swap.c  Wed Nov 12 05:37:19 2003
--- plugins/check_swap.c        Thu Jan  1 19:28:34 2004
***************
*** 82,87 ****
--- 82,95 ----
  #ifdef HAVE_PROC_MEMINFO
          fp = fopen (PROC_MEMINFO, "r");
          while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+                 unsigned long tmp;
+                 if(sscanf(input_buffer, "%s %lu", str, &tmp)==2) {
+                         if(!strncmp(str,"SwapTotal",strlen("SwapTotal")))
+                                 total_swap+=(tmp>>10);
+                         else if(!strncmp(str,"SwapFree",strlen("SwapFree")))
+                                 free_swap+=(tmp>>10);
+                 }
+                 /*
                  if (sscanf (input_buffer, " %s %lu %lu %lu", str, &dsktotal, &dskused, &dskfree) == 4 &&
                      strstr (str, "Swap")) {
                          dsktotal = dsktotal / 1048576;
***************
*** 97,104 ****
--- 105,114 ----
                                          asprintf (&status, "%s [%lu (%d%%)]", status, dskfree, 100 - percent);
                          }
                  }
+                 */
          }
          fclose(fp);
+         used_swap=total_swap-free_swap;
  #else
  # ifdef HAVE_SWAP
          asprintf(&swap_command, "%s", SWAP_COMMAND);
***************
*** 240,246 ****
  check_swap (int usp, long unsigned int free_swap)
  {
        int result = STATE_UNKNOWN;
-       free_swap = free_swap * 1024;           /* Convert back to bytes as warn and crit specified in bytes */
        if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))
                result = STATE_CRITICAL;
        else if (crit_size > 0 && free_swap <= crit_size)
--- 251,256 ----
***************
*** 399,411 ****
  
        printf (_("\n\
   -w, --warning=INTEGER\n\
!    Exit with WARNING status if less than INTEGER bytes of swap space are free\n\
   -w, --warning=PERCENT%%\n\
!    Exit with WARNING status if less than PERCENT of swap space has been used\n\
   -c, --critical=INTEGER\n\
!    Exit with CRITICAL status if less than INTEGER bytes of swap space are free\n\
   -c, --critical=PERCENT%%\n\
!    Exit with CRITCAL status if less than PERCENT of swap space has been used\n\
   -a, --allswaps\n\
      Conduct comparisons for all swap partitions, one by one\n"));
  
--- 410,422 ----
  
          printf (_("\n\
   -w, --warning=INTEGER\n\
!    Exit with WARNING status if less than INTEGER mega bytes of swap space are free\n\
   -w, --warning=PERCENT%%\n\
!    Exit with WARNING status if less than PERCENT of swap space are free\n\
   -c, --critical=INTEGER\n\
!    Exit with CRITICAL status if less than INTEGER mega bytes of swap space are free\n\
   -c, --critical=PERCENT%%\n\
!    Exit with CRITCAL status if less than PERCENT of swap space are free\n\
   -a, --allswaps\n\
      Conduct comparisons for all swap partitions, one by one\n"));
  
***************
*** 426,433 ****
  print_usage (void)
  {
        printf (_("Usage:\n\
!  %s [-a] -w <used_percentage>%% -c <used_percentage>%%\n\
!  %s [-a] -w <bytes_free> -c <bytes_free>\n\
   %s (-h | --help) for detailed help\n\
   %s (-V | --version) for version information\n"),
                progname, progname, progname, progname);
--- 437,444 ----
  print_usage (void)
  {
          printf (_("Usage:\n\
!  %s [-a] -w <free_percentage>%% -c <free_percentage>%%\n\
!  %s [-a] -w <mega_bytes_free> -c <mega_bytes_free>\n\
   %s (-h | --help) for detailed help\n\
   %s (-V | --version) for version information\n"),
                  progname, progname, progname, progname);
\ No newline at end of file
diff --git a/web/attachments/74206-check_mailq.diffs b/web/attachments/74206-check_mailq.diffs
new file mode 100644
index 0000000..67fa086
--- /dev/null
+++ b/web/attachments/74206-check_mailq.diffs
@@ -0,0 +1,178 @@
+--- plugins-scripts/utils.pm.in.orig    2004-01-13 12:45:04.000000000 -0500
++++ plugins-scripts/utils.pm.in 2004-01-13 12:45:39.000000000 -0500
+@@ -43,6 +43,7 @@
+ $PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ;
+ $PATH_TO_MAILQ   = "@PATH_TO_MAILQ@";
+ $PATH_TO_QMAIL_QSTAT = "@PATH_TO_QMAIL_QSTAT@";
++$PATH_TO_SENDMAIL_CF = "@PATH_TO_SENDMAIL_CF@";
+ 
+ ## common variables
+ $TIMEOUT = 15;
+--- plugins-scripts/check_mailq.pl.orig 2004-01-13 12:45:47.000000000 -0500
++++ plugins-scripts/check_mailq.pl      2004-01-20 14:53:05.000000000 -0500
+@@ -28,15 +28,16 @@
+ use strict;
+ use Getopt::Long;
+ use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t
+-                                       $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines
+-                                       %srcdomains %dstdomains);
++                                       $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $opt_f
++                                       $mailq @lines %srcdomains %dstdomains);
+ use lib  utils.pm;
+ use utils qw(%ERRORS &print_revision &support &usage );
+-
++use File::Glob ':glob';
+ 
+ sub print_help ();
+ sub print_usage ();
+ sub process_arguments ();
++sub get_queue_directories (;$);
+ 
+ $ENV{'PATH'}='';
+ $ENV{'BASH_ENV'}=''; 
+@@ -47,7 +48,7 @@
+ $msg_p = 0 ;
+ $state = $ERRORS{'UNKNOWN'};
+ 
+-Getopt::Long::Configure('bundling');
++Getopt::Long::Configure('bundling','no_ignore_case');
+ $status = process_arguments();
+ if ($status){
+        print "ERROR: processing arguments\n";
+@@ -64,6 +65,22 @@
+ 
+ if ($mailq eq "sendmail") {
+ 
++## get configuration file, and from that, the queue directories
++       my @queuedirs=();
++       my $configfile="";
++       if ( defined($opt_f) && -r $opt_f ) {
++          $configfile="-C$opt_f";
++          @queuedirs=get_queue_directories($opt_f);
++       }else {
++          @queuedirs=get_queue_directories();
++       }
++
++       if (!defined($queuedirs[0])) {
++          print "UNKNOWN: check_mailq: no queue directories | msq_q = 0\n";
++          exit $ERRORS{"UNKNOWN"};
++       }
++       my $qpattern=join("|",@queuedirs);
++
+        ## open mailq 
+        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
+                if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+@@ -163,21 +180,16 @@
+ 
+                # Finally look at the overall queue length
+                #
+-               if (/mqueue/) {
++               # the pattern helps us get one or more queue directories, and adds up
++               # all the requests
++               if (/\b$qpattern\b/) {
+                        print "$utils::PATH_TO_MAILQ = $_ "if $verbose ;
+-                       if (/ \((\d+) request/) {
+-               #
+-                   # single queue: first line
+-                   # multi queue: one for each queue. overwrite on multi queue below
+-                 $msg_q = $1 ;
++                       if (/empty/) {
++                       }elsif (/\((\d+)\s*requests\)/i) {
++                               $msg_q+=$1;
++                               print "size = $1, msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
+                        }
+-               } elsif (/^\s+Total\sRequests:\s(\d+)$/) {
+-                       print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
+-                       #
+-                       # multi queue: last line
+-                       $msg_q = $1 ;
+                }
+-       
+        }
+        
+ 
+@@ -519,7 +531,8 @@
+                 "c=i" => \$opt_c, "critical=i" => \$opt_c,       # critical if above this number
+                 "W=i" => \$opt_W, "Warning=i"  => \$opt_W,   # warning if above this number
+                 "C=i" => \$opt_C, "Critical=i" => \$opt_C,       # critical if above this number
+-                "t=i" => \$opt_t, "timeout=i"  => \$opt_t 
++                "t=i" => \$opt_t, "timeout=i"  => \$opt_t,
++                "f=s" => \$opt_f, "configfile" => \$opt_f
+                 );
+ 
+        if ($opt_V) {
+@@ -572,12 +585,19 @@
+        }else{
+                $mailq = 'sendmail' ;
+        }
++
++       if (defined $opt_f) {
++               if (! -r $opt_f) {
++                       print "Can't read config file (-f): $opt_f!W\n";
++                       exit $ERRORS{'UNKNOWN'};
++               }
++       }
+                
+        return $ERRORS{'OK'};
+ }
+ 
+ sub print_usage () {
+-       print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-v verbose]\n";
++       print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-v verbose] [-f configfile]\n";
+ }
+ 
+ sub print_help () {
+@@ -594,6 +614,7 @@
+        print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+        print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
+        print "-M (--mailserver) = [ sendmail | qmail | postfix | exim ] (default = sendmail)\n";
++       print "-f (--configfile) = configuration file for sendmail (default = $utils::PATH_TO_SENDMAIL_CF)\n";
+        print "-h (--help)\n";
+        print "-V (--version)\n";
+        print "-v (--verbose)   = debugging output\n";
+@@ -608,3 +629,45 @@
+        print "\n\n";
+        support();
+ }
++
++sub get_queue_directories (;$)
++{
++       my $cfin=shift;
++       my @cfs=();
++       my @qdirs=();
++
++       if ($cfin) {
++               @cfs=($cfin);
++       }else {
++               if (-r $utils::PATH_TO_SENDMAIL_CF) {
++                       @cfs=($utils::PATH_TO_SENDMAIL_CF);
++               }else {
++                       @cfs=qw(/etc/mail/sendmail.cf);
++               }
++       }
++
++       my @cffiles=grep { -r $_} @cfs;
++       if (scalar(@cffiles)==0) {
++               warn "unable to find a sendmail configuration file";
++               return (undef);
++       }
++
++       my $qdir;
++       foreach my $cf (@cffiles) {
++               if (open(CF,$cf)) {
++                       while(<CF>) {
++                               chomp;
++                               next unless (/^O\s*QueueDirectory=(.*)$/ && ($qdir=$1));
++                               push(@qdirs,bsd_glob($qdir));
++                               last;
++                       }
++               }
++               close(CF);
++       }
++
++       if (@qdirs==0) {
++               warn "no QueueDirectory variable found in sendmail configuration file";
++               return (undef);
++       };
++       return @qdirs;
++}
diff --git a/web/attachments/75985-nagios_check_ping.patch b/web/attachments/75985-nagios_check_ping.patch
new file mode 100644
index 0000000..6fd59cf
--- /dev/null
+++ b/web/attachments/75985-nagios_check_ping.patch
@@ -0,0 +1,34 @@
+Index: check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.25
+diff -u -r1.25 check_ping.c
+--- check_ping.c        12 Sep 2003 11:38:32 -0000      1.25
++++ check_ping.c        7 Feb 2004 01:42:33 -0000
+@@ -74,7 +74,8 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       addresses = malloc ((size_t)max_addr);
++       addresses = malloc (sizeof(char*) * max_addr);
++       addresses[0] = NULL;
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage (_("Could not parse arguments"));
+@@ -228,7 +229,7 @@
+                                n_addresses++;
+                                if (n_addresses > max_addr) {
+                                        max_addr *= 2;
+-                                       addresses = realloc (addresses, (size_t)max_addr);
++                                       addresses = realloc (addresses, sizeof(char*) * max_addr);
+                                        if (addresses == NULL)
+                                                die (STATE_UNKNOWN, _("Could not realloc() addresses\n"));
+                                }
+@@ -272,6 +273,7 @@
+                        return ERROR;
+                } else {
+                        addresses[0] = argv[c++];
++                       n_addresses++;
+                        if (c == argc)
+                                return validate_arguments ();
+                }
diff --git a/web/attachments/75986-nagios_check_ping.patch b/web/attachments/75986-nagios_check_ping.patch
new file mode 100644
index 0000000..6fd59cf
--- /dev/null
+++ b/web/attachments/75986-nagios_check_ping.patch
@@ -0,0 +1,34 @@
+Index: check_ping.c
+===================================================================
+RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
+retrieving revision 1.25
+diff -u -r1.25 check_ping.c
+--- check_ping.c        12 Sep 2003 11:38:32 -0000      1.25
++++ check_ping.c        7 Feb 2004 01:42:33 -0000
+@@ -74,7 +74,8 @@
+        bindtextdomain (PACKAGE, LOCALEDIR);
+        textdomain (PACKAGE);
+ 
+-       addresses = malloc ((size_t)max_addr);
++       addresses = malloc (sizeof(char*) * max_addr);
++       addresses[0] = NULL;
+ 
+        if (process_arguments (argc, argv) == ERROR)
+                usage (_("Could not parse arguments"));
+@@ -228,7 +229,7 @@
+                                n_addresses++;
+                                if (n_addresses > max_addr) {
+                                        max_addr *= 2;
+-                                       addresses = realloc (addresses, (size_t)max_addr);
++                                       addresses = realloc (addresses, sizeof(char*) * max_addr);
+                                        if (addresses == NULL)
+                                                die (STATE_UNKNOWN, _("Could not realloc() addresses\n"));
+                                }
+@@ -272,6 +273,7 @@
+                        return ERROR;
+                } else {
+                        addresses[0] = argv[c++];
++                       n_addresses++;
+                        if (c == argc)
+                                return validate_arguments ();
+                }
diff --git a/web/attachments/76452-check_mem.diff b/web/attachments/76452-check_mem.diff
new file mode 100644
index 0000000..01d0d97
--- /dev/null
+++ b/web/attachments/76452-check_mem.diff
@@ -0,0 +1,36 @@
+--- check_mem.pl        2002-02-28 00:42:54.000000000 -0600
++++ /home/jason/check_mem.pl    2004-02-12 06:20:21.000000000 -0600
+@@ -27,7 +27,8 @@
+            $crit_level $warn_level
+             %exit_codes @memlist
+             $percent $fmt_pct 
+-            $verb_err $command_line);
++            $verb_err $command_line
++                       $vmstat_version);
+ 
+ # Predefined exit codes for Nagios
+ %exit_codes   = ('UNKNOWN' ,-1,
+@@ -39,7 +40,14 @@
+ $verb_err     = 0;
+ 
+ # This the unix command string that brings Perl the data
+-$command_line = `vmstat | tail -1 | awk '{print \$4,\$5}'`;
++my $vmstat_version = `vmstat -V`;
++if( $vmstat_version =~ /2\.\d\.\d$/ ){
++       $command_line = `vmstat | tail -1 | awk '{print \$4,\$5}'`;
++}elsif( $vmstat_version =~ /3\.\d\.\d$/ ){
++       $command_line = `vmstat | tail -1 | awk '{print \$3,\$4}'`;
++}else{
++       $command_line = `vmstat | tail -1 | awk '{print \$4,\$5}'`;
++}
+ 
+ chomp $command_line;
+ @memlist      = split(/ /, $command_line);
+@@ -89,6 +97,7 @@
+ if ($opt_f)
+ {
+   $percent    = $free_memory / $total_memory * 100;
++  warn "$percent\n";
+   $fmt_pct    = sprintf "%.1f", $percent;
+   if ($percent <= $crit_level)
+   {
diff --git a/web/attachments/76454-check_pop3.diff b/web/attachments/76454-check_pop3.diff
new file mode 100644
index 0000000..3e50a14
--- /dev/null
+++ b/web/attachments/76454-check_pop3.diff
@@ -0,0 +1,110 @@
+--- check_pop3.pl       2004-01-05 16:43:27.000000000 -0600
++++ /home/jason/sf/nagiosplug/contrib/check_pop3.pl     2002-02-28 00:42:53.000000000 -0600
+@@ -23,29 +23,6 @@
+ #                              with perl -wT and 'use strict'
+ # 2000/01/20   RM              Corrected POP3 Exit State.
+ # 2000/01/21   RM              Fix Exit Codes Again!!
+-# 2003/12/30   CZ              Proper CRLF in communication w/server
+-#                              Fixed infinite loop
+-#                              Error checking on welcome banner, USER, PASS commands
+-#                              Better error condition handling
+-#                              This could probably be much much smaller using Net::POP3,
+-#                              but I haven't looked into its error conditions yet, and I
+-#                              don't think you can specify remote port.
+-
+-=cut
+-
+-use Net::POP3;
+-
+-my $pop = new Net::POP3("$ARGV[0]", Timeout => 60);
+-my $ret = $pop->login("$ARGV[1]","$ARGV[2]");
+-$pop->quit();
+-
+-do { print "some error msg\n"; exit 2; } unless defined $ret;
+-
+-print "POP3 OK - ".int($ret)." messages\n";
+-exit 0;
+-
+-=cut
+-
+ # ------------------------------------------------------------------------------
+ 
+ # -----------------------------------------------------------------[ Require ]--
+@@ -120,56 +97,47 @@
+        my $ClientSocket = &bindRemote($remotehost,$remoteport,$hostname);
+        
+ 
+-       err("no welcome banner\n") unless $_ = <ClientSocket>;
+-       err("bad welcome banner: " . $_) unless $_ =~ /^\+OK/;
++print ClientSocket "user $username\n";
+ 
+-       print ClientSocket "USER $username\r\n";
++#Debug Server
++#print "user $username\n";
+ 
+-       #Debug Server
+-       #print "user $username\n";
++#Sleep or 3 secs, incase server is slow.
++sleep 3;
+ 
+-       err("no response to USER command\n") unless $_ = <ClientSocket>;
+-       err("bad response to USER: " . $_) unless $_ =~ /^\+OK/;
++print ClientSocket "pass $password\n";
+ 
+-       print ClientSocket "PASS $password\r\n";
++#Debug Server
++#print "pass $password\n";
+ 
+-       #Debug Server
+-       #print "pass $password\n";
++while (<ClientSocket>) {
+ 
+-       err("no response to PASS command\n") unless $_ = <ClientSocket>;
+-       err("bad response to PASS: " . $_) unless $_ =~ /^\+OK/;
++print ClientSocket "pass $password\n";
+ 
+-       print ClientSocket "LIST\r\n";
++#Debug Server
++#print $_;
+ 
+-       my $bad = 1;
+-       my $msgs = 0;
+-       while (<ClientSocket>) {
+-               #Debug Server
+-               #print $_;
+-
+-               err(($1||' UNKNOWN')."\n") if (m/\-ERR(.*)/);
+-               $bad = 0 if /^\+OK/;
+-               $msgs = $1 if /^(\d+)\s+/;
+-               last if /^\./;
+-       }
+-       &message("$msgs\n") unless $bad;
+-       err("missing +OK to LIST command\n");
++err($_) if (m/\-ERR\s+(.*)\s+.*/);
++message($_) if (m/\+OK Mailbox open,\s+(.*\d)\s+messages.*/);
++}
+ }
+ 
+ sub message 
+ {
+-       my $answer = "POP3 OK - Total Messages On Server: ".shift();    
++       my $answer = "UNKNOWN";
++       $answer = "Pop3 OK - Total Messages On Server :- $1";   
+        alarm(0);
+-       print ClientSocket "QUIT\r\n";
++       print ClientSocket "quit\n";
+        print "$answer";
+        exit 0;
+ }
+ 
+ sub err
+ {
+-       my $answer = "POP3 Error:".shift();
++       my $answer = "UNKNOWN";
++       $answer = "Pop3 Error :- $1";
+        alarm(0);
+-       print ClientSocket "QUIT\r\n";
++       print ClientSocket "quit\n";
+        print "$answer";
+        exit 2;
+ }
diff --git a/web/attachments/78851-check_disk-typo.patch b/web/attachments/78851-check_disk-typo.patch
new file mode 100644
index 0000000..cf8cfcd
--- /dev/null
+++ b/web/attachments/78851-check_disk-typo.patch
@@ -0,0 +1,11 @@
+--- check_disk.c.orig   Wed Mar  3 11:19:38 2004
++++ check_disk.c        Wed Mar  3 11:19:49 2004
+@@ -373,7 +373,7 @@
+                        mult = 1024 * 1024;
+                        if (units)
+                                free(units);
+-                       units = strdup ("kB");
++                       units = strdup ("MB");
+                        break;
+                case 'l':
+                        show_local_fs = 1;                      
diff --git a/web/attachments/79492-check_ping.c.diff b/web/attachments/79492-check_ping.c.diff
new file mode 100644
index 0000000..8a201cf
--- /dev/null
+++ b/web/attachments/79492-check_ping.c.diff
@@ -0,0 +1,14 @@
+--- check_ping.c.orig   2003-01-13 06:15:16.000000000 -0600
++++ check_ping.c        2004-03-09 13:56:46.000000000 -0600
+@@ -391,6 +391,11 @@
+                                                &pl) == 1
+                                || sscanf 
+                                        (input_buffer, "%*d packets transmitted, %*d packets received, %d%% loss, time", &pl) == 1
++                               || sscanf 
++                                       (input_buffer, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss, time", &pl) == 1
++                                       /* RHES 3.0 as reported by Todd A. Green
++                                           Note: This must come before the Suse line below
++                                         */
+                                || sscanf
+                                        (input_buffer, "%*d packets transmitted, %*d received, %d%% loss, time", &pl) == 1
+                                        /* Suse 8.0 as reported by Richard * Brodie */
diff --git a/web/attachments/80952-check_disk.patch b/web/attachments/80952-check_disk.patch
new file mode 100644
index 0000000..be3e5ba
--- /dev/null
+++ b/web/attachments/80952-check_disk.patch
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378819578" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378819578" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378819578" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378819578" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378819578');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=921082&group_id=29880&atid=397599&file_id=80952"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/80961-check_disk.patch.macosx b/web/attachments/80961-check_disk.patch.macosx
new file mode 100644
index 0000000..adc34ec
--- /dev/null
+++ b/web/attachments/80961-check_disk.patch.macosx
@@ -0,0 +1,243 @@
+        <!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"><![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"><![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"><![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"><!--<![endif]-->
+    <head>
+        
+        <meta charset="utf-8">
+        <!--SourceForge.net: Find and Build Open Source Software-->
+        <!--Copyright (c) 1999-2013 SourceForge, Inc. All rights reserved.-->
+        <!-- Create Server: sfs-web-5 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                        <meta name="description" content="SourceForge.net. Fast, secure and free downloads from the largest Open Source applications and software directory." />
+                <meta name="keywords" content="Open Source, Development, Community, Source Code, Downloads, Software" />
+                <title>SourceForge.net: ERROR</title>        <link href='//fonts.googleapis.com/css?family=Ubuntu:regular,bold' rel='stylesheet' type='text/css'>
+                <style type="text/css">
+            @font-face {
+                font-family: "Pictos";
+                src: url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.eot');
+                src: local("☺"), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.woff') format('woff'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.ttf') format('truetype'), url('http://static.sourceforge.net/include/fonts/sftheme/pictos-web.svg') format('svg');
+            }
+            #site-header .logo span {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/logo.png");
+            }
+            #site-footer .wrapper {
+              background-image: url("http://static.sourceforge.net/images/neotheme/sftheme/sf-footer-logo.png") !important;
+            }
+        </style>
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/style.php?secure=0&amp;1378819577" media="all" />
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/global.php?secure=0&amp;1378819577" media="all" />
+        
+        <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/neotheme/sfx.css?1378819577" media="all" />
+                                   <link rel="stylesheet" type="text/css" href="http://static.sourceforge.net/css/develop/droppy.php?secure=0&amp;1378819577" media="all" />
+                                        <!--   -->
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/modernizr.custom.90514.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript">
+            
+                jQuery.noConflict();
+            
+        </script>
+
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.cookie.js"></script>
+                            <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.droppy.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/sylvester.js"></script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/js/pb.transformie.js"></script>
+        <script type='text/javascript'>
+            jQuery(function(){
+                jQuery('.b-hornav > li:last-child').addClass('last');
+                jQuery('.b-hornav > li').each(function() {
+                    jQuery('li[class!=disabled]', this).eq(0).addClass('first');
+                });
+                jQuery('.b-hornav').droppy({speed:0, delay:0});
+            });
+        </script>
+                
+                            <script type="text/javascript">
+                            var sf_proj_home = 'http://sourceforge.net/projects/nagiosplug';
+                        var _visitor = "";
+            var jsonly = document.createElement('link');
+            jsonly.setAttribute('rel', 'stylesheet');
+            jsonly.setAttribute('type', 'text/css');
+            jsonly.setAttribute('href', 'http://static.sourceforge.net/css/phoneix/jsonly.css?secure=0&amp;1378819577');
+            document.getElementsByTagName('head')[0].appendChild(jsonly);
+                    </script>
+                                                                    <!-- DoubleClick Random Number -->
+    <script type="text/javascript">var dfp_ord=Math.random()*10000000000000000; var dfp_tile = 1; var dfp_ptile = 1;</script>
+    <!-- End DoubleClick Random Number -->
+    <!-- After META tags -->
+                                    
+        <script type="text/javascript" src="http://static.sourceforge.net/sfx.js"></script>
+        
+            <script type="text/javascript">
+                        var _gaq = _gaq || [];
+                        _gaq.push(['t1._setAccount', 'UA-32013-6']);
+                        _gaq.push(['t1._trackPageview']);
+                        _gaq.push(['t2._setAccount', 'UA-36130941-1']);
+                        _gaq.push(['t2._trackPageview']);
+                        (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
+            })();
+        </script>
+        <script type="text/javascript" src="http://static.sourceforge.net/include/jquery/jquery.notify.js"></script>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/header.js"></script>
+    </head>
+
+    <body id="c2" class="short-head">
+    
+    <!--[if IE 7]><div id="ie7only"><![endif]-->
+    <!--[if IE 6]><div id="ie6only"><![endif]-->
+    <!--[if IE]><div id="ieonly"><![endif]-->
+        
+        <div class="pg_error">
+                        <header id="site-header">
+                <div class="wrapper">
+                    <a href="/" class="logo">
+                        <span>SourceForge</span>
+                    </a>
+                    <form method="get" action="/directory/">
+                        <input type="text" id="words" name="q" placeholder="Search">
+                    </form>
+                    <nav id="nav-site">
+                        <a href="/directory/" title="Browse our software.">Browse</a>
+                        <a href="/directory/enterprise" title="Browse our Enterprise software.">Enterprise</a>
+                        <a href="/blog/" title="Read the latest news from the SF HQ.">Blog</a>
+                        <a href="/support" title="Contact us for help and feedback.">Help</a>
+                        <a href="/jobs?source=header" title="Search 80k+ tech jobs." class="featured-link">Jobs</a>
+                    </nav>
+                    <nav id="nav-account">
+                                                  <div class="logged_out">
+                            <a href="https://sourceforge.net/account/login.php">Log In</a>
+                            <span>or</span>
+                            <a href="https://sourceforge.net/user/registration">Join</a>
+                          </div>
+                                            </nav>
+                </div>
+            </header>
+            <header id="site-sec-header">
+                <div class="wrapper">
+                    <nav id="nav-hubs">
+                        <h4>Solution Centers</h4>
+                        <a href="http://ibmsmartercommerce.sourceforge.net/">Smarter Commerce</a>
+                        <a href="http://goparallel.sourceforge.net/">Go Parallel</a>
+                        <a href="http://html5center.sourceforge.net/">HTML5</a>
+                        <a href="http://ibmsmarteritservices.sourceforge.net/">Smarter IT</a>
+                    </nav>
+                    <nav id="nav-collateral">
+                      <a href="http://library.slashdotmedia.com/?source=sfnet_header">Resources</a>  
+                                              <a href="https://sourceforge.net/user/registration/">Newsletters</a>
+                                            </nav>
+                </div>
+            </header>
+                                                <div id="page-body">
+            <div id="bd" class="inner-bd">
+                <div id="doc4" class="yui-t6">
+                                                            <div id="breadcrumbs">
+                                                    <a href="/">Home</a>
+ / <a href="/tracker/download.php?aid=921082&group_id=29880&atid=397599&file_id=80961"  class="selected">Error</a>
+                                            </div>
+                    <!-- begin content -->
+    
+
+
+<h1 class="titlebar">There was an error processing your request ...</h1>
+
+<br />
+
+<h4 class="error">ERROR
+<br />
+<small>
+ArtifactFile: Invalid ArtifactFile ID
+
+</small>
+</h4>
+
+            </div>
+        </div>
+      </div>
+    
+    <footer id="site-footer">
+        <div class="wrapper">
+            <nav>
+                <h5>SourceForge</h5>
+                <a href="/about">About</a>
+                <a href="/blog/category/sitestatus/">Site Status</a>
+                <a href="http://twitter.com/sfnet_ops">@sfnet_ops</a>
+            </nav>
+            <nav>
+                <h5>Find and Develop Software</h5>
+                <a href="/create/">Create a Project</a>
+                <a href="/directory/">Software Directory</a>
+                <a href="/top">Top Downloaded Projects</a>
+            </nav>
+            <nav>
+                <h5>Community</h5>
+                <a href="/blog/">Blog</a>
+                <a href="http://twitter.com/sourceforge">@sourceforge</a>
+                <a href="/jobs?source=footer">Job Board</a>
+                <a href="http://library.slashdotmedia.com/?source=sfnet_footer">Resources</a>
+            </nav>
+            <nav>
+                <h5>Help</h5>
+                <a href="http://p.sf.net/sourceforge/docs">Site Documentation</a>
+                <a href="/support">Support Request</a>
+                <a href="http://p.sf.net/sourceforge/irc">Real-Time Support</a>
+            </nav>
+        </div>
+    </footer>
+    <footer id="site-copyright-footer">
+        <div class="wrapper">
+            <div id="copyright">
+                Copyright &copy; 2013 SourceForge. All Rights Reserved.<br />
+                SourceForge is a <a href="http://www.diceholdingsinc.com/phoenix.zhtml?c=211152&amp;p=irol-landing">Dice Holdings, Inc.</a> company.
+            </div>
+            <nav>
+                <a href="http://slashdotmedia.com/terms-of-use">Terms</a>
+                <a href="http://slashdotmedia.com/privacy-statement/">Privacy</a>
+                <a href="http://slashdotmedia.com/opt-out-choices">Cookies/Opt Out</a>
+                <a href="http://slashdotmedia.com">Advertise</a>
+                <a href="http://sourceforge.jp/">SourceForge.JP</a>
+            </nav>
+        </div>
+    </footer>
+        <!--[if lt IE 7 ]>
+    <script type="text/javascript" src="http://static.sourceforge.net/include/js/sftheme/dd_belatedpng.js"></script>
+    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+    <![endif]-->
+<!--[if IE]></div><![endif]-->
+<!--[if IE 6]></div><![endif]-->
+<!--[if IE 7]></div><![endif]-->
+
+    
+    <!-- Begin comScore Tag -->
+    <script>
+        document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E"));
+    </script>
+    <script>
+        COMSCORE.beacon({
+            c1:2,
+            c2:6035546,
+            c3:"",
+            c4:"",
+            c5:"",
+            c6:"",
+            c15:""
+        });
+    </script>
+    <noscript>
+        <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" />
+    </noscript>
+    <!-- End comScore Tag -->
+    
+
+
+
+
+        </div>
+    </body>
+</html>
diff --git a/web/attachments/80964-check_disk.patch.linux b/web/attachments/80964-check_disk.patch.linux
new file mode 100644
index 0000000..f66ea33
--- /dev/null
+++ b/web/attachments/80964-check_disk.patch.linux
@@ -0,0 +1,14 @@
+--- check_disk.c        2004-03-22 16:54:43.000000000 +0000
++++ ./nagios-plugins-1.3.1/plugins/check_disk.c 2003-07-11 07:03:47.000000000 +0100
+@@ -94,9 +94,8 @@
+ 
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+ 
+-               if (index (input_buffer, '/') != input_buffer) {            
+-                       continue;
+-               }
++               if (!index (input_buffer, '/'))
++                       continue;
+ 
+                /* Fixes AIX /proc fs which lists - for size values */
+                if (strstr (input_buffer, "/proc ") == input_buffer)
diff --git a/web/attachments/80965-check_disk.patch.macosx b/web/attachments/80965-check_disk.patch.macosx
new file mode 100644
index 0000000..11965fd
--- /dev/null
+++ b/web/attachments/80965-check_disk.patch.macosx
@@ -0,0 +1,15 @@
+--- check_disk.c        Fri Jul 11 07:03:47 2003
++++ /tmp/check_disk.c   Mon Mar 22 16:57:34 2004
+@@ -94,8 +94,9 @@
+  
+        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+  
+-               if (!index (input_buffer, '/'))
+-                       continue;
++               if (index (input_buffer, '/') != input_buffer) {
++                       continue;
++               }
+  
+                /* Fixes AIX /proc fs which lists - for size values */
+                if (strstr (input_buffer, "/proc ") == input_buffer)
+
diff --git a/web/attachments/81737-nagios-plugins--check-disk-smb--compare_levels_after_kMG_decoding b/web/attachments/81737-nagios-plugins--check-disk-smb--compare_levels_after_kMG_decoding
new file mode 100644
index 0000000..1611f41
--- /dev/null
+++ b/web/attachments/81737-nagios-plugins--check-disk-smb--compare_levels_after_kMG_decoding
@@ -0,0 +1,38 @@
+--- ./check_disk_smb.compare_levels_after_kMG_decoding  2004-03-29 13:30:31.000000000 +0100
++++ ./check_disk_smb    2004-03-29 13:38:37.000000000 +0100
+@@ -92,16 +92,6 @@
+        usage("Both warning and critical should be same type- warning: $opt_w critical: $opt_c \n");
+ }
+ 
+-# verify warning is less than critical
+-if ( $opt_w =~ /[kMG]/) {
+-       unless ( $warn > $crit) {
+-               usage("Disk size: warning ($opt_w) should be greater than critical ($opt_c) \n");
+-       }
+-}else{
+-       unless ( $warn < $crit) {
+-               usage("Percentage: warning ($opt_w) should be less than critical ($opt_c) \n");
+-       }
+-}
+ 
+ my $workgroup = $1 if (defined($opt_W) && $opt_W =~ /(.*)/);
+ 
+@@ -177,6 +167,18 @@
+                $crit = $1 * 1048576;
+        }
+ 
++  # try to verify warning is less than critical
++  # should this require that warn_type and $crit_type are the same ?
++  if ( $warn_type eq "K" and $crit_type eq "K" ) {
++    unless ( $warn > $crit) {
++      usage("Disk size: warning ($opt_w) should be greater than critical ($opt_c) \n");
++    }
++  } elsif ( $warn_type eq "P" and $crit_type eq "P" ) {
++    unless ( $warn < $crit) {
++      usage("Percentage: warning ($opt_w) should be less than critical ($opt_c) \n");
++    }
++  }
++
+        if (int($avail / 1024) > 0) {
+                $avail = int($avail / 1024);
+                if (int($avail /1024) > 0) {
diff --git a/web/attachments/81913-diff.README.TXT-1.4.0alpha1 b/web/attachments/81913-diff.README.TXT-1.4.0alpha1
new file mode 100644
index 0000000..749a1ed
--- /dev/null
+++ b/web/attachments/81913-diff.README.TXT-1.4.0alpha1
@@ -0,0 +1,23 @@
+--- contrib/README.TXT.orig     Tue Mar 30 12:19:51 2004
++++ contrib/README.TXT  Tue Mar 30 12:26:30 2004
+@@ -56,12 +56,14 @@
+                          supplied with the radiusclient code work as a RADIUS plugin
+                          for Nagios (Nick Shore)
+ 
+-fetchlog-0.94.tar.gz   - C program: The fetchlog utility displays the last new messages of a
+-                         logfile. It is similar like tail(1) but offers some extra functionality  
+-                         for output formatting. fetchlog can be used standalone or as a Nagios
+-                         plugin to monitor local logfiles or together with Net-SNMP to monitor
+-                         remote logfiles. The README shows how to setup fetchlog for Nagios.
+-                         (Alexander Haderer)
++fetchlog-1.0.tar.gz     - C program: The fetchlog utility displays the last new messages of a
++                          logfile. It uses a bookmark to remember which messages have already
++                         been fetched.  It is similar like tail(1) but offers some extra 
++                         functionality like pattern matching with regular expressions or output 
++                         formatting. fetchlog can be used standalone or as a Nagios plugin to 
++                         monitor logfiles. See READMEs included for setup instructions.
++                         See http://fetchlog.sourceforge.net/ for current version.
++                          (Alexander Haderer)
+ 
+ check_cit.tgz  -Perl plugins to monitor Citrix server
+ 
diff --git a/web/attachments/83489-check_smtp.patch b/web/attachments/83489-check_smtp.patch
new file mode 100644
index 0000000..cf3fd67
--- /dev/null
+++ b/web/attachments/83489-check_smtp.patch
@@ -0,0 +1,24 @@
+--- plugins/check_smtp.c.orig   Mon Apr 12 20:21:34 2004
++++ plugins/check_smtp.c        Mon Apr 12 22:29:17 2004
+@@ -219,15 +219,16 @@
+        microsec = deltime (tv);
+        elapsed_time = (double)microsec / 1.0e6;
+ 
+-       if (check_critical_time && elapsed_time > (double) critical_time)
+-               result = STATE_CRITICAL;
+-       else if (check_warning_time && elapsed_time > (double) warning_time)
+-               result = STATE_WARNING;
++       if (result == STATE_OK)
++               if (check_critical_time && elapsed_time > (double) critical_time)
++                       result = STATE_CRITICAL;
++               else if (check_warning_time && elapsed_time > (double) warning_time)
++                       result = STATE_WARNING;
+ 
+        printf (_("SMTP %s - %.3f sec. response time%s%s|%s\n"),
+                state_text (result), elapsed_time,
+           verbose?", ":"", verbose?buffer:"",
+-               perfdata ("time", microsec, "us",
++               fperfdata ("time", elapsed_time, "s",
+                          (int)check_warning_time, warning_time,
+                          (int)check_critical_time, critical_time,
+                          TRUE, 0, FALSE, 0));
diff --git a/web/attachments/85410-check_dig.c.patch b/web/attachments/85410-check_dig.c.patch
new file mode 100644
index 0000000..b4fedc2
--- /dev/null
+++ b/web/attachments/85410-check_dig.c.patch
@@ -0,0 +1,151 @@
+--- check_dig.c.orig    Thu Apr 15 12:38:19 2004
++++ check_dig.c Fri Apr 16 16:20:03 2004
+@@ -37,6 +37,8 @@
+ };
+ 
+ char *query_address = NULL;
++char *record_type = "A";
++char *expected_address = NULL;
+ char *dns_server = NULL;
+ int verbose = FALSE;
+ int server_port = DEFAULT_PORT;
+@@ -68,14 +70,20 @@
+                usage (_("Could not parse arguments\n"));
+ 
+        /* get the command to run */
+-       asprintf (&command_line, "%s @%s -p %d %s",
+-                 PATH_TO_DIG, dns_server, server_port, query_address);
++       asprintf (&command_line, "%s @%s -p %d %s -t %s",
++                 PATH_TO_DIG, dns_server, server_port, query_address, record_type);
+ 
+        alarm (timeout_interval);
+        gettimeofday (&tv, NULL);
+ 
+-       if (verbose)
++       if (verbose) {
+                printf ("%s\n", command_line);
++               if(expected_address != NULL) {
++                       printf ("Looking for: '%s'\n", expected_address);
++               } else {
++                       printf ("Looking for: '%s'\n", query_address);
++               }
++       }
+ 
+        /* run the command */
+        child_process = spopen (command_line);
+@@ -93,28 +101,39 @@
+                /* the server is responding, we just got the host name... */
+                if (strstr (input_buffer, ";; ANSWER SECTION:")) {
+ 
+-                       /* get the host address */
+-                       if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+-                               break;
+-
+-                       if (strpbrk (input_buffer, "\r\n"))
+-                               input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
+-
+-                       if (strstr (input_buffer, query_address) == input_buffer) {
+-                               output = strdup(input_buffer);
+-                               result = STATE_OK;
+-                       }
+-                       else {
+-                               asprintf (&output, _("Server not found in ANSWER SECTION"));
+-                               result = STATE_WARNING;
+-                       }
++                       /* loop through the whole 'ANSWER SECTION' */
++                       do {
++                               /* get the host address */
++                               if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
++                                       break;
++
++                               if (strpbrk (input_buffer, "\r\n"))
++                                       input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
++
++                               if (verbose && !strstr (input_buffer, ";; ")) 
++                                       printf ("%s\n", input_buffer); 
++
++                               if (expected_address==NULL && strstr (input_buffer, query_address) != NULL) {
++                                       output = strdup(input_buffer);
++                                       result = STATE_OK;
++                               }
++                               else if (expected_address != NULL && strstr (input_buffer, expected_address) != NULL) {
++                                       output = strdup(input_buffer);
++                                       result = STATE_OK;
++                               }
++
++                       } while (!strstr (input_buffer, ";; "));
++
++                       if (result == STATE_UNKNOWN) {
++                               asprintf (&output, _("Server not found in ANSWER SECTION"));
++                               result = STATE_WARNING;
++                        }
+ 
+-                       continue;
+                }
+ 
+        }
+ 
+-       if (result != STATE_OK) {
++       if (result == STATE_UNKNOWN) {
+                asprintf (&output, _("No ANSWER SECTION found"));
+        }
+ 
+@@ -181,6 +200,8 @@
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
++               {"record_type", required_argument, 0, 'T'},
++               {"expected_address", required_argument, 0, 'a'},
+                {0, 0, 0, 0}
+        };
+ 
+@@ -188,7 +209,7 @@
+                return ERROR;
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVvt:l:H:w:c:", longopts, &option);
++               c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:a:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -248,6 +269,12 @@
+                case 'v':                                                                       /* verbose */
+                        verbose = TRUE;
+                        break;
++               case 'T':
++                       record_type = optarg;
++                       break;
++               case 'a':
++                       expected_address = optarg;
++                       break;
+                }
+        }
+ 
+@@ -309,6 +336,15 @@
+  -l, --lookup=STRING\n\
+    machine name to lookup\n"));
+ 
++        printf (_("\
++ -T, --record_type=STRING\n\
++   record type to lookup (default: A)\n"));
++
++        printf (_("\
++ -a, --expected_address=STRING\n\
++   an address expected to be in the asnwer section.\n\
++   if not set, uses whatever was in -l\n"));
++
+        printf (_(UT_WARN_CRIT));
+ 
+        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+@@ -325,8 +361,9 @@
+ print_usage (void)
+ {
+        printf (_("\
+-Usage: %s -H host -l lookup [-p <server port>] [-w <warning interval>]\n\
+-         [-c <critical interval>] [-t <timeout>] [-v]\n"),
++Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
++         [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
++         [-a <expected answer address>] [-v]\n"),
+                progname);
+        printf ("       %s (-h|--help)\n", progname);
+        printf ("       %s (-V|--version)\n", progname);
diff --git a/web/attachments/86257-patch-check_tcp-quiet b/web/attachments/86257-patch-check_tcp-quiet
new file mode 100644
index 0000000..b085f62
--- /dev/null
+++ b/web/attachments/86257-patch-check_tcp-quiet
@@ -0,0 +1,96 @@
+*** check_tcp.c.original        Thu May  6 09:25:56 2004
+--- check_tcp.c Thu May  6 09:31:52 2004
+***************
+*** 84,89 ****
+--- 84,90 ----
+  int check_warning_time = FALSE;
+  double critical_time = 0;
+  int check_critical_time = FALSE;
++ int hide_output = FALSE;
+  double elapsed_time = 0;
+  long microsec;
+  int verbose = FALSE;
+***************
+*** 329,335 ****
+                 (was_refused) ? " (refused)" : "",
+                 elapsed_time, server_port);
+  
+!       if (status && strlen(status) > 0)
+                printf (" [%s]", status);
+  
+        printf (" |%s\n", perfdata ("time", microsec, "us",
+--- 330,336 ----
+                 (was_refused) ? " (refused)" : "",
+                 elapsed_time, server_port);
+  
+!       if (hide_output == FALSE && status && strlen(status) > 0)
+                printf (" [%s]", status);
+  
+        printf (" |%s\n", perfdata ("time", microsec, "us",
+***************
+*** 364,369 ****
+--- 365,371 ----
+                {"expect", required_argument, 0, 'e'},
+                {"maxbytes", required_argument, 0, 'm'},
+                {"quit", required_argument, 0, 'q'},
++               {"jail", required_argument, 0, 'j'},
+                {"delay", required_argument, 0, 'd'},
+                {"refuse", required_argument, 0, 'r'},
+                {"use-ipv4", no_argument, 0, '4'},
+***************
+*** 395,401 ****
+        }
+  
+        while (1) {
+!               c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:",
+                                 longopts, &option);
+  
+                if (c == -1 || c == EOF || c == 1)
+--- 397,403 ----
+        }
+  
+        while (1) {
+!               c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:j",
+                                 longopts, &option);
+  
+                if (c == -1 || c == EOF || c == 1)
+***************
+*** 437,442 ****
+--- 439,447 ----
+                                critical_time = strtod (optarg, NULL);
+                        check_critical_time = TRUE;
+                        break;
++               case 'j':                 /* hide output */
++                       hide_output = TRUE;
++                       break;
+                case 'w':                 /* warning */
+                        if (!is_intnonneg (optarg))
+                                usage (_("Warning threshold must be a nonnegative integer\n"));
+***************
+*** 622,627 ****
+--- 627,634 ----
+        printf (_("\
+   -r, --refuse=ok|warn|crit\n\
+      Accept tcp refusals with states ok, warn, crit (default: crit)\n\
++  -j, --jail\n\
++     Hide output from TCP socket\n\
+   -m, --maxbytes=INTEGER\n\
+      Close connection once more than this number of bytes are received\n\
+   -d, --delay=INTEGER\n\
+***************
+*** 646,652 ****
+  Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
+    [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+    [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+!   [-r <refuse state>] [-v] [-4|-6]\n"), progname);
+        printf ("       %s (-h|--help)\n", progname);
+        printf ("       %s (-V|--version)\n", progname);
+  }
+--- 653,659 ----
+  Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
+    [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
+    [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
+!   [-r <refuse state>] [-v] [-4|-6] [-j]\n"), progname);
+        printf ("       %s (-h|--help)\n", progname);
+        printf ("       %s (-V|--version)\n", progname);
+  }
diff --git a/web/attachments/86330-check_http.patch b/web/attachments/86330-check_http.patch
new file mode 100644
index 0000000..df817d1
--- /dev/null
+++ b/web/attachments/86330-check_http.patch
@@ -0,0 +1,353 @@
+--- /tmp/check_http.c   2004-04-13 20:09:38.000000000 -0700
++++ check_http.c        2004-04-13 20:25:40.000000000 -0700
+@@ -21,6 +21,8 @@
+  *
+  * $Id: check_http.c,v 1.24.2.4 2003/06/21 05:31:23 kdebisschop Exp $
+  *
++ *  13-Apr-2004 -- jwz -- added "--no-body" and "--max-age" options
++ *
+  *****************************************************************************/
+ 
+ const char *progname = "check_http";
+@@ -45,7 +47,7 @@
+             [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
+             [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
+             [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
+-            [-P string]"
++            [-P string] [-N] [-M <age>]"
+ 
+ #define LONGOPTIONS "\
+  -H, --hostname=ADDRESS\n\
+@@ -63,6 +65,13 @@
+    Port number (default: %d)\n\
+  -P, --post=STRING\n\
+    URL encoded http POST data\n\
++ -N, --no-body\n\
++    Don't wait for document body: stop reading after headers.\n\
++    (Note that this still does an HTTP GET or POST, not a HEAD.)\n\
++ -M, --max-age=SECONDS\n\
++    Warn if the document is more than SECONDS old.  The number can\n\
++    also be of the form \"10m\" for minutes, \"10h\" for hours, or\n\
++    \"10d\" for days.\n\
+  -w, --warning=INTEGER\n\
+    Response time to result in warning status (seconds)\n\
+  -c, --critical=INTEGER\n\
+@@ -159,6 +168,10 @@
+ int check_certificate (X509 **);
+ #endif
+ 
++/* jwz */
++int no_body = FALSE;
++int maximum_age = -1;
++
+ #ifdef HAVE_REGEX_H
+ enum {
+        REGS = 2,
+@@ -311,6 +324,10 @@
+                {"linespan", no_argument, 0, 'l'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
++
++                /* jwz */
++               {"no-body", no_argument, 0, 'N'},
++               {"max-age", required_argument, 0, 'M'},
+                {0, 0, 0, 0}
+        };
+ #endif
+@@ -331,7 +348,8 @@
+                        strcpy (argv[c], "-n");
+        }
+ 
+-#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLS"
++/*#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLS"*/
++#define   OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:M:nlLSN" /* jwz */
+ 
+        while (1) {
+ #ifdef HAVE_GETOPT_H
+@@ -469,6 +487,27 @@
+                case 'v': /* verbose */
+                        verbose = TRUE;
+                        break;
++               case 'N': /* no-body (jwz) */
++                       no_body = TRUE;
++                       break;
++               case 'M': /* max-age (jwz) */
++                  {
++                    int L = strlen(optarg);
++                    if (L && optarg[L-1] == 'm')
++                      maximum_age = atoi (optarg) * 60;
++                    else if (L && optarg[L-1] == 'h')
++                      maximum_age = atoi (optarg) * 60 * 60;
++                    else if (L && optarg[L-1] == 'd')
++                      maximum_age = atoi (optarg) * 60 * 60 * 24;
++                    else if (L && (optarg[L-1] == 's' ||
++                                   isdigit (optarg[L-1])))
++                      maximum_age = atoi (optarg);
++                    else {
++                      fprintf (stderr, "unparsable max-age: %s\n", optarg);
++                      exit (1);
++                    }
++                  }
++                  break;
+                }
+        }
+ 
+@@ -534,6 +573,223 @@
+ 
+ 
+ 
++/* Returns 1 if we're done processing the document body; 0 to keep going.
++   (jwz)
++ */
++static int
++document_headers_done (char *full_page)
++{
++  const char *body, *s;
++  const char *end;
++
++  for (body = full_page; *body; body++) {
++    if (!strncmp (body, "\n\n", 2) ||
++        !strncmp (body, "\n\r\n", 3))
++      break;
++  }
++
++  if (!*body)
++    return 0;  /* haven't read end of headers yet */
++
++  full_page[body - full_page] = 0;
++  return 1;
++}
++
++
++/* jwz */
++static time_t
++parse_time_string (const char *string)
++{
++  struct tm tm;
++  time_t t;
++  memset (&tm, 0, sizeof(tm));
++
++  /* Like this: Tue, 25 Dec 2001 02:59:03 GMT */
++
++  if (isupper (string[0])  &&  /* Tue */
++      islower (string[1])  &&
++      islower (string[2])  &&
++      ',' ==   string[3]   &&
++      ' ' ==   string[4]   &&
++      (isdigit(string[5]) || string[5] == ' ') &&   /* 25 */
++      isdigit (string[6])  &&
++      ' ' ==   string[7]   &&
++      isupper (string[8])  &&  /* Dec */
++      islower (string[9])  &&
++      islower (string[10]) &&
++      ' ' ==   string[11]  &&
++      isdigit (string[12]) &&  /* 2001 */
++      isdigit (string[13]) &&
++      isdigit (string[14]) &&
++      isdigit (string[15]) &&
++      ' ' ==   string[16]  &&
++      isdigit (string[17]) &&  /* 02: */
++      isdigit (string[18]) &&
++      ':' ==   string[19]  &&
++      isdigit (string[20]) &&  /* 59: */
++      isdigit (string[21]) &&
++      ':' ==   string[22]  &&
++      isdigit (string[23]) &&  /* 03 */
++      isdigit (string[24]) &&
++      ' ' ==   string[25]  &&
++      'G' ==   string[26]  &&  /* GMT */
++      'M' ==   string[27]  &&  /* GMT */
++      'T' ==   string[28]) {
++
++    tm.tm_sec  = 10 * (string[23]-'0') + (string[24]-'0');
++    tm.tm_min  = 10 * (string[20]-'0') + (string[21]-'0');
++    tm.tm_hour = 10 * (string[17]-'0') + (string[18]-'0');
++    tm.tm_mday = 10 * (string[5] == ' ' ? 0 : string[5]-'0') + (string[6]-'0');
++    tm.tm_mon = (!strncmp (string+8, "Jan", 3) ? 0 :
++                 !strncmp (string+8, "Feb", 3) ? 1 :
++                 !strncmp (string+8, "Mar", 3) ? 2 :
++                 !strncmp (string+8, "Apr", 3) ? 3 :
++                 !strncmp (string+8, "May", 3) ? 4 :
++                 !strncmp (string+8, "Jun", 3) ? 5 :
++                 !strncmp (string+8, "Jul", 3) ? 6 :
++                 !strncmp (string+8, "Aug", 3) ? 7 :
++                 !strncmp (string+8, "Sep", 3) ? 8 :
++                 !strncmp (string+8, "Oct", 3) ? 9 :
++                 !strncmp (string+8, "Nov", 3) ? 10 :
++                 !strncmp (string+8, "Dec", 3) ? 11 :
++                 -1);
++    tm.tm_year = ((1000 * (string[12]-'0') +
++                   100 * (string[13]-'0') +
++                   10 * (string[14]-'0') +
++                   (string[15]-'0'))
++                  - 1900);
++
++    tm.tm_isdst = 0;  /* GMT is never in DST, right? */
++
++    if (tm.tm_mon < 0 ||
++        tm.tm_mday < 1 ||
++        tm.tm_mday > 31)
++      return 0;
++
++    /* #### This is actually wrong: we need to subtract the local timezone
++            offset from GMT from this value.  But, that's ok in this usage,
++            because we only comparing these two GMT dates against each other,
++            so it doesn't matter what time zone we parse them in.
++     */
++
++    t = mktime (&tm);
++    if (t == (time_t) -1) t = 0;
++
++    if (verbose) {
++      const char *s = string;
++      while (*s && *s != '\r' && *s != '\n')
++        fputc (*s++, stdout);
++      printf (" ==> %lu\n", (unsigned long) t);
++    }
++
++    return t;
++
++  } else {
++    return 0;
++  }
++}
++
++
++/* jwz */
++static void
++check_document_dates (const char *headers)
++{
++  const char *s;
++  char *server_date = 0;
++  char *document_date = 0;
++
++  s = headers;
++  while (*s) {
++    const char *field = s;
++    const char *value = 0;
++
++    /* Find the end of the header field */
++    while (*s && !isspace(*s) && *s != ':')
++      s++;
++
++    /* Remember the header value, if any. */
++    if (*s == ':')
++      value = ++s;
++
++    /* Skip to the end of the header, including continuation lines. */
++    while (*s &&
++           !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
++      s++;
++    s++;
++
++    /* Process this header. */
++    if (value && value > field+2) {
++      char *ff = (char *) malloc (value-field);
++      char *ss = ff;
++      while (field < value-1)
++        *ss++ = tolower(*field++);
++      *ss++ = 0;
++
++      if (!strcmp (ff, "date") ||
++          !strcmp (ff, "last-modified")) {
++        const char *e;
++        while (*value && isspace (*value))
++          value++;
++        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
++            ;
++        ss = (char *) malloc (e - value + 1);
++        strncpy (ss, value, e - value);
++        ss[e - value] = 0;
++        if (!strcmp (ff, "date")) {
++          if (server_date) free (server_date);
++          server_date = ss;
++        } else {
++          if (document_date) free (document_date);
++          document_date = ss;
++        }
++      }
++      free (ff);
++    }
++  }
++
++  /* Done parsing the body.  Now check the dates we (hopefully) parsed.
++   */
++  if (!server_date || !*server_date) {
++    terminate (STATE_UNKNOWN, "server date unknown\n");
++  } else if (!document_date || !*document_date) {
++    terminate (STATE_CRITICAL, "document modification date unknown\n");
++  } else {
++    time_t sd = parse_time_string (server_date);
++    time_t dd = parse_time_string (document_date);
++    char buf [255];
++
++    if (sd <= 0) {
++      sprintf (buf, "server date \"%100s\" unparsable", server_date);
++      terminate (STATE_CRITICAL, buf);
++
++    } else if (dd <= 0) {
++      sprintf (buf, "document date \"%100s\" unparsable", document_date);
++      terminate (STATE_CRITICAL, buf);
++
++    } else if (dd > sd + 30) {
++      char buf[200];
++      sprintf (buf, "document is %d seconds in the future\n", dd - sd);
++      terminate (STATE_CRITICAL, buf);
++
++    } else if (dd < sd - maximum_age) {
++      char buf[200];
++      int n = (sd - dd);
++      if (n > (60 * 60 * 24 * 2))
++        sprintf (buf, "last modified %.1f days ago\n",
++                 ((float) n) / (60 * 60 * 24));
++      else
++        sprintf (buf, "last modified %d:%02d:%02d ago\n",
++                 n / (60 * 60), (n / 60) % 60, n % 60);
++      terminate (STATE_CRITICAL, buf);
++    }
++
++    free (server_date);
++    free (document_date);
++  }
++}
++
++
++
+ int
+ check_http (void)
+ {
+@@ -625,6 +881,12 @@
+                buffer[i] = '\0';
+                asprintf (&full_page, "%s%s", full_page, buffer);
+                pagesize += i;
++
++                /* jwz */
++                if (no_body && document_headers_done (full_page)) {
++                  i = 0;
++                  break;
++                }
+        }
+ 
+        if (i < 0 && errno != ECONNRESET) {
+@@ -685,7 +947,8 @@
+        page += (size_t) strspn (page, "\r\n");
+        header[pos - header] = 0;
+        if (verbose)
+-               printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header, page);
++               printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
++                (no_body ? "  [[ skipped ]]" : page)); /* jwz */
+ 
+        /* make sure the status line matches the response we are looking for */
+        if (!strstr (status_line, server_expect)) {
+@@ -810,6 +1073,11 @@
+        } /* end else (server_expect_yn)  */
+ 
+                
++        /* jwz */
++        if (maximum_age >= 0) {
++          check_document_dates (header);
++        }
++
+        /* check elapsed time */
+        elapsed_time = delta_time (tv);
+        asprintf (&msg, "HTTP problem: %s - %7.3f second response time %s%s|time=%7.3f\n",
diff --git a/web/attachments/88809-nagios-plugins-1.4.0alpha1.my_connect.patch b/web/attachments/88809-nagios-plugins-1.4.0alpha1.my_connect.patch
new file mode 100644
index 0000000..f3b16a6
--- /dev/null
+++ b/web/attachments/88809-nagios-plugins-1.4.0alpha1.my_connect.patch
@@ -0,0 +1,60 @@
+diff -Naur nagios-plugins-1.4.0alpha1.orig/plugins/netutils.c nagios-plugins-1.4.0alpha1/plugins/netutils.c
+--- nagios-plugins-1.4.0alpha1.orig/plugins/netutils.c  2003-08-09 23:31:02.000000000 -0700
++++ nagios-plugins-1.4.0alpha1/plugins/netutils.c       2004-05-28 15:45:24.000000000 -0700
+@@ -97,7 +97,7 @@
+        fd_set readfds;
+        int recv_length = 0;
+ 
+-       result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
++       result = _my_connect (server_address, server_port, &sd, IPPROTO_TCP);
+        if (result != STATE_OK)
+                return STATE_CRITICAL;
+ 
+@@ -175,7 +175,7 @@
+ 
+        result = STATE_OK;
+ 
+-       result = my_connect (server_address, server_port, &sd, proto);
++       result = _my_connect (server_address, server_port, &sd, proto);
+        if (result != STATE_OK)
+                return STATE_CRITICAL;
+ 
+@@ -227,7 +227,7 @@
+ {
+        int result;
+ 
+-       result = my_connect (host_name, port, sd, IPPROTO_TCP);
++       result = _my_connect (host_name, port, sd, IPPROTO_TCP);
+ 
+        return result;
+ }
+@@ -239,7 +239,7 @@
+ {
+        int result;
+ 
+-       result = my_connect (host_name, port, sd, IPPROTO_UDP);
++       result = _my_connect (host_name, port, sd, IPPROTO_UDP);
+ 
+        return result;
+ }
+@@ -247,7 +247,7 @@
+ 
+ /* opens a tcp or udp connection to a remote host */
+ int
+-my_connect (const char *host_name, int port, int *sd, int proto)
++_my_connect (const char *host_name, int port, int *sd, int proto)
+ {
+        struct addrinfo hints;
+        struct addrinfo *res;
+diff -Naur nagios-plugins-1.4.0alpha1.orig/plugins/netutils.h nagios-plugins-1.4.0alpha1/plugins/netutils.h
+--- nagios-plugins-1.4.0alpha1.orig/plugins/netutils.h  2003-08-08 16:05:17.000000000 -0700
++++ nagios-plugins-1.4.0alpha1/plugins/netutils.h       2004-05-28 15:45:28.000000000 -0700
+@@ -47,7 +47,7 @@
+ 
+ int my_tcp_connect (const char *address, int port, int *sd);
+ int my_udp_connect (const char *address, int port, int *sd);
+-int my_connect (const char *address, int port, int *sd, int proto);
++int _my_connect (const char *address, int port, int *sd, int proto);
+ 
+ int is_host (const char *);
+ int is_addr (const char *);
diff --git a/web/attachments/92167-03_hostwithnumbers.patch b/web/attachments/92167-03_hostwithnumbers.patch
new file mode 100644
index 0000000..f3060bf
--- /dev/null
+++ b/web/attachments/92167-03_hostwithnumbers.patch
@@ -0,0 +1,12 @@
+diff -urNad /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1.0/plugins/utils.c nagios-plugins-1.3.1.0/plugins/utils.c
+--- /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1.0/plugins/utils.c     2003-04-23 06:57:08.000000000 +0200
++++ nagios-plugins-1.3.1.0/plugins/utils.c      2004-06-15 15:35:02.000000000 +0200
+@@ -229,7 +229,7 @@
+   /* '..' and '.-' are not legal either */
+        while ((s1 = index (s1, '.'))) {
+                s1++;
+-               if (strspn (s1, "0123456789-.") == 1) {
++               if (strspn (s1, "-.") == 1) {
+                        return FALSE;
+                }
+        }
diff --git a/web/attachments/92703-check_disk.patch b/web/attachments/92703-check_disk.patch
new file mode 100644
index 0000000..920b56e
--- /dev/null
+++ b/web/attachments/92703-check_disk.patch
@@ -0,0 +1,11 @@
+--- check_disk.c.orig   2004-07-02 09:50:32.000000000 -0600
++++ check_disk.c        2004-07-02 15:02:59.000000000 -0600
+@@ -191,7 +191,7 @@
+                        psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+                        asprintf (&perf, "%s %s", perf,
+                                  perfdata ((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+-                                           fsp.fsu_bavail*fsp.fsu_blocksize/mult, units,
++                                           psize-(fsp.fsu_bavail*fsp.fsu_blocksize/mult), units,
+                                            TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
+                                            TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
+                                            TRUE, 0,
diff --git a/web/attachments/94817-check_disk-patch b/web/attachments/94817-check_disk-patch
new file mode 100644
index 0000000..e583220
--- /dev/null
+++ b/web/attachments/94817-check_disk-patch
@@ -0,0 +1,243 @@
+--- ../tmp/nagios-plugins-1.4.0alpha1/plugins/check_disk.c      Thu Jul 22 16:59:52 2004
++++ plugins/check_disk.c        Thu Jul 22 16:56:15 2004
+@@ -21,6 +21,10 @@
+ const char *copyright = "1999-2003";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
++/*
++ * Additional inode code by Jorgen Lundman <lundman@lundman.net>
++ */
++
+ #include "common.h"
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+@@ -65,6 +69,8 @@
+   uintmax_t c_df;
+   double w_dfp;
+   double c_dfp;
++  double w_idfp;
++  double c_idfp;
+   struct name_list *name_next;
+ };
+ 
+@@ -110,8 +116,8 @@
+ 
+ int process_arguments (int, char **);
+ void print_path (const char *mypath);
+-int validate_arguments (uintmax_t, uintmax_t, double, double, char *);
+-int check_disk (double usp, uintmax_t free_disk);
++int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
++int check_disk (double usp, uintmax_t free_disk, double uisp);
+ int walk_name_list (struct name_list *list, const char *name);
+ void print_help (void);
+ void print_usage (void);
+@@ -120,6 +126,8 @@
+ uintmax_t c_df = 0;
+ double w_dfp = -1.0;
+ double c_dfp = -1.0;
++double w_idfp = -1.0;
++double c_idfp = -1.0;
+ char *path;
+ char *exclude_device;
+ char *units;
+@@ -136,7 +144,7 @@
+ int
+ main (int argc, char **argv)
+ {
+-       double usp = -1.0;
++       double usp = -1.0, uisp = -1.0;
+        int result = STATE_UNKNOWN;
+        int disk_result = STATE_UNKNOWN;
+        char file_system[MAX_INPUT_BUFFER];
+@@ -144,7 +152,7 @@
+        char *details;
+        char *perf;
+        uintmax_t psize;
+-       float free_space, free_space_pct, total_space;
++       float free_space, free_space_pct, total_space, inode_space_pct;
+ 
+        struct mount_entry *me;
+        struct fs_usage fsp;
+@@ -181,20 +189,26 @@
+                         (walk_name_list (dp_exclude_list, me->me_devname) ||
+                          walk_name_list (dp_exclude_list, me->me_mountdir)))
+                        continue;
+-               else
++               else 
+                        get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+ 
+                if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+                        usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
+-                       disk_result = check_disk (usp, fsp.fsu_bavail);
++                       uisp = (double)(fsp.fsu_files - fsp.fsu_ffree) * 100 / fsp.fsu_files;
++                       disk_result = check_disk (usp, fsp.fsu_bavail, uisp);
+                        result = max_state (disk_result, result);
+                        psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
++
++                       /* Moved this computation up here so we can add it
++                        * to perf */
++                       inode_space_pct = (float)fsp.fsu_ffree*100/fsp.fsu_files;
++
+                        asprintf (&perf, "%s %s", perf,
+                                  perfdata ((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                                            fsp.fsu_bavail*fsp.fsu_blocksize/mult, units,
+                                            TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
+                                            TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
+-                                           TRUE, 0,
++                                           TRUE, inode_space_pct,
+                                            TRUE, psize));
+                        if (disk_result==STATE_OK && erronly && !verbose)
+                                continue;
+@@ -203,17 +217,20 @@
+                        free_space_pct = (float)fsp.fsu_bavail*100/fsp.fsu_blocks;
+                        total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+                        if (disk_result!=STATE_OK || verbose>=0)
+-                               asprintf (&output, ("%s %s %.0f %s (%.0f%%);"),
++                               asprintf (&output, ("%s %s %.0f %s (%.0f%% inode=%.0f%%);"),
+                                          output,
+                                          (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                                          free_space,
+                                          units,
+-                                                                       free_space_pct);
++                                         free_space_pct,
++                                         inode_space_pct);
++
+                        asprintf (&details, _("%s\n\
+-%.0f of %.0f %s (%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
+-                                 details, free_space, total_space, units, free_space_pct,
++%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
++                                 details, free_space, total_space, units, free_space_pct, inode_space_pct,
+                                  me->me_devname, me->me_type, me->me_mountdir,
+                                  (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
++
+                }
+ 
+        }
+@@ -259,6 +276,9 @@
+                {"timeout", required_argument, 0, 't'},
+                {"warning", required_argument, 0, 'w'},
+                {"critical", required_argument, 0, 'c'},
++               {"iwarning", required_argument, 0, 'W'},
++               /* Dang, -C is taken. We might want to reshuffle this. */
++               {"icritical", required_argument, 0, 'K'},
+                {"local", required_argument, 0, 'l'},
+                {"kilobytes", required_argument, 0, 'k'},
+                {"megabytes", required_argument, 0, 'm'},
+@@ -291,7 +311,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+?VqhveCt:c:w:u:p:x:X:mklM", longopts, &option);
++               c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklM", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -339,6 +359,24 @@
+                        else {
+                                usage (_("Critical threshold must be integer or percentage!\n"));
+                        }
++
++
++               case 'W':                                                                       /* warning inode threshold */
++                 if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_idfp) == 1) {
++                   break;
++                 }
++                 else {
++                   usage (_("Warning inode threshold must be percentage!\n"));
++                 }
++               case 'K':                                                                       /* kritical inode threshold */
++                 if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_idfp) == 1) {
++                   break;
++                 }
++                 else {
++                   usage (_("Critical inode threshold must be percentage!\n"));
++                 }
++
++
+                case 'u':
+                        if (units)
+                                free(units);
+@@ -459,6 +497,8 @@
+                                                      temp_list->c_df,
+                                                      temp_list->w_dfp,
+                                                      temp_list->c_dfp,
++                                                     temp_list->w_idfp,
++                                                     temp_list->c_idfp,
+                                                      temp_list->name) == ERROR)
+                                result = ERROR;
+                        temp_list = temp_list->name_next;
+@@ -465,7 +505,7 @@
+                }
+                return result;
+        } else {
+-               return validate_arguments (w_df, c_df, w_dfp, c_dfp, NULL);
++               return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL);
+        }
+ }
+ 
+@@ -482,7 +522,7 @@
+ }
+ 
+ int
+-validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, char *mypath)
++validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath)
+ {
+        if (w == 0 && c == 0 && wp < 0.0 && cp < 0.0) {
+                printf (_("INPUT ERROR: No thresholds specified"));
+@@ -497,6 +537,14 @@
+                print_path (mypath);
+                return ERROR;
+        }
++       else if ((iwp >= 0.0 || icp >= 0.0) &&
++                (iwp < 0.0 || icp < 0.0 || iwp > 100.0 || icp > 100.0 || icp > iwp)) {
++               printf (_("\
++INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both should be between zero and 100 percent, inclusive"),
++                       icp, iwp);
++               print_path (mypath);
++               return ERROR;
++       }
+        else if ((w > 0 || c > 0) && (w == 0 || c == 0 || c > w)) {
+                printf (_("\
+ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greater than zero"),
+@@ -516,16 +564,20 @@
+ 
+ 
+ int
+-check_disk (double usp, uintmax_t free_disk)
++check_disk (double usp, uintmax_t free_disk, double uisp)
+ {
+        int result = STATE_UNKNOWN;
+        /* check the percent used space against thresholds */
+        if (usp >= 0.0 && c_dfp >=0.0 && usp >= (100.0 - c_dfp))
+                result = STATE_CRITICAL;
++       else if (uisp >= 0.0 && c_idfp >=0.0 && uisp >= (100.0 - c_idfp))
++               result = STATE_CRITICAL;
+        else if (c_df > 0 && free_disk <= c_df)
+                result = STATE_CRITICAL;
+        else if (usp >= 0.0 && w_dfp >=0.0 && usp >= (100.0 - w_dfp))
+                result = STATE_WARNING;
++       else if (uisp >= 0.0 && w_idfp >=0.0 && uisp >= (100.0 - w_idfp))
++               result = STATE_WARNING;
+        else if (w_df > 0 && free_disk <= w_df)
+                result = STATE_WARNING;
+        else if (usp >= 0.0)
+@@ -579,6 +631,10 @@
+    Exit with WARNING status if less than INTEGER kilobytes of disk are free\n\
+  -w, --warning=PERCENT%%\n\
+    Exit with WARNING status if less than PERCENT of disk space is free\n\
++ -W, --iwarning=PERCENT%%\n\
++   Exit with WARNING status if less than PERCENT of inode space is free\n\
++ -K, --icritical=PERCENT%%\n\
++   Exit with CRITICAL status if less than PERCENT of inode space is free\n\
+  -c, --critical=INTEGER\n\
+    Exit with CRITICAL status if less than INTEGER kilobytes of disk are free\n\
+  -c, --critical=PERCENT%%\n\
+@@ -628,7 +684,7 @@
+ print_usage (void)
+ {
+        printf (_("\
+-Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
++Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e] [-W limit] [-K limit]\n\
+         [-v] [-q]\n\
+        %s (-h|--help)\n\
+        %s (-V|--version)\n"),
diff --git a/web/attachments/94931-check_disk-patch b/web/attachments/94931-check_disk-patch
new file mode 100644
index 0000000..4920cc1
--- /dev/null
+++ b/web/attachments/94931-check_disk-patch
@@ -0,0 +1,273 @@
+--- check_disk.c-dist   Thu Jul 22 15:46:18 2004
++++ check_disk.c        Fri Jul 23 12:38:12 2004
+@@ -21,6 +21,10 @@
+ const char *copyright = "1999-2003";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
++/*
++ * Additional inode code by Jorgen Lundman <lundman@lundman.net>
++ */
++
+ #include "common.h"
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+@@ -65,6 +69,8 @@
+   uintmax_t c_df;
+   double w_dfp;
+   double c_dfp;
++  double w_idfp;
++  double c_idfp;
+   struct name_list *name_next;
+ };
+ 
+@@ -110,8 +116,8 @@
+ 
+ int process_arguments (int, char **);
+ void print_path (const char *mypath);
+-int validate_arguments (uintmax_t, uintmax_t, double, double, char *);
+-int check_disk (double usp, uintmax_t free_disk);
++int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
++int check_disk (double usp, uintmax_t free_disk, double uisp);
+ int walk_name_list (struct name_list *list, const char *name);
+ void print_help (void);
+ void print_usage (void);
+@@ -120,6 +126,8 @@
+ uintmax_t c_df = 0;
+ double w_dfp = -1.0;
+ double c_dfp = -1.0;
++double w_idfp = -1.0;
++double c_idfp = -1.0;
+ char *path;
+ char *exclude_device;
+ char *units;
+@@ -136,7 +144,7 @@
+ int
+ main (int argc, char **argv)
+ {
+-       double usp = -1.0;
++       double usp = -1.0, uisp = -1.0;
+        int result = STATE_UNKNOWN;
+        int disk_result = STATE_UNKNOWN;
+        char file_system[MAX_INPUT_BUFFER];
+@@ -144,7 +152,7 @@
+        char *details;
+        char *perf;
+        uintmax_t psize;
+-       float free_space, free_space_pct, total_space;
++       float free_space, free_space_pct, total_space, inode_space_pct;
+ 
+        struct mount_entry *me;
+        struct fs_usage fsp;
+@@ -181,20 +189,26 @@
+                         (walk_name_list (dp_exclude_list, me->me_devname) ||
+                          walk_name_list (dp_exclude_list, me->me_mountdir)))
+                        continue;
+-               else
++               else 
+                        get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+ 
+                if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
+                        usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
+-                       disk_result = check_disk (usp, fsp.fsu_bavail);
++                       uisp = (double)(fsp.fsu_files - fsp.fsu_ffree) * 100 / fsp.fsu_files;
++                       disk_result = check_disk (usp, fsp.fsu_bavail, uisp);
+                        result = max_state (disk_result, result);
+                        psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
++
++                       /* Moved this computation up here so we can add it
++                        * to perf */
++                       inode_space_pct = (float)fsp.fsu_ffree*100/fsp.fsu_files;
++
+                        asprintf (&perf, "%s %s", perf,
+                                  perfdata ((!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                                            fsp.fsu_bavail*fsp.fsu_blocksize/mult, units,
+                                            TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
+                                            TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
+-                                           TRUE, 0,
++                                           TRUE, inode_space_pct,
+                                            TRUE, psize));
+                        if (disk_result==STATE_OK && erronly && !verbose)
+                                continue;
+@@ -203,17 +217,20 @@
+                        free_space_pct = (float)fsp.fsu_bavail*100/fsp.fsu_blocks;
+                        total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+                        if (disk_result!=STATE_OK || verbose>=0)
+-                               asprintf (&output, ("%s %s %.0f %s (%.0f%%);"),
++                               asprintf (&output, ("%s %s %.0f %s (%.0f%% inode=%.0f%%);"),
+                                          output,
+                                          (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                                          free_space,
+                                          units,
+-                                                                       free_space_pct);
++                                         free_space_pct,
++                                         inode_space_pct);
++
+                        asprintf (&details, _("%s\n\
+-%.0f of %.0f %s (%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
+-                                 details, free_space, total_space, units, free_space_pct,
++%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
++                                 details, free_space, total_space, units, free_space_pct, inode_space_pct,
+                                  me->me_devname, me->me_type, me->me_mountdir,
+                                  (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
++
+                }
+ 
+        }
+@@ -259,6 +276,9 @@
+                {"timeout", required_argument, 0, 't'},
+                {"warning", required_argument, 0, 'w'},
+                {"critical", required_argument, 0, 'c'},
++               {"iwarning", required_argument, 0, 'W'},
++               /* Dang, -C is taken. We might want to reshuffle this. */
++               {"icritical", required_argument, 0, 'K'},
+                {"local", required_argument, 0, 'l'},
+                {"kilobytes", required_argument, 0, 'k'},
+                {"megabytes", required_argument, 0, 'm'},
+@@ -291,7 +311,7 @@
+                        strcpy (argv[c], "-t");
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "+?VqhveCt:c:w:u:p:x:X:mklM", longopts, &option);
++               c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklM", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -339,6 +359,24 @@
+                        else {
+                                usage (_("Critical threshold must be integer or percentage!\n"));
+                        }
++
++
++               case 'W':                                                                       /* warning inode threshold */
++                 if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_idfp) == 1) {
++                   break;
++                 }
++                 else {
++                   usage (_("Warning inode threshold must be percentage!\n"));
++                 }
++               case 'K':                                                                       /* kritical inode threshold */
++                 if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_idfp) == 1) {
++                   break;
++                 }
++                 else {
++                   usage (_("Critical inode threshold must be percentage!\n"));
++                 }
++
++
+                case 'u':
+                        if (units)
+                                free(units);
+@@ -393,6 +431,14 @@
+                        se = (struct name_list *) malloc (sizeof (struct name_list));
+                        se->name = optarg;
+                        se->name_next = NULL;
++                       /* If you don't clear the w_fd etc values here, they
++                        * get processed when you walk the list and assigned
++                        * to the global w_df! 
++                        */
++                       se->w_df = 0;
++                       se->c_df = 0;
++                       se->w_dfp = 0;
++                       se->c_dfp = 0;
+                        *dptail = se;
+                        dptail = &se->name_next;
+                        break;
+@@ -400,6 +446,14 @@
+                        se = (struct name_list *) malloc (sizeof (struct name_list));
+                        se->name = optarg;
+                        se->name_next = NULL;
++                       /* If you don't clear the w_fd etc values here, they
++                        * get processed when you walk the list and assigned
++                        * to the global w_df! 
++                        */
++                       se->w_df = 0;
++                       se->c_df = 0;
++                       se->w_dfp = 0;
++                       se->c_dfp = 0;
+                        *fstail = se;
+                        fstail = &se->name_next;
+                        break;
+@@ -459,6 +513,8 @@
+                                                      temp_list->c_df,
+                                                      temp_list->w_dfp,
+                                                      temp_list->c_dfp,
++                                                     temp_list->w_idfp,
++                                                     temp_list->c_idfp,
+                                                      temp_list->name) == ERROR)
+                                result = ERROR;
+                        temp_list = temp_list->name_next;
+@@ -465,7 +521,7 @@
+                }
+                return result;
+        } else {
+-               return validate_arguments (w_df, c_df, w_dfp, c_dfp, NULL);
++               return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL);
+        }
+ }
+ 
+@@ -482,7 +538,7 @@
+ }
+ 
+ int
+-validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, char *mypath)
++validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath)
+ {
+        if (w == 0 && c == 0 && wp < 0.0 && cp < 0.0) {
+                printf (_("INPUT ERROR: No thresholds specified"));
+@@ -497,6 +553,14 @@
+                print_path (mypath);
+                return ERROR;
+        }
++       else if ((iwp >= 0.0 || icp >= 0.0) &&
++                (iwp < 0.0 || icp < 0.0 || iwp > 100.0 || icp > 100.0 || icp > iwp)) {
++               printf (_("\
++INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both should be between zero and 100 percent, inclusive"),
++                       icp, iwp);
++               print_path (mypath);
++               return ERROR;
++       }
+        else if ((w > 0 || c > 0) && (w == 0 || c == 0 || c > w)) {
+                printf (_("\
+ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greater than zero"),
+@@ -516,16 +580,20 @@
+ 
+ 
+ int
+-check_disk (double usp, uintmax_t free_disk)
++check_disk (double usp, uintmax_t free_disk, double uisp)
+ {
+        int result = STATE_UNKNOWN;
+        /* check the percent used space against thresholds */
+        if (usp >= 0.0 && c_dfp >=0.0 && usp >= (100.0 - c_dfp))
+                result = STATE_CRITICAL;
++       else if (uisp >= 0.0 && c_idfp >=0.0 && uisp >= (100.0 - c_idfp))
++               result = STATE_CRITICAL;
+        else if (c_df > 0 && free_disk <= c_df)
+                result = STATE_CRITICAL;
+        else if (usp >= 0.0 && w_dfp >=0.0 && usp >= (100.0 - w_dfp))
+                result = STATE_WARNING;
++       else if (uisp >= 0.0 && w_idfp >=0.0 && uisp >= (100.0 - w_idfp))
++               result = STATE_WARNING;
+        else if (w_df > 0 && free_disk <= w_df)
+                result = STATE_WARNING;
+        else if (usp >= 0.0)
+@@ -579,6 +647,10 @@
+    Exit with WARNING status if less than INTEGER kilobytes of disk are free\n\
+  -w, --warning=PERCENT%%\n\
+    Exit with WARNING status if less than PERCENT of disk space is free\n\
++ -W, --iwarning=PERCENT%%\n\
++   Exit with WARNING status if less than PERCENT of inode space is free\n\
++ -K, --icritical=PERCENT%%\n\
++   Exit with CRITICAL status if less than PERCENT of inode space is free\n\
+  -c, --critical=INTEGER\n\
+    Exit with CRITICAL status if less than INTEGER kilobytes of disk are free\n\
+  -c, --critical=PERCENT%%\n\
+@@ -628,7 +700,7 @@
+ print_usage (void)
+ {
+        printf (_("\
+-Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
++Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e] [-W limit] [-K limit]\n\
+         [-v] [-q]\n\
+        %s (-h|--help)\n\
+        %s (-V|--version)\n"),
diff --git a/web/attachments/95011-check_nmap.patch b/web/attachments/95011-check_nmap.patch
new file mode 100644
index 0000000..3e41add
--- /dev/null
+++ b/web/attachments/95011-check_nmap.patch
@@ -0,0 +1,29 @@
+--- ./contrib/check_nmap.py     2002-02-28 01:42:54.000000000 -0500
++++ ./contrib/check_nmap.py     2004-07-23 16:03:17.000000000 -0400
+@@ -8,7 +8,7 @@
+ # License: GPL
+ # Copyright (c)  2000 Jacob Lundqvist (jaclu@galdrion.com)
+ #
+-_version_ = '1.20'
++_version_ = '1.21'
+ #
+ #
+ # Description:
+@@ -25,6 +25,7 @@
+ #
+ # History
+ # -------
++# 1.21  2004-07-23 rippeld@hillsboroughcounty.org Updated parsing of nmap output to correctly identify closed ports
+ # 1.20   2000-07-15 jaclu Updated params to correctly comply to plugin-standard
+ #                         moved support classes to utils.py
+ # 1.16   2000-07-14 jaclu made options and return codes more compatible with 
+@@ -276,7 +277,8 @@
+                if string.find(s,'/')<1:
+                    continue
+                p=string.split(s,'/')[0]
+-               self.active_ports.append(int(p))
++               if string.find(l,'open')>1:
++                   self.active_ports.append(int(p))
+        except:
+            # failure due to strange output...
+            pass
diff --git a/web/attachments/95707-nagios.patch b/web/attachments/95707-nagios.patch
new file mode 100644
index 0000000..445b6e4
--- /dev/null
+++ b/web/attachments/95707-nagios.patch
@@ -0,0 +1,203 @@
+Only in nagios-plugins-1.4.0alpha1-rm: autom4te-2.53.cache
+Only in nagios-plugins-1.4.0alpha1-rm: autom4te.cache
+diff -r -u nagios-plugins-1.4.0alpha1/configure nagios-plugins-1.4.0alpha1-rm/configure
+--- nagios-plugins-1.4.0alpha1/configure        2003-11-30 18:55:45.000000000 -0800
++++ nagios-plugins-1.4.0alpha1-rm/configure     2004-07-14 21:40:45.000000000 -0700
+@@ -15537,13 +15537,13 @@
+        echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5
+ echo "${ECHO_T}$ac_cv_ps_command" >&6
+ 
+-elif ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
+-       egrep -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null
++elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \
++       egrep -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+" >/dev/null
+ then
+-       ac_cv_ps_varlist="procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
+-       ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu comm args'"
+-       ac_cv_ps_format="%s %d %d %d %d %f %s %n"
+-       ac_cv_ps_cols=8
++       ac_cv_ps_varlist="procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos"
++       ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu etime comm args'"
++       ac_cv_ps_format="%s %d %d %d %d %f %s %s %n"
++       ac_cv_ps_cols=9
+        echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5
+ echo "${ECHO_T}$ac_cv_ps_command" >&6
+ 
+diff -r -u nagios-plugins-1.4.0alpha1/configure.in nagios-plugins-1.4.0alpha1-rm/configure.in
+--- nagios-plugins-1.4.0alpha1/configure.in     2003-11-30 18:55:32.000000000 -0800
++++ nagios-plugins-1.4.0alpha1-rm/configure.in  2004-07-14 06:23:16.000000000 -0700
+@@ -644,13 +644,13 @@
+        AC_MSG_RESULT([$ac_cv_ps_command])
+ 
+ dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
+-elif ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
+-       egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
++elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \
++       egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
+ then
+-       ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-       ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu comm args'"
+-       ac_cv_ps_format="%s %d %d %d %d %f %s %n"
+-       ac_cv_ps_cols=8
++       ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
++       ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu etime comm args'"
++       ac_cv_ps_format="%s %d %d %d %d %f %s %s %n"
++       ac_cv_ps_cols=9
+        AC_MSG_RESULT([$ac_cv_ps_command])
+ 
+ dnl FreeBSD
+Only in nagios-plugins-1.4.0alpha1/pkg/solaris: pkginfo
+diff -r -u nagios-plugins-1.4.0alpha1/plugins/check_nagios.c nagios-plugins-1.4.0alpha1-rm/plugins/check_nagios.c
+--- nagios-plugins-1.4.0alpha1/plugins/check_nagios.c   2003-08-21 23:22:38.000000000 -0700
++++ nagios-plugins-1.4.0alpha1-rm/plugins/check_nagios.c        2004-07-14 06:27:19.000000000 -0700
+@@ -52,6 +52,7 @@
+        int procrss = 0;
+        float procpcpu = 0;
+        char procstat[8];
++       char procetime[MAX_INPUT_BUFFER];
+        char procprog[MAX_INPUT_BUFFER];
+        char *procargs;
+        int pos, cols;
+diff -r -u nagios-plugins-1.4.0alpha1/plugins/check_procs.c nagios-plugins-1.4.0alpha1-rm/plugins/check_procs.c
+--- nagios-plugins-1.4.0alpha1/plugins/check_procs.c    2003-11-30 18:46:01.000000000 -0800
++++ nagios-plugins-1.4.0alpha1-rm/plugins/check_procs.c 2004-07-14 21:36:09.000000000 -0700
+@@ -47,14 +47,15 @@
+ #define VSZ  64
+ #define RSS  128
+ #define PCPU 256
+-
++#define ELAPSED 512
+ /* Different metrics */
+ char *metric_name;
+ enum metric {
+        METRIC_PROCS,
+        METRIC_VSZ,
+        METRIC_RSS,
+-       METRIC_CPU
++       METRIC_CPU,
++       METRIC_ELAPSED
+ };
+ enum metric metric = METRIC_PROCS;
+ 
+@@ -85,8 +86,10 @@
+        int procppid = 0;
+        int procvsz = 0;
+        int procrss = 0;
++       int procseconds = 0;
+        float procpcpu = 0;
+        char procstat[8];
++       char procetime[MAX_INPUT_BUFFER];
+        char procprog[MAX_INPUT_BUFFER];
+        char *procargs;
+        char *temp_string;
+@@ -156,10 +159,14 @@
+                                temp_string = strtok (NULL, "/");
+                        }
+ 
++                       /* we need to convert the elapsed time to seconds */
++                       procseconds = convert_to_seconds(procetime);
++
+                        if (verbose >= 3)
+-                               printf ("%d %d %d %d %d %.2f %s %s %s\n", 
++                               printf ("%d %d %d %d %d %.2f %s %s %s %s\n", 
+                                        procs, procuid, procvsz, procrss,
+-                                       procppid, procpcpu, procstat, procprog, procargs);
++                                       procppid, procpcpu, procstat, 
++                                       procetime, procprog, procargs);
+ 
+                        /* Ignore self */
+                        if (strcmp (procprog, progname) == 0) {
+@@ -198,6 +205,8 @@
+                        /* TODO? float thresholds for --metric=CPU */
+                        else if (metric == METRIC_CPU)
+                                i = check_thresholds ((int)procpcpu); 
++                       else if (metric == METRIC_ELAPSED)
++                               i = check_thresholds (procseconds);
+ 
+                        if (metric != METRIC_PROCS) {
+                                if (i == STATE_WARNING) {
+@@ -297,6 +306,7 @@
+                {"vsz", required_argument, 0, 'z'},
+                {"rss", required_argument, 0, 'r'},
+                {"pcpu", required_argument, 0, 'P'},
++               {"elapsed", required_argument, 0, 'e'},
+                {"argument-array", required_argument, 0, 'a'},
+                {"help", no_argument, 0, 'h'},
+                {"version", no_argument, 0, 'V'},
+@@ -448,7 +458,12 @@
+                                metric = METRIC_CPU;
+                                break;
+                        }
+-                       printf (_("%s: metric must be one of PROCS, VSZ, RSS, CPU!\n\n"),
++                       else if ( strcmp(optarg, "ELAPSED") == 0) {
++                               metric = METRIC_ELAPSED;
++                               break;
++                       }
++                               
++                       printf (_("%s: metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!\n\n"),
+                                progname);
+                        print_usage ();
+                        exit (STATE_UNKNOWN);
+@@ -646,6 +661,62 @@
+        printf (_(UT_SUPPORT));
+ }
+ 
++/* convert the elapsed time to seconds */
++int convert_to_seconds(char *etime) {
++
++       char *ptr;
++       int total;
++
++       int hyphcnt;
++       int coloncnt;
++       int days;
++       int hours;
++       int minutes;
++       int seconds;
++
++       hyphcnt = 0;
++       coloncnt = 0;
++       days = 0;
++       hours = 0;
++       minutes = 0;
++       seconds = 0;
++
++       for (ptr = etime; *ptr != '\0'; ptr++) {
++       
++               if (*ptr == '-') {
++                       hyphcnt++;
++                       continue;
++               }
++               if (*ptr == ':') {
++                       coloncnt++;
++                       continue;
++               }
++       }
++
++       if (hyphcnt > 0) {
++               sscanf(etime, "%d-%d:%d:%d",
++                               &days, &hours, &minutes, &seconds);
++       } else {
++               if (coloncnt == 2) {
++                       sscanf(etime, "%d:%d:%d",
++                               &hours, &minutes, &seconds);
++               } else if (coloncnt == 1) {
++                       sscanf(etime, "%d:%d",
++                               &minutes, &seconds);
++               }
++       }
++
++       total = (days * 86400) +
++               (hours * 3600) +
++               (minutes * 60) +
++               seconds;
++
++       if (verbose >= 3) {
++               printf("seconds: %d\n", total);
++       }
++       return total;
++}
++
+ void
+ print_usage (void)
+ {
diff --git a/web/attachments/97188-check_mysql.check_slave.patch b/web/attachments/97188-check_mysql.check_slave.patch
new file mode 100644
index 0000000..6607fdc
--- /dev/null
+++ b/web/attachments/97188-check_mysql.check_slave.patch
@@ -0,0 +1,138 @@
+diff -Naur nagios-plugins-1.4.0alpha1.orig/plugins/check_mysql.c nagios-plugins-1.4.0alpha1/plugins/check_mysql.c
+--- nagios-plugins-1.4.0alpha1.orig/plugins/check_mysql.c       2003-08-21 23:22:38.000000000 -0700
++++ nagios-plugins-1.4.0alpha1/plugins/check_mysql.c    2004-07-30 11:15:56.000000000 -0700
+@@ -19,6 +19,8 @@
+ const char *copyright = "1999-2002";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
++#define SLAVERESULTSIZE 40
++
+ #include "common.h"
+ #include "utils.h"
+ #include "netutils.h"
+@@ -30,6 +32,7 @@
+ char *db_pass = NULL;
+ char *db = NULL;
+ unsigned int db_port = MYSQL_PORT;
++int check_slave = 0;
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -41,7 +44,10 @@
+ {
+ 
+        MYSQL mysql;
++       MYSQL_RES *res;
++       MYSQL_ROW row;
+        char *result = NULL;
++       char slaveresult[SLAVERESULTSIZE];
+ 
+        setlocale (LC_ALL, "");
+        bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -82,11 +88,58 @@
+                        die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
+        }
+ 
++       if(check_slave) {
++               /* check the slave status */
++               if (mysql_query (&mysql, "show slave status") != 0) {
++                       mysql_close (&mysql);
++                       die (STATE_CRITICAL, "slave query error: %s\n", mysql_error (&mysql));
++               }
++
++               /* store the result */
++               if ( (res = mysql_store_result (&mysql)) == NULL) {
++                       mysql_close (&mysql);
++                       die (STATE_CRITICAL, "slave store_result error: %s\n", mysql_error (&mysql));
++               }
++
++               /* fetch the first row */
++               if ( (row = mysql_fetch_row (res)) == NULL) {
++                       mysql_free_result (res);
++                       mysql_close (&mysql);
++                       die (STATE_CRITICAL, "slave fetch row error: %s\n", mysql_error (&mysql));
++               }
++
++               if (mysql_field_count (&mysql) == 12) {
++                       /* mysql 3.23.x */
++                       snprintf (slaveresult, SLAVERESULTSIZE, "Slave running: %s", row[6]);
++                       if (strcmp (row[6], "Yes") != 0) {
++                               mysql_free_result (res);
++                               mysql_close (&mysql);
++                               die (STATE_CRITICAL, "%s\n", slaveresult);
++                       }
++
++               } else {
++                       /* mysql 4.x.x */
++                       snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s", row[9], row[10]);
++                       if (strcmp (row[9], "Yes") != 0 || strcmp (row[10], "Yes") != 0) {
++                               mysql_free_result (res);
++                               mysql_close (&mysql);
++                               die (STATE_CRITICAL, "%s\n", slaveresult);
++                       }
++               }
++
++               /* free the result */
++               mysql_free_result (res);
++       }
++
+        /* close the connection */
+        mysql_close (&mysql);
+ 
+        /* print out the result of stats */
+-       printf ("%s\n", result);
++       if (check_slave) {
++               printf ("%s %s\n", result, slaveresult);
++       } else {
++               printf ("%s\n", result);
++       }
+ 
+        return STATE_OK;
+ }
+@@ -108,6 +161,7 @@
+                {"username", required_argument, 0, 'u'},
+                {"password", required_argument, 0, 'p'},
+                {"port", required_argument, 0, 'P'},
++               {"check-slave", no_argument, 0, 'S'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+@@ -118,7 +172,7 @@
+                return ERROR;
+ 
+        while (1) {
+-               c = getopt_long (argc, argv, "hVP:p:u:d:H:", longopts, &option);
++               c = getopt_long (argc, argv, "hVSP:p:u:d:H:", longopts, &option);
+ 
+                if (c == -1 || c == EOF)
+                        break;
+@@ -144,6 +198,9 @@
+                case 'P':                                                                       /* critical time threshold */
+                        db_port = atoi (optarg);
+                        break;
++               case 'S':
++                       check_slave = 1;                                                        /* check-slave */
++                       break;
+                case 'V':                                                                       /* version */
+                        print_revision (progname, revision);
+                        exit (STATE_OK);
+@@ -234,7 +291,9 @@
+  -p, --password=STRING\n\
+    Use the indicated password to authenticate the connection\n\
+    ==> IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!! <==\n\
+-   Your clear-text password will be visible as a process table entry\n"));
++   Your clear-text password will be visible as a process table entry\n\
++ -S, --check-slave\n\
++   Check if the slave thread is running properly.\n"));
+ 
+        printf (_("\n\
+ There are no required arguments. By default, the local database with\n\
+@@ -250,7 +309,7 @@
+ print_usage (void)
+ {
+        printf (_("\
+-Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password]\n"),
++Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n"),
+                progname);
+        printf (_(UT_HLP_VRS), progname, progname);
+ }
diff --git a/web/attachments/98403-check_ifoperstatus-admin.diff b/web/attachments/98403-check_ifoperstatus-admin.diff
new file mode 100644
index 0000000..8127684
--- /dev/null
+++ b/web/attachments/98403-check_ifoperstatus-admin.diff
@@ -0,0 +1,85 @@
+*** nagios-plugins-1.3.1/plugins-scripts/check_ifoperstatus.pl  Wed Feb 12 05:32:20 2003
+--- check_ifoperstatus.pl       Thu Aug 19 15:34:22 2004
+***************
+*** 78,83 ****
+--- 78,84 ----
+  my $key;
+  my $lastc;
+  my $dormantWarn;
++ my $adminWarn;
+  my $name;
+  
+  
+***************
+*** 104,110 ****
+                        "H=s" => \$hostname, "hostname=s" => \$hostname,
+                        "I"       => \$ifXTable, "ifmib" => \$ifXTable,
+                        "n=s" => \$ifName, "name=s" => \$ifName,
+!                       "w=s" => \$dormantWarn, "warn=s" => \$dormantWarn );
+  
+  
+                                
+--- 105,112 ----
+                        "H=s" => \$hostname, "hostname=s" => \$hostname,
+                        "I"       => \$ifXTable, "ifmib" => \$ifXTable,
+                        "n=s" => \$ifName, "name=s" => \$ifName,
+!                       "w=s" => \$dormantWarn, "warn=s" => \$dormantWarn,
+!                       "a=s" => \$adminWarn, "admin-down=s" => \$adminWarn );
+  
+  
+                                
+***************
+*** 235,243 ****
+     ## if AdminStatus is down - some one made a consious effort to change config
+     ##
+     if ( not ($response->{$snmpIfAdminStatus} == 1) ) {
+!       $state = 'WARNING';
+!       $answer = "Interface $name (index $snmpkey) is administratively down.";
+! 
+     } 
+     ## Check operational status
+     elsif ( $response->{$snmpIfOperStatus} == 2 ) {
+--- 237,252 ----
+     ## if AdminStatus is down - some one made a consious effort to change config
+     ##
+     if ( not ($response->{$snmpIfAdminStatus} == 1) ) {
+!      $answer = "Interface $name (index $snmpkey) is administratively down.";
+!      if ( not defined $adminWarn or $adminWarn eq "w" ) {
+!         $state = 'WARNING';
+!      } elsif ( $adminWarn eq "i" ) {
+!         $state = 'OK';
+!      } elsif ( $adminWarn eq "c" ) {
+!         $state = 'CRITICAL';
+!      } else { # If wrong value for -a, say warning
+!         $state = 'WARNING';
+!      }
+     } 
+     ## Check operational status
+     elsif ( $response->{$snmpIfOperStatus} == 2 ) {
+***************
+*** 246,252 ****
+     } elsif ( $response->{$snmpIfOperStatus} == 5 ) {
+        if (defined $dormantWarn ) {
+            if ($dormantWarn eq "w") {
+!                 $state = 'WARNNG';
+                  $answer = "Interface $name (index $snmpkey) is dormant.";
+            }elsif($dormantWarn eq "c") {
+                  $state = 'CRITICAL';
+--- 255,261 ----
+     } elsif ( $response->{$snmpIfOperStatus} == 5 ) {
+        if (defined $dormantWarn ) {
+            if ($dormantWarn eq "w") {
+!                 $state = 'WARNING';
+                  $answer = "Interface $name (index $snmpkey) is dormant.";
+            }elsif($dormantWarn eq "c") {
+                  $state = 'CRITICAL';
+***************
+*** 343,348 ****
+--- 352,358 ----
+        printf "   -n (--name)       the value should match the returned ifName\n";
+        printf "                     (Implies the use of -I)\n";
+        printf "   -w (--warn =i|w|c) ignore|warn|crit if the interface is dormant (default critical)\n";
++       printf "   -a (--admin-down =i|w|c) same for administratively down interfaces (default warning)\n";
+        printf "   -V (--version)    Plugin version\n";
+        printf "   -h (--help)       usage help \n\n";
+        printf " -k or -d must be specified\n\n";
diff --git a/web/content/development.md b/web/content/development.md
new file mode 100644
index 0000000..1b71c24
--- /dev/null
+++ b/web/content/development.md
@@ -0,0 +1,43 @@
+title: Development
+parent: Home
+menu-position: 5
+---
+
+# Development
+
+## Software Repositories
+
+The [Nagios Plugins Development Team][team] takes care of three projects:
+
+* Nagios Plugins &mdash; the core bundle of standard plugins.
+* Nagios::Plugin &mdash; a module used by plugins written in Perl.
+* NagiosMIB &mdash; SNMP MIB files for traps sent from [Nagios][nagios].
+
+These projects are maintained in separate repositories on [GitHub][github]:
+
+* <https://github.com/nagios-plugins/repositories>
+
+Contributions are always welcome!  If you'd like to provide patches, please
+[fork][fork] the desired repository and submit a [pull request][pull].  In
+case you're not familiar with Git, you might want to look into [Scott
+Chacon][scott]'s [Pro Git][book] book available on the [Git web site][git]
+first.
+
+## Development Guidelines
+
+Apart from the actual code, the [team][team] also maintains the official
+[Nagios Plugin Development Guidelines][guidelines].  If you plan on
+contributing to the standard plugins package, or writing your own checks, you
+should read them!
+
+[team]: team.html "Nagios Plugins Development Team"
+[nagios]: http://www.nagios.org/ "Nagios"
+[github]: https://github.com/ "GitHub"
+[fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation"
+[pull]: https://help.github.com/articles/using-pull-requests "Pull Request Documentation"
+[scott]: http://scottchacon.com/ "Scott Chacon"
+[book]: http://git-scm.com/book "Pro Git"
+[git]: http://git-scm.com/ "Git"
+[guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines"
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/doc/faq/index.md b/web/content/doc/faq/index.md
new file mode 100644
index 0000000..18584f2
--- /dev/null
+++ b/web/content/doc/faq/index.md
@@ -0,0 +1,9 @@
+title: FAQ
+parent: Documentation
+---
+
+# FAQ
+
+The list of Frequently Asked Questions (FAQ) will come back soon.
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/doc/index.md b/web/content/doc/index.md
new file mode 100644
index 0000000..7b2d098
--- /dev/null
+++ b/web/content/doc/index.md
@@ -0,0 +1,26 @@
+title: Documentation
+parent: Home
+menu-position: 3
+---
+
+# Documentation
+
+The Nagios Plugins documentation is split up into three parts:
+
+1. **[Manual Pages][man]**  
+   This part provides documentation for each individual plugin.
+
+2. **[FAQ][faq]**  
+   The FAQ section offers additional information on the Nagios Plugins
+   package as a whole.
+
+3. **[Presentation][video]**  
+   A video that shows how to write your own check using the
+   [Nagios::Plugin][module] Perl module.
+
+[man]: doc/man/index.html "Manual Pages"
+[faq]: doc/faq/index.html "Frequently Asked Questions"
+[video]: doc/presentation.html "Nagios::Plugin Presentation"
+[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin"
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/doc/man/index.md b/web/content/doc/man/index.md
new file mode 100644
index 0000000..d3c60c8
--- /dev/null
+++ b/web/content/doc/man/index.md
@@ -0,0 +1,20 @@
+title: Manpages
+parent: Documentation
+---
+
+# Manual Pages
+
+There are two levels of documentation for each plugin:
+
+1. **`check_dummy --usage`**  
+   Basic usage, with the most common command line options.
+
+2. **`check_dummy --help`**  
+   More text, listing all the options available for a plugin.  This text is
+   usually translated.
+
+You can also access the most recent `--help` output for each plugin online:
+
+<!--% list_kids() %-->
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/doc/news.txt b/web/content/doc/news.txt
new file mode 120000
index 0000000..f5208d5
--- /dev/null
+++ b/web/content/doc/news.txt
@@ -0,0 +1 @@
+/home/plugins/exported/nagios-plugins/NEWS
\ No newline at end of file
diff --git a/web/content/doc/presentation.md b/web/content/doc/presentation.md
new file mode 100644
index 0000000..458b101
--- /dev/null
+++ b/web/content/doc/presentation.md
@@ -0,0 +1,26 @@
+title: Presentation
+parent: Documentation
+---
+
+# Presentation
+
+Former Nagios Plugins team lead Ton Voon gave a 15-minutes lightning talk
+about the Nagios Plugins at [FOSDEM][fosdem].  He made a screencast of [the
+presentation][talk] in Quicktime format (35&nbsp;MB):
+
+* [fosdem.mov][screencast]
+
+The `check_weather` script demonstrated in the screencast is also available
+for download, with additional comments:
+
+* [check_weather.pl][script]
+
+Both files are also [available via FTP][mirror].
+
+[fosdem]: https://fosdem.org/ "FOSDEM"
+[talk]: https://archive.fosdem.org/2007/schedule/events/lt_nagios_plugins.html "Ton's Talk"
+[screencast]: https://www.nagios-plugins.org/download/presentation/fosdem.mov "Screencast"
+[script]: https://www.nagios-plugins.org/download/presentation/check_weather.pl "check_weather"
+[mirror]: ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/presentation/ "FTP Mirror"
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/download.md b/web/content/download.md
new file mode 100644
index 0000000..6f8a0fc
--- /dev/null
+++ b/web/content/download.md
@@ -0,0 +1,59 @@
+title: Download
+parent: Home
+menu-position: 2
+---
+
+# Download
+
+## Nagios Plugins
+
+### Stable Release
+
+The current stable Nagios Plugins release is <!--{plugins_release}-->.  You
+can grab the source tarball from here:
+
+* [nagios-plugins-<!--{plugins_release}-->.tar.gz][tar1] ([sum][sum1])
+
+See the [release history][news] for a summary of changes between versions.
+Old releases can be found in the [download area][download].  There's also an
+[FTP mirror][mirror] available.
+
+### Development Snapshot
+
+The current development shapshot is available here:
+
+* [nagios-plugins-master.tar.gz][tar2] ([sum][sum2])
+
+It is rebuilt from the `master` branch of the [Nagios Plugins
+repository][repository] whenever that branch changes.  Snapshots built from
+other development branches are also available in the [snapshot
+directory][snapshot] of the [download area][download].
+
+## Nagios::Plugin
+
+The Nagios::Plugin module is available from [CPAN][cpan]:
+
+* <http://search.cpan.org/dist/Nagios-Plugin/>
+
+## NagiosMIB
+
+The current NagiosMIB tarball is available from here:
+
+* [nagiosmib-<!--{mib_release}-->.tar.gz][tar3] ([sum][sum3])
+
+Old versions can be found in the [download area][download].
+
+[mirror]: ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/ "FTP Mirror"
+[repository]: https://github.com/nagios-plugins/nagios-plugins "Nagios Plugins Git Repository"
+[news]: doc/news.txt "NEWS"
+[download]: download/ "Download Area"
+[snapshot]: download/snapshot/ "Snapshot Directory"
+[cpan]: http://www.cpan.org/ "CPAN"
+[tar1]: download/nagios-plugins-{{plugins_release}}.tar.gz "Current Release Tarball"
+[sum1]: download/nagios-plugins-{{plugins_release}}.tar.gz.sha1 "SHA-1 Sum"
+[tar2]: download/snapshot/nagios-plugins-master.tar.gz "Current Snapshot Tarball"
+[sum2]: download/snapshot/nagios-plugins-master.tar.gz.sha1 "SHA-1 Sum"
+[tar3]: download/nagiosmib-{{mib_release}}.tar.gz "Current NagiosMIB Tarball"
+[sum3]: download/nagiosmib-{{mib_release}}.tar.gz.sha1 "SHA-1 Sum"
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/impressum.md b/web/content/impressum.md
new file mode 100644
index 0000000..8f5ff04
--- /dev/null
+++ b/web/content/impressum.md
@@ -0,0 +1,27 @@
+title: Impressum
+parent: Home
+---
+
+# Impressum
+
+*The following information (“Impressum”) is [required][law] under German law.*
+
+Responsible for the content of this site:
+
+Holger Weiß  
+Gutsmuthsstr. 19  
+12163 Berlin  
+Germany
+
+**Phone:**  
+&nbsp;&nbsp;&nbsp;&nbsp;+49 30 61286685
+
+**Email:**  
+&nbsp;&nbsp;&nbsp;&nbsp;holger@zedat.fu-berlin.de
+
+**Jabber:**  
+&nbsp;&nbsp;&nbsp;&nbsp;holger@jabber.fu-berlin.de
+
+[law]: http://www.gesetze-im-internet.de/tmg/__5.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/index.md b/web/content/index.md
new file mode 100644
index 0000000..cf4af8f
--- /dev/null
+++ b/web/content/index.md
@@ -0,0 +1,49 @@
+title: Home
+menu-position: 1
+---
+
+# The Nagios Plugins Project
+
+We, the [Nagios Plugins Development Team][team], maintain a bundle of more
+than fifty standard plugins for [Nagios][nagios], [Icinga][icinga],
+[Shinken][shinken], and other monitoring applications that use the
+straightforward plugin interface [originally invented][history] by the [Nagios
+folks][folks].  Each plugin is a stand-alone command line tool that provides a
+specific type of check.  Typically, your monitoring software runs these
+plugins to determine the current status of hosts and services on your network.
+
+Some of the provided plugins let you check local system metrics (such as [load
+averages][load], [processes][procs], or [disk space usage][disk]), others use
+various network protocols (such as [ICMP][icmp], [SNMP][snmp], or
+[HTTP][http]) to perform remote checks.  This allows for checking a large
+number of common host and service types.  For more specific needs, thousands
+of community-contributed plugins can be found on sites such as [Nagios
+Exchange][nagex] or [Monitoring Exchange][monex].
+
+In addition to the core plugins bundle, we maintain a [Perl module][module]
+that makes it [easy][presentation] to write your own plugin.  We also take
+care of an SNMP MIB used for traps sent from Nagios, and of the [Nagios Plugin
+Development Guidelines][guidelines].
+
+You can get the latest releases from the [download page][download].
+
+[team]: team.html "Nagios Plugins Development Team"
+[nagios]: http://www.nagios.org/ "Nagios"
+[icinga]: https://www.icinga.org/ "Icinga"
+[shinken]: http://www.shinken-monitoring.org/ "Shinken"
+[history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
+[folks]: http://www.nagios.org/about/team "Nagios Team"
+[load]: man/check_load.html "check_load"
+[procs]: man/check_procs.html "check_procs"
+[disk]: man/check_disk.html "check_disk"
+[icmp]: man/check_icmp.html "check_icmp"
+[snmp]: man/check_snmp.html "check_snmp"
+[http]: man/check_http.html "check_http"
+[nagex]: http://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
+[monex]: https://www.monitoringexchange.org/inventory/Check-Plugins "Plugins on Monitoring Exchange"
+[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin Module"
+[guidelines]: doc/guidelines.html "Monitoring Plugin Development Guidelines"
+[presentation]: doc/presentation.html "Nagios::Plugin Presentation"
+[download]: download.html "Download"
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/media/favicon.ico b/web/content/media/favicon.ico
new file mode 100644
index 0000000..76ae569
--- /dev/null
+++ b/web/content/media/favicon.ico
diff --git a/web/content/media/github.png b/web/content/media/github.png
new file mode 100644
index 0000000..1e19c21
--- /dev/null
+++ b/web/content/media/github.png
diff --git a/web/content/media/plugins.css b/web/content/media/plugins.css
new file mode 100644
index 0000000..7910aad
--- /dev/null
+++ b/web/content/media/plugins.css
@@ -0,0 +1,128 @@
+/*
+ * Nagios Plugins style sheet.
+ * 
+ * Color scheme:
+ *
+ * - See <http://colorschemedesigner.com/#3y21T--rOw0w0>.
+ * - Additionally, we use the CSS color "dimgray" (#696969) for stuff like the
+ *   breadcrumb navigation and the footer.
+ */
+
+@import url("https://fonts.googleapis.com/css?family=Bitter");
+@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro");
+@import url("https://fonts.googleapis.com/css?family=Source+Code+Pro");
+
+body {
+    max-width: 45em;
+    margin: 1em auto;
+    font-family: "Source Sans Pro", sans-serif;
+    color: #000;
+    text-rendering: optimizeLegibility;
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    -ms-hyphens: auto;
+    -o-hyphens: auto;
+    hyphens: auto;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: "Bitter", serif;
+    color: #004e8f;
+}
+
+code, kbd {
+    font-family: "Source Code Pro", monospace;
+}
+
+pre {
+    font-family: "Source Code Pro", monospace;
+    font-size: small;
+}
+
+div#breadcrumb {
+    padding: 1em 1em 0.2em;
+}
+
+div#content {
+    padding: 0.2em 1em 1em;
+}
+
+div#footer {
+    padding: 1em;
+}
+
+div#menu {
+    padding: 0.6em 0 0.6em 0;
+    background-color: #1b476b;
+    font-weight: bold;
+}
+
+div#menu span {
+    padding: 0.6em;
+}
+
+div#menu span.current {
+    color: #fff;
+    background-color: #5a95c7;
+}
+
+div#menu a {
+    color: #fff;
+    text-decoration: none;
+    -webkit-transition-property: color;
+    -moz-transition-property: color;
+    -ms-transition-property: color;
+    -o-transition-property: color;
+    transition-property: color;
+    -webkit-transition-duration: 0.3s;
+    -moz-transition-duration: 0.3s;
+    -ms-transition-duration: 0.3s;
+    -o-transition-duration: 0.3s;
+    transition-duration: 0.3s;
+}
+
+div#menu a:hover {
+    color: #eeb76b;
+}
+
+table /* Nginx Fancy Index. */ {
+    font-family: "Source Code Pro", monospace;
+    font-size: small;
+}
+
+div#content a,
+table a {
+    color: #3283c7;
+    text-decoration: none;
+    border-bottom: 1px dotted #3283c7;
+}
+
+div#content a:hover,
+table a:hover {
+    color: #3283c7; /* Overwrite Fancy Index CSS. */
+    border-bottom: 1px solid #3283c7;
+}
+
+div#breadcrumb {
+    color: #696969;
+    font-size: small;
+}
+
+div#footer {
+    color: #696969;
+    text-align: center;
+    font-size: small;
+    line-height: 150%;
+}
+
+div#breadcrumb a,
+div#footer a {
+    color: #696969;
+    text-decoration: none;
+    border-bottom: 1px dotted #696969;
+}
+
+div#breadcrumb a:hover,
+div#footer a:hover {
+    border-bottom: 1px solid #696969;
+}
diff --git a/web/content/support.md b/web/content/support.md
new file mode 100644
index 0000000..0859f28
--- /dev/null
+++ b/web/content/support.md
@@ -0,0 +1,79 @@
+title: Support
+parent: Home
+menu-position: 4
+---
+
+# Support
+
+## Bug Tracker
+
+If you believe you found a bug, you might want to [check][search] whether it
+has been reported to our [issue tracker][tracker] already.  Please also try
+the [current snapshot][snapshot], as the bug may be fixed in the latest code.
+Otherwise, please submit a [new issue][new] and include all information that
+might be relevant!
+
+## Mailing Lists
+
+<!--%
+# There are four mailing lists for the Nagios Plugins:
+# 
+# * General discussion and support: **<help@nagios-plugins.org>**  
+#   [Subscribe][help-sub] | [Archive][help-arch] | [Gmane][help-gmane]
+# 
+# * Development-related issues: **<devel@nagios-plugins.org>**  
+#   [Subscribe][devel-sub] | [Archive][devel-arch] | [Gmane][devel-gmane]
+# 
+# * Git commits (read-only): **<commits@nagios-plugins.org>**  
+#   [Subscribe][commits-sub] | [Archive][commits-arch] | [Gmane][commits-gmane]
+# 
+# * Announcements (read-only): **<announce@nagios-plugins.org>**  
+#   [Subscribe][announce-sub] | [Archive][announce-arch] | [Gmane][announce-gmane]
+# 
+# Announcements are also sent to the [help][help-sub] and [devel][devel-sub]
+# mailing lists, so the [announce][announce-sub] list is generally only useful
+# if you'd like to be notified of new releases without following any
+# discussions.
+%-->
+
+<!--% # OLD LISTS # %-->
+There are three mailing lists for the Nagios Plugins:
+
+* General discussion and support: **<nagiosplug-help@lists.sourceforge.net>**  
+  [Subscribe][help-sub] | [Archive][help-arch] | [Gmane][help-gmane]
+
+* Development-related issues: **<nagiosplug-devel@lists.sourceforge.net>**  
+  [Subscribe][devel-sub] | [Archive][devel-arch] | [Gmane][devel-gmane]
+
+* Git commits (read-only): **<nagiosplug-checkins@lists.sourceforge.net>**  
+  [Subscribe][commits-sub] | [Archive][commits-arch] | [Gmane][commits-gmane]
+<!--% # OLD LISTS # %-->
+
+Be aware that these mailing lists are read by volunteers, so responses may
+take time, if at all.
+
+## IRC
+
+Plugin issues are usually discussed in the `#Nagios` or `#Icinga` channels on
+[freenode][freenode].  Some of the developers also hang around in
+`#Nagios-Devel`.
+
+[snapshot]: download/snapshot/nagios-plugins-master.tar.gz "Current Snapshot Tarball"
+[search]: https://github.com/nagios-plugins/nagios-plugins/search?type=Issues "Issue Tracker Search"
+[tracker]: https://github.com/nagios-plugins/nagios-plugins/issues "Issue Tracker"
+[new]: https://github.com/nagios-plugins/nagios-plugins/issues/new "New Issue"
+[freenode]: http://freenode.net/ "Freenode Network"
+[help-sub]: https://lists.sourceforge.net/lists/listinfo/nagiosplug-help
+[help-arch]: https://sourceforge.net/p/nagiosplug/mailman/nagiosplug-help
+[help-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins
+[devel-sub]: https://lists.sourceforge.net/lists/listinfo/nagiosplug-devel
+[devel-arch]: https://sourceforge.net/p/nagiosplug/mailman/nagiosplug-devel
+[devel-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.devel
+[commits-sub]: https://lists.sourceforge.net/lists/listinfo/nagiosplug-checkins
+[commits-arch]: https://sourceforge.net/p/nagiosplug/mailman/nagiosplug-checkins
+[commits-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.cvs
+[announce-sub]: /fixme
+[announce-arch]: /fixme
+[announce-gmane]: /fixme
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/content/team.md b/web/content/team.md
new file mode 100644
index 0000000..bf70bb2
--- /dev/null
+++ b/web/content/team.md
@@ -0,0 +1,31 @@
+title: Team
+parent: Home
+---
+
+# Nagios Plugins Development Team
+
+The Nagios Plugins are maintained by the following group of developers:
+
+* Holger Weiß *(Patch Review, Development, Team Lead)*
+* Matthias Eble *(Patch Review, Development)*
+* Sven Nierlein *(Patch Review, Development)*
+* Thomas Guyot-Sionnest *(Patch Review, Development)*
+* Ton Voon *(Patch Review, Development)*
+
+Previous team members:
+
+* Benoit Mortier
+* Ethan Galstad
+* Gavin Carr
+* Harper Mann
+* Jeremy Bouse
+* Karl DeBisschop
+* Matthew Kent
+* Michael Wirtgen
+* Nathan Vonnahme
+* Peter Bray
+* Sean Finney
+* Stanley Hopcroft
+* Subhendu Ghosh
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/macros.py b/web/macros.py
new file mode 100644
index 0000000..a4566fe
--- /dev/null
+++ b/web/macros.py
@@ -0,0 +1,43 @@
+import time
+
+plugins_release = '1.4.16'
+mib_release = '1.0.1'
+page = {
+    "description": "Standard plugins for Nagios and compatible monitoring solutions.",
+    "keywords": "Nagios, Icinga, Shinken, Monitoring, Official, Plugins, Open, Source, Free, Software"
+}
+
+def menu():
+    menu_pages = [p for p in pages if 'menu-position' in p]
+    menu_pages.sort(key=lambda p: int(p['menu-position']))
+    for p in menu_pages:
+        if p.title == page.title:
+            print('<span class="current">%s</span>' % hx(p.title))
+        else:
+            print('<span><a href="%s">%s</a></span>' % (p.url, hx(p.title)))
+
+def breadcrumb():
+    parents = {p.title: (p.url, p.get('parent')) for p in pages}
+    title = page.title
+    output = hx(title)
+    while parents[title][1] is not None:
+        title = parents[title][1]
+        url = parents[title][0]
+        output = '<a href="%s">%s</a> &gt; %s' % (url, hx(title), output)
+    if output == hx(page.title): # Hide breadcrumb if the page has no parent.
+        output = '&nbsp;'
+    return output
+
+def list_kids():
+    kids = [(p.url, p.title) for p in pages if p.get('parent') == page.title]
+    for kid in sorted(kids):
+        print('* [%s](%s)' % (kid[1], kid[0]))
+
+def copyright_years(since=None):
+    this_year = time.gmtime().tm_year
+    if since is not None and int(since) != this_year:
+        return str(since) + '&ndash;' + str(this_year)
+    else:
+        return str(this_year)
+
+# vim:set expandtab softtabstop=4 shiftwidth=4 textwidth=80:
diff --git a/web/page.html b/web/page.html
new file mode 100644
index 0000000..c0de871
--- /dev/null
+++ b/web/page.html
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="{{ __encoding__ }}"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+                      "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+  <head>
+    <title>Nagios Plugins - {{ hx(page.title) }}</title>
+    <meta http-equiv="Content-Type" content="text/html; charset={{ __encoding__ }}" />
+    <meta name="description" content="{{ hx(page.description) }}" />
+    <meta name="keywords" content="{{ hx(page.keywords) }}" />
+    <link href="media/plugins.css" rel="stylesheet" type="text/css" />
+    <link href="media/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+  </head>
+
+  <body>
+    <div>
+      <a href="https://github.com/nagios-plugins"><img
+       style="position: absolute; top: 0; right: 0; border: 0;"
+       src="media/github.png" alt="Fork me on GitHub"/></a>
+    </div>
+    <div id="menu">{% menu() %}</div>
+    <div id="breadcrumb">{{ breadcrumb() }}</div>
+    <div id="content">{{ __content__ }}</div>
+    <div id="footer">
+      Copyright &copy; {{ copyright_years(since=2013) }}
+      <a href="team.html">Nagios Plugins Development Team</a> |
+      <a href="impressum.html">Impressum</a><br />
+      Nagios is a registered trademark of
+      <a href="http://www.nagios.com/about/company">Nagios Enterprises, LLC</a>.
+    </div>
+  </body>
+
+</html>