more brainfarts

This commit is contained in:
sturm 2006-07-19 06:24:00 +00:00
parent a07b9040ab
commit 791389c7c9
2 changed files with 58 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2006/07/18 20:45:46 sturm Exp $
# $OpenBSD: Makefile,v 1.11 2006/07/19 06:24:00 sturm Exp $
COMMENT= "nagios base plugins"
COMMENT-fping= "fping plugin"
@ -12,7 +12,7 @@ COMMENT-snmp= "plugins using snmp"
V= 1.4.3
DISTNAME= nagios-plugins-${V}
PKGNAME= nagios-plugins-${V}p1
PKGNAME= nagios-plugins-${V}p2
PKGNAME-fping= nagios-plugins-fping-${V}
PKGNAME-game= nagios-plugins-game-${V}
PKGNAME-ldap= nagios-plugins-ldap-${V}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-plugins_check_disk_c,v 1.1 2006/07/18 20:45:46 sturm Exp $
--- plugins/check_disk.c.orig Tue Jul 18 22:31:31 2006
+++ plugins/check_disk.c Tue Jul 18 22:31:58 2006
$OpenBSD: patch-plugins_check_disk_c,v 1.2 2006/07/19 06:24:00 sturm Exp $
--- plugins/check_disk.c.orig Mon Mar 27 10:19:01 2006
+++ plugins/check_disk.c Wed Jul 19 08:09:39 2006
@@ -230,7 +230,7 @@ main (int argc, char **argv)
if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
@ -10,3 +10,56 @@ $OpenBSD: patch-plugins_check_disk_c,v 1.1 2006/07/18 20:45:46 sturm Exp $
result = max_state (disk_result, result);
@@ -462,6 +462,8 @@ process_arguments (int argc, char **argv
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->found_len = 0;
*pathtail = se;
@@ -478,8 +480,10 @@ process_arguments (int argc, char **argv
*/
se->w_df = 0;
se->c_df = 0;
- se->w_dfp = 0;
- se->c_dfp = 0;
+ se->w_dfp = -1.0;
+ se->c_dfp = -1.0;
+ se->w_idfp = -1.0;
+ se->c_idfp = -1.0;
se->found = 0;
se->found_len = 0;
*dptail = se;
@@ -495,8 +499,10 @@ process_arguments (int argc, char **argv
*/
se->w_df = 0;
se->c_df = 0;
- se->w_dfp = 0;
- se->c_dfp = 0;
+ se->w_dfp = -1.0;
+ se->c_dfp = -1.0;
+ se->w_idfp = -1.0;
+ se->c_idfp = -1.0;
se->found = 0;
se->found_len = 0;
*fstail = se;
@@ -519,6 +525,8 @@ process_arguments (int argc, char **argv
c_df = 0;
w_dfp = -1.0;
c_dfp = -1.0;
+ w_idfp = -1.0;
+ c_idfp = -1.0;
break;
case 'V': /* version */
print_revision (progname, revision);
@@ -547,6 +555,8 @@ process_arguments (int argc, char **argv
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->found_len = 0;
*pathtail = se;