import nagios-plugin-radius, a package for the nagios radius plugin from

nagios-plugins-1.4.3.

5 files changed, 364 insertions, 0 deletions

diff --git a/net/nagios-plugin-radius/patches/patch-aa b/net/nagios-plugin-radius/patches/patch-aa
new file mode 100644
index 00000000000..670ce407b00
--- /dev/null
+++ b/net/nagios-plugin-radius/patches/patch-aa
@@ -0,0 +1,74 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+
+--- plugins/check_radius.c.orig	2004-12-26 00:17:44.000000000 +0100
++++ plugins/check_radius.c	2007-04-13 15:03:20.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include "utils.h"
+ #include "netutils.h"
+ 
+-#include <radiusclient.h>
++#include <radiusclient-ng.h>
+ 
+ int process_arguments (int, char **);
+ void print_help (void);
+@@ -38,7 +38,7 @@
+ char *password = NULL;
+ char *nasid = NULL;
+ char *expect = NULL;
+-char *config_file = NULL;
++char *config_file = "@SYSCONFDIR@/radiusclient-ng/radiusclient.conf";
+ unsigned short port = PW_AUTH_UDP_PORT;
+ int retries = 1;
+ int verbose = FALSE;
+@@ -108,6 +108,7 @@
+ 	int result = STATE_UNKNOWN;
+ 	UINT4 client_id;
+ 	char *str;
++	rc_handle *handle;
+ 
+ 	setlocale (LC_ALL, "");
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -117,32 +118,33 @@
+ 		usage4 (_("Could not parse arguments"));
+ 
+ 	str = strdup ("dictionary");
+-	if ((config_file && rc_read_config (config_file)) ||
+-			rc_read_dictionary (rc_conf_str (str)))
++	handle = rc_read_config (config_file);
++	if (handle == NULL  ||
++	    rc_read_dictionary (handle, rc_conf_str (handle, str)))
+ 		die (STATE_UNKNOWN, _("Config file error"));
+ 
+ 	service = PW_AUTHENTICATE_ONLY;
+ 
+-	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 (!(rc_avpair_add (handle, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) &&
++				rc_avpair_add (handle, &data.send_pairs, PW_USER_NAME, username, -1, 0) &&
++				rc_avpair_add (handle, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0) &&
++				(nasid==NULL || rc_avpair_add (handle, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -1, 0))))
+ 		die (STATE_UNKNOWN, _("Out of Memory?"));
+ 
+ 	/* 
+ 	 * Fill in NAS-IP-Address 
+ 	 */
+ 
+-	if ((client_id = rc_own_ipaddress ()) == 0)
++	if ((client_id = rc_own_ipaddress (handle)) == 0)
+ 		return (ERROR_RC);
+ 
+-	if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
++	if (rc_avpair_add (handle, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, -1, 0) ==
+ 			NULL) return (ERROR_RC);
+ 
+-	rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
++	rc_buildreq (handle, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+ 	             retries);
+ 
+-	result = rc_send_server (&data, msg);
++	result = rc_send_server (handle, &data, msg);
+ 	rc_avpair_free (data.send_pairs);
+ 	if (data.receive_pairs)
+ 		rc_avpair_free (data.receive_pairs);
diff --git a/net/nagios-plugin-radius/patches/patch-ab b/net/nagios-plugin-radius/patches/patch-ab
new file mode 100644
index 00000000000..682aa6ad901
--- /dev/null
+++ b/net/nagios-plugin-radius/patches/patch-ab
@@ -0,0 +1,37 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+
+--- configure.orig	2007-04-13 15:02:05.000000000 +0200
++++ configure	2007-04-13 15:02:49.000000000 +0200
+@@ -24967,13 +24967,13 @@
+ 
+ _SAVEDLIBS="$LIBS"
+ 
+-echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient" >&5
+-echo $ECHO_N "checking for rc_read_config in -lradiusclient... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5
++echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6
+ if test "${ac_cv_lib_radiusclient_rc_read_config+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lradiusclient  $LIBS"
++LIBS="-lradiusclient-ng  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25036,13 +25036,13 @@
+ #define HAVE_LIBRADIUSCLIENT 1
+ _ACEOF
+ 
+-  LIBS="-lradiusclient $LIBS"
++  LIBS="-lradiusclient-ng $LIBS"
+ 
+ fi
+ 
+ if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+   EXTRAS="$EXTRAS check_radius"
+-	RADIUSLIBS="-lradiusclient"
++	RADIUSLIBS="-lradiusclient-ng"
+ 
+ else
+   { echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5
diff --git a/net/nagios-plugin-radius/patches/patch-ak b/net/nagios-plugin-radius/patches/patch-ak
new file mode 100644
index 00000000000..1a01470639c
--- /dev/null
+++ b/net/nagios-plugin-radius/patches/patch-ak
@@ -0,0 +1,105 @@
+$NetBSD: patch-ak,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+
+--- lib/mountlist.c.orig	2005-10-14 22:09:29.000000000 +0200
++++ lib/mountlist.c	2005-10-14 22:23:14.000000000 +0200
+@@ -66,7 +66,11 @@
+ # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
+ #  define FS_TYPE(Ent) ((Ent).f_fstypename)
+ # else
+-#  define FS_TYPE(Ent) mnt_names[(Ent).f_type]
++#  ifdef STAT_STATVFS
++#   define FS_TYPE(Ent) mnt_names[(Ent).f_fsid]
++#  else
++#   define FS_TYPE(Ent) mnt_names[(Ent).f_type]
++#  endif
+ # endif
+ #endif /* MOUNTED_GETFSSTAT */
+ 
+@@ -109,6 +113,10 @@
+ # include <sys/statfs.h>
+ #endif
+ 
++#ifdef HAVE_SYS_STATVFS_H
++#include <sys/statvfs.h>
++#endif
++
+ #ifdef MOUNTED_LISTMNTENT
+ # include <mntent.h>
+ #endif
+@@ -173,7 +181,7 @@
+ 
+ #if MOUNTED_GETMNTINFO
+ 
+-# if ! HAVE_F_FSTYPENAME_IN_STATFS
++# if ! HAVE_F_FSTYPENAME_IN_STATFS && ! STAT_STATVFS
+ static char *
+ fstype_to_string (short t)
+ {
+@@ -271,12 +279,16 @@
+ 
+ /* __NetBSD__ || BSD_NET2 || __OpenBSD__ */
+ static char *
++#ifdef STAT_STATVFS
++fsp_to_string (const struct statvfs *fsp)
++#else
+ fsp_to_string (const struct statfs *fsp)
++#endif
+ {
+-# if defined HAVE_F_FSTYPENAME_IN_STATFS
++# if defined HAVE_F_FSTYPENAME_IN_STATFS || defined STAT_STATVFS
+   return (char *) (fsp->f_fstypename);
+ # else
+-  return fstype_to_string (fsp->f_type);
++   return fstype_to_string (fsp->f_type);
+ # endif
+ }
+ 
+@@ -381,7 +393,11 @@
+ 
+ #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
+   {
++#ifdef STAT_STATVFS
++    struct statvfs *fsp;
++#else
+     struct statfs *fsp;
++#endif
+     int entries;
+ 
+     entries = getmntinfo (&fsp, MNT_NOWAIT);
+@@ -543,9 +559,17 @@
+   {
+     int numsys, counter;
+     size_t bufsize;
++#ifdef STAT_STATVFS
++    struct statvfs *stats;
++#else
+     struct statfs *stats;
++#endif
+ 
++#ifdef STAT_STATVFS
++    numsys = getfsstat ((struct statvfs *)0, 0L, MNT_NOWAIT);
++#else
+     numsys = getfsstat ((struct statfs *)0, 0L, MNT_NOWAIT);
++#endif
+     if (numsys < 0)
+       return (NULL);
+     if (SIZE_MAX / sizeof *stats <= numsys)
+@@ -608,10 +632,18 @@
+ # ifdef GETFSTYP			/* SVR3.  */
+ 	if (need_fs_type)
+ 	  {
++#ifdef STAT_STATVFS
++	    struct statvfs fsd;
++#else
+ 	    struct statfs fsd;
++#endif
+ 	    char typebuf[FSTYPSZ];
+ 
++#ifdef STAT_STATVFS
++	    if (statvfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
++#else
+ 	    if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
++#endif
+ 		&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
+ 	      {
+ 		me->me_type = xstrdup (typebuf);
diff --git a/net/nagios-plugin-radius/patches/patch-al b/net/nagios-plugin-radius/patches/patch-al
new file mode 100644
index 00000000000..892078c1d3c
--- /dev/null
+++ b/net/nagios-plugin-radius/patches/patch-al
@@ -0,0 +1,92 @@
+$NetBSD: patch-al,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+
+--- contrib/check_axis.sh.orig	2003-05-26 10:09:23.000000000 +0000
++++ contrib/check_axis.sh
+@@ -5,7 +5,7 @@ port=$2
+ usr=$3
+ pass=$4
+ 
+-if [ ! "$#" == "4" ]; then
++if [ ! "$#" = "4" ]; then
+ 	echo -e "\nYou did not supply enough command line arguments. \nUsage: ./check_axis.sh <host> <port> <username> <password> \n \nCheck_axis.sh checks the status of LPT ports on Axis print servers. \nIt was written by Tom De Blende (tom.deblende@village.uunet.be) in 2002. \n" && exit "3"
+ fi
+ 
+@@ -27,7 +27,7 @@ fi
+ 
+ lines=`cat $tempfile | grep -i $port`
+ status=`echo $lines | awk '{ print $3 }'`
+-if [ "$status" == "Printing" ]; then
++if [ "$status" = "Printing" ]; then
+ 	bytes=`echo $lines | awk '{ print $4 }'`;
+ 	comments=`echo $lines | tr -d "
" | awk '{ print $5 " " $6 }'`;
+ else
+@@ -40,48 +40,48 @@ if [ "$comma" -eq "1" ]; then
+ fi
+ 	
+ 
+-if [ "$status" == "Available" ]; then
+-	if [ "$comments" == "Paper out" ]; then
++if [ "$status" = "Available" ]; then
++	if [ "$comments" = "Paper out" ]; then
+ 		exit="1" && stdio="WARNING - Out of paper.";
+-        elif [ "$comments" == " " ]; then
++        elif [ "$comments" = " " ]; then
+                 exit="0" && stdio="OK - Printer is available but returns no comments.";
+-	elif [ "$comments" == "No error" ]; then
++	elif [ "$comments" = "No error" ]; then
+ 		exit="0" && stdio="OK - No error.";
+-        elif [ "$comments" == "Ready " ]; then
++        elif [ "$comments" = "Ready " ]; then
+                 exit="0" && stdio="OK - Ready.";
+-        elif [ "$comments" == "Off line" ]; then
++        elif [ "$comments" = "Off line" ]; then
+                 exit="1" && stdio="WARNING - Printer is off line.";        
+-        elif [ "$comments" == "Out of" ]; then
++        elif [ "$comments" = "Out of" ]; then
+                 exit="1" && stdio="WARNING - Out of paper.";	
+-	elif [ "$comments" == "Busy Out" ]; then
++	elif [ "$comments" = "Busy Out" ]; then
+                 exit="1" && stdio="WARNING - Busy, out of paper.";
+-        elif [ "$comments" == "Printer off-line" ]; then
++        elif [ "$comments" = "Printer off-line" ]; then
+                 exit="1" && stdio="WARNING - Printer is off line.";	
+-        elif [ "$comments" == "Printer fault" ]; then
++        elif [ "$comments" = "Printer fault" ]; then
+                 exit="2" && stdio="CRITICAL - Printer fault.";
+ 	else
+ 		exit="3" && stdio="Comments: $comments";
+ 	fi
+-elif [ "$status" == "Printing" ]; then
+-	if [ "$comments" == "Printer busy" ]; then
++elif [ "$status" = "Printing" ]; then
++	if [ "$comments" = "Printer busy" ]; then
+ 		exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";
+-        elif [ "$comments" == "No error" ]; then
++        elif [ "$comments" = "No error" ]; then
+                 exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";        
+-	elif [ "$comments" == "Paper out" ]; then
++	elif [ "$comments" = "Paper out" ]; then
+                 exit="1" && stdio="WARNING - PRINTING. Out of paper.";
+-        elif [ "$comments" == "Out of" ]; then
++        elif [ "$comments" = "Out of" ]; then
+                 exit="1" && stdio="WARNING - PRINTING. Out of paper. Bytes printed: $bytes.";        
+-        elif [ "$comments" == "Busy Out" ]; then
++        elif [ "$comments" = "Busy Out" ]; then
+                 exit="1" && stdio="WARNING - Busy, out of paper.";
+-	elif [ "$comments" == "Ready " ]; then
++	elif [ "$comments" = "Ready " ]; then
+                 exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";        
+-        elif [ "$comments" == "Printer off-line" ]; then
++        elif [ "$comments" = "Printer off-line" ]; then
+                 exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
+-        elif [ "$comments" == "Busy " ]; then
++        elif [ "$comments" = "Busy " ]; then
+                 exit="0" && stdio="OK - PRINTING. Busy. Bytes printed: $bytes.";	
+-	elif [ "$comments" == "Off line" ]; then
++	elif [ "$comments" = "Off line" ]; then
+                 exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
+-        elif [ "$comments" == "Printer fault" ]; then
++        elif [ "$comments" = "Printer fault" ]; then
+                 exit="2" && stdio="CRITICAL - PRINTING. Printer fault. Bytes printed: $bytes.";        
+ 	else
+                 exit="3" && stdio="Comments: $comments.";
diff --git a/net/nagios-plugin-radius/patches/patch-am b/net/nagios-plugin-radius/patches/patch-am
new file mode 100644
index 00000000000..c6eb6ca49c9
--- /dev/null
+++ b/net/nagios-plugin-radius/patches/patch-am
@@ -0,0 +1,56 @@
+$NetBSD: patch-am,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+
+--- contrib/check_mssql.sh.orig	2003-08-05 09:56:13.000000000 +0000
++++ contrib/check_mssql.sh
+@@ -35,10 +35,10 @@ pswd=$3
+ srv=$4
+ 
+ 
+-if [ ! "$#" == "4" ]; then
++if [ ! "$#" = "4" ]; then
+         echo -e "\nYou did not supply enough arguments. \nUsage: $0 <host> <username> <password> <version> \n \n$0 checks Microsoft SQL Server connectivity. It works with versions 7 and 2000.\n\nYou need a working version of FreeTDS (http://www.freetds.org/) and tsql (included in FreeTDS 6.0+) to connect to the SQL server. \nIt was written by Tom De Blende (tom.deblende@village.uunet.be) in 2003. \n\nExample:\n $0 dbserver sa f00bar 2000\n" && exit "3"
+ 
+-elif [ $tsqlcmd == "" ]; then
++elif [ $tsqlcmd = "" ]; then
+ 	echo -e "tsql not found! Please verify you have a working version of tsql (included in the FreeTDS version 6.0+) and enter the full path in the script." && exit "3"
+ 
+ fi
+@@ -50,9 +50,9 @@ exit="3"
+ 
+ tmpfile=`$mktempcmd /tmp/$hostname.XXXXXX`
+ 
+-if [ $srv == "7" ]; then
++if [ $srv = "7" ]; then
+         spid=7
+-elif [ $srv == "2000" ]; then
++elif [ $srv = "2000" ]; then
+         spid=50
+ else
+ 	echo -e "$srv is not a supported MS SQL Server version!" && exit "3"
+@@ -69,7 +69,7 @@ $tsqlcmd -S $hostname -U $usr -P $pswd <
+ 
+ $grepcmd -q "Login failed for user" $errorfile
+ 
+-if [ "$?" == "0" ]; then
++if [ "$?" = "0" ]; then
+ 	$rmcmd -f $tmpfile $resultfile $errorfile;
+         echo CRITICAL - Could not make connection to SQL server. Login failed.;
+         exit 2;
+@@ -77,7 +77,7 @@ fi
+ 
+ $grepcmd -q "There was a problem connecting to the server" $errorfile
+ 
+-if [ "$?" == "0" ]; then
++if [ "$?" = "0" ]; then
+         $rmcmd -f $tmpfile $resultfile $errorfile;
+         echo CRITICAL - Could not make connection to SQL server. Incorrect server name or SQL service not running.;
+         exit 2;
+@@ -85,7 +85,7 @@ fi
+ 
+ resultfileln=`$catcmd $resultfile | $wccmd -l | $sedcmd 's/  //g'`
+ 
+-if [ "$resultfileln" == "2" ]; then
++if [ "$resultfileln" = "2" ]; then
+ 	$rmcmd -f $tmpfile $resultfile $errorfile;
+         echo CRITICAL - Could not make connection to SQL server. No data received from host.;
+         exit 2;