[Pkg-nagios-devel] Bug#478942: nagios-plugins: check_disk_smb and no-user or no-passwd or share with spaces...
Stephane Chazelas
Stephane_Chazelas at yahoo.fr
Thu May 1 20:34:02 UTC 2008
Package: nagios-plugins
Version: 1.4.11-2
Severity: normal
Hiya,
this could be considered as a follow-up to #478906
Basically, there is something a bit fundamentaly wrong in how
arguments of commands are being passed around in nagios.
For example, if we've got a command definition such as:
define command{
command_name check_disk_smb_user
command_line /usr/lib/nagios/plugins/check_disk_smb -H $ARG1$ -s $ARG2$ -u $ARG3$ -p $ARG4$
}
The command_line is expanded with the $ARG?$ replaced with their
value and that becomes a shell command line.
What that means is that if any of the ARGS contain any character
special to the shell (space, tab, nl, "$^&*()[;'#~<>?...) or if
they are empty, that will break.
A better solution would be to write that as:
command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$'
This way, that reduces the list of problematic characters to the
' character only.
That was one thing.
Next, the check_disk_smb perl script itself has a similar
problem when running the smbclient command.
It runs:
$res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls/;
qx/.../ (same as `...`) runs a shell in a same way.
The documentation says that if the password is not passed, it
defaults to "". That is not true above, as $pass expands to
nothing which leaves no argument at all (instead of an empty
argument) so is different from providing with an empty password
or with the -N option.
Also, if the password starts with "-", you're in trouble, that's
why -U $user%$pass may be prefered.
Also, the doc says that if $user is not provided, then it
defaults to "guest" but the problem is that if it is provided
but empty, it is changed to "guest" as well, which prevents us
from querying hosts that don't do user authentication.
Here is a patch that attempts to solve those issues (it also
includes the fix for #425129 for the check_disk_smb only).
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/breeze.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/breeze.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/breeze.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/breeze.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,5 +1,5 @@
# 'check_breeze' command definition
define command {
command_name check_breeze
- command_line /usr/lib/nagios/plugins/check_breeze -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_breeze -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/dhcp.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/dhcp.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/dhcp.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/dhcp.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -4,12 +4,12 @@
# 'check_dhcp' command definition
define command{
command_name check_dhcp
- command_line /usr/lib/nagios/plugins/check_dhcp -s $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$'
}
# 'check_dhcp_interface' command definition
define command{
command_name check_dhcp_interface
- command_line /usr/lib/nagios/plugins/check_dhcp -s $HOSTADDRESS$ -i $ARG1$
+ command_line /usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$' -i '$ARG1$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/disk.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/disk.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/disk.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/disk.cfg 2008-05-01 14:57:28.000000000 +0100
@@ -1,19 +1,19 @@
# 'check_disk' command definition
define command{
command_name check_disk
- command_line /usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+ command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -p '$ARG3$'
}
# 'check_all_disks' command definition
define command{
command_name check_all_disks
- command_line /usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$'
}
# 'ssh_disk' command definition
define command{
command_name ssh_disk
- command_line /usr/lib/nagios/plugins/check_by_ssh -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$'
+ command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -p '\''$ARG3$'\'
}
####
@@ -23,5 +23,5 @@
# 'ssh_disk_4' command definition
define command{
command_name ssh_disk_4
- command_line /usr/lib/nagios/plugins/check_by_ssh -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$' -4
+ command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/disk-smb.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/disk-smb.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/disk-smb.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/disk-smb.cfg 2008-05-01 14:58:26.000000000 +0100
@@ -1,54 +1,54 @@
# 'check_disk_smb' command definition
define command{
command_name check_disk_smb
- command_line /usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$'
}
# 'check_disk_smb_workgroup' command definition
define command{
command_name check_disk_smb_workgroup
- command_line /usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$ -W $ARG3$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$'
}
# 'check_disk_smb_host' command definition
define command{
command_name check_disk_smb_host
- command_line /usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$'
}
# 'check_disk_smb_workgroup_host' command definition
define command{
command_name check_disk_smb_workgroup_host
- command_line /usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$ -W $ARG3$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$'
}
# 'check_disk_smb_user' command definition
define command{
command_name check_disk_smb_user
- command_line /usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$ -u $ARG3$ -p $ARG4$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$'
}
# 'check_disk_smb_workgroup_user' command definition
define command{
command_name check_disk_smb_workgroup_user
- command_line /usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$ -W $ARG3$ -u $ARG4$ -p $ARG5$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$'
}
# 'check_disk_smb_host_user' command definition
define command{
command_name check_disk_smb_host_user
- command_line /usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$ -u $ARG3$ -p $ARG4$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$'
}
# 'check_disk_smb_workgroup_host_user' command definition
define command{
command_name check_disk_smb_workgroup_host_user
- command_line /usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$ -W $ARG3$ -u $ARG4$ -p $ARG5$
+ command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/dns.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/dns.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/dns.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/dns.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,11 +1,11 @@
# 'check_dns' command definition
define command{
command_name check_dns
- command_line /usr/lib/nagios/plugins/check_dns -H www.google.com -s $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_dns -H www.google.com -s '$HOSTADDRESS$'
}
# 'check_dig' command definition
define command{
command_name check_dig
- command_line /usr/lib/nagios/plugins/check_dig -H $HOSTADDRESS$ -l $ARG1$
+ command_line /usr/lib/nagios/plugins/check_dig -H '$HOSTADDRESS$' -l '$ARG1$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/dummy.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/dummy.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/dummy.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/dummy.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -25,5 +25,5 @@
# return-numeric definition
define command {
command_name return-numeric
- command_line /usr/lib/nagios/plugins/check_dummy $ARG1$
+ command_line /usr/lib/nagios/plugins/check_dummy '$ARG1$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/flexlm.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/flexlm.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/flexlm.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/flexlm.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,6 +1,6 @@
# 'check_flexlm' command definition
define command{
command_name check_flexlm
- command_line /usr/lib/nagios/plugins/check_flexlm -F $ARG1$
+ command_line /usr/lib/nagios/plugins/check_flexlm -F '$ARG1$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/fping.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/fping.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/fping.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/fping.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,5 +1,5 @@
# 'check-fast-alive' command definition
define command{
command_name check-fast-alive
- command_line /usr/lib/nagios/plugins/check_fping -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_fping -H '$HOSTADDRESS$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/ftp.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/ftp.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/ftp.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/ftp.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,7 +1,7 @@
# 'check_ftp' command definition
define command{
command_name check_ftp
- command_line /usr/lib/nagios/plugins/check_ftp -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$'
}
####
@@ -11,5 +11,5 @@
# 'check_ftp_4' command definition
define command{
command_name check_ftp_4
- command_line /usr/lib/nagios/plugins/check_ftp -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$' -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/games.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/games.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/games.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/games.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,14 +1,14 @@
# 'check_quake' command definition
define command{
command_name check_quake
- command_line /usr/lib/nagios/plugins/check_game qs $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_game qs '$HOSTADDRESS$'
}
# 'check_unreal' command definition
define command{
command_name check_unreal
- command_line /usr/lib/nagios/plugins/check_game uns $HOSTADDRESS$ -P $ARG1$ -p 8
+ command_line /usr/lib/nagios/plugins/check_game uns '$HOSTADDRESS$' -P '$ARG1$' -p 8
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/hppjd.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/hppjd.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/hppjd.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/hppjd.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,6 +1,6 @@
# 'check_hpjd' command definition
define command{
command_name check_hpjd
- command_line /usr/lib/nagios/plugins/check_hpjd -H $HOSTADDRESS$ -C public
+ command_line /usr/lib/nagios/plugins/check_hpjd -H '$HOSTADDRESS$' -C public
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/http.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/http.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/http.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/http.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,38 +1,38 @@
# 'check_http' command definition
define command{
command_name check_http
- command_line /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$'
}
# 'check_http2' command definition
define command{
command_name check_http2
- command_line /usr/lib/nagios/plugins/check_http -H $ARG1$ -I $HOSTADDRESS$ -w $ARG2$ -c $ARG3$
+ command_line /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$'
}
# 'check_squid' command definition
define command{
command_name check_squid
- command_line /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$ -u $ARG2$ -e 'HTTP/1.0 200 OK'
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -e 'HTTP/1.0 200 OK'
}
# 'check_https' command definition
define command{
command_name check_https
- command_line /usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$'
}
# 'check_https_auth' command definition
define command{
command_name check_https_auth
- command_line /usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$ -a $ARG1$
+ command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$'
}
# 'check_cups' command definition
define command{
command_name check_cups
- command_line /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p 631
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631
}
####
@@ -42,36 +42,36 @@
# 'check_http_4' command definition
define command{
command_name check_http_4
- command_line /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4
}
# 'check_http2_4' command definition
define command{
command_name check_http2_4
- command_line /usr/lib/nagios/plugins/check_http -H $ARG1$ -I $HOSTADDRESS$ -w $ARG2$ -c $ARG3$ -4
+ command_line /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' -4
}
# 'check_squid_4' command definition
define command{
command_name check_squid_4
- command_line /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$ -u $ARG2$ -e 'HTTP/1.0 200 OK' -4
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -e 'HTTP/1.0 200 OK' -4
}
# 'check_https_4' command definition
define command{
command_name check_https_4
- command_line /usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4
}
# 'check_https_auth_4' command definition
define command{
command_name check_https_auth_4
- command_line /usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$ -a $ARG1$ -4
+ command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' -4
}
# 'check_cups_4' command definition
define command{
command_name check_cups_4
- command_line /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p 631 -4
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/ifstatus.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/ifstatus.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/ifstatus.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/ifstatus.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,23 +1,23 @@
# 'check_ifstatus' command definition
define command{
command_name check_ifstatus
- command_line /usr/lib/nagios/plugins/check_ifstatus -H $HOSTADDRESS$ -C $ARG1$
+ command_line /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$'
}
# 'check_ifstatus_exclude' command definition
define command{
command_name check_ifstatus_exclude
- command_line /usr/lib/nagios/plugins/check_ifstatus -H $HOSTADDRESS$ -C $ARG1$ -x $ARG2$
+ command_line /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$' -x '$ARG2$'
}
# 'check_ifoperstatus_ifindex' command definition
define command{
command_name check_ifoperstatus_ifindex
- command_line /usr/lib/nagios/plugins/check_ifoperstatus -H $HOSTADDRESS$ -C $ARG1$ -k $ARG2$
+ command_line /usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -k '$ARG2$'
}
# 'check_ifoperstatus_ifdescr' command definition
define command{
command_name check_ifoperstatus_ifdescr
- command_line /usr/lib/nagios/plugins/check_ifoperstatus -H $HOSTADDRESS$ -C $ARG1$ -d $ARG2$
+ command_line /usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -d '$ARG2$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/ldap.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/ldap.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/ldap.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/ldap.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,7 +1,7 @@
# 'check_ldap' command definition
define command{
command_name check_ldap
- command_line /usr/lib/nagios/plugins/check_ldap -H $HOSTADDRESS$ -b $ARG1$
+ command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$'
}
####
@@ -11,5 +11,5 @@
# 'check_ldap_4' command definition
define command{
command_name check_ldap_4
- command_line /usr/lib/nagios/plugins/check_ldap -H $HOSTADDRESS$ -b $ARG1$ -4
+ command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/load.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/load.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/load.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/load.cfg 2008-05-01 14:59:50.000000000 +0100
@@ -1,6 +1,6 @@
# 'check_load' command definition
define command{
command_name check_load
- command_line /usr/lib/nagios/plugins/check_load --warning=$ARG1$,$ARG2$,$ARG3$ --critical=$ARG4$,$ARG5$,$ARG6$
+ command_line /usr/lib/nagios/plugins/check_load --warning='$ARG1$,$ARG2$,$ARG3$' --critical='$ARG4$,$ARG5$,$ARG6$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/mail.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/mail.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/mail.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/mail.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,63 +1,63 @@
# 'check_pop' command definition
define command {
command_name check_pop
- command_line /usr/lib/nagios/plugins/check_pop -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$'
}
# 'check_smtp' command definition
define command {
command_name check_smtp
- command_line /usr/lib/nagios/plugins/check_smtp -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$'
}
# 'check_ssmtp' command definition
define command {
command_name check_ssmtp
- command_line /usr/lib/nagios/plugins/check_ssmtp -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$'
}
# 'check_imap' command definition
define command {
command_name check_imap
- command_line /usr/lib/nagios/plugins/check_imap -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$'
}
# 'check_spop' command definition
define command {
command_name check_spop
- command_line /usr/lib/nagios/plugins/check_pop -p 995 -H $HOSTADDRESS$ -S
+ command_line /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S
}
# 'check_simap' command definition
define command {
command_name check_simap
- command_line /usr/lib/nagios/plugins/check_imap -p 993 -H $HOSTADDRESS$ -S
+ command_line /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S
}
# 'check-mailq' for sendmail
define command {
command_name check_mailq_sendmail
- command_line /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M sendmail
+ command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M sendmail
}
# 'check-mailq' for postfix
define command {
command_name check_mailq_postfix
- command_line /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M postfix
+ command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M postfix
}
# 'check-mailq' for exim
define command {
command_name check_mailq_exim
- command_line /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M exim
+ command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M exim
}
# 'check-mailq' for qmail
define command {
command_name check_mailq_qmail
- command_line /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M qmail
+ command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M qmail
}
####
@@ -67,35 +67,35 @@
# 'check_pop_4' command definition
define command {
command_name check_pop_4
- command_line /usr/lib/nagios/plugins/check_pop -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$' -4
}
# 'check_smtp_4' command definition
define command {
command_name check_smtp_4
- command_line /usr/lib/nagios/plugins/check_smtp -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$' -4
}
# 'check_ssmtp_4' command definition
define command {
command_name check_ssmtp_4
- command_line /usr/lib/nagios/plugins/check_ssmtp -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$' -4
}
# 'check_imap_4' command definition
define command {
command_name check_imap_4
- command_line /usr/lib/nagios/plugins/check_imap -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$' -4
}
# 'check_spop_4' command definition
define command {
command_name check_spop_4
- command_line /usr/lib/nagios/plugins/check_pop -p 995 -H $HOSTADDRESS$ -S -4
+ command_line /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S -4
}
# 'check_simap_4' command definition
define command {
command_name check_simap_4
- command_line /usr/lib/nagios/plugins/check_imap -p 993 -H $HOSTADDRESS$ -S -4
+ command_line /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/mrtg.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/mrtg.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/mrtg.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/mrtg.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,14 +1,14 @@
# 'check_mrtg' command definition
define command{
command_name check_mrtg
- command_line /usr/lib/nagios/plugins/check_mrtg $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$
+ command_line /usr/lib/nagios/plugins/check_mrtg '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$' '$ARG6$'
}
# 'traffic_average' command definition
define command{
command_name traffic_average
- command_line /usr/lib/nagios/plugins/check_mrtgtraf $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$
+ command_line /usr/lib/nagios/plugins/check_mrtgtraf '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/mysql.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/mysql.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/mysql.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/mysql.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,17 +1,17 @@
# 'check_mysql' command definition
define command{
command_name check_mysql
- command_line /usr/lib/nagios/plugins/check_mysql -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$'
}
# 'check_mysql_cmdlinecred' command definition
define command{
command_name check_mysql_cmdlinecred
- command_line /usr/lib/nagios/plugins/check_mysql -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$
+ command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$'
}
# 'check_mysql_database' command definition
define command{
command_name check_mysql_database
- command_line /usr/lib/nagios/plugins/check_mysql -d $ARG3$ -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$
+ command_line /usr/lib/nagios/plugins/check_mysql -d '$ARG3$' -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/netware.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/netware.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/netware.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/netware.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,84 +1,84 @@
# 'check_netware_logins' command definition
define command{
command_name check_netware_logins
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOGINS" -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOGINS" -w '$ARG1$' -c '$ARG2$'
}
# 'check_nwstat_conns' command definition
define command{
command_name check_nwstat_conns
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v CONNS -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CONNS -w '$ARG1$' -c '$ARG2$'
}
# 'check_netware_1load' command definition
define command{
command_name check_netware_1load
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOAD1" -w 70 -c 90
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD1" -w 70 -c 90
}
# 'check_netware_5load' command definition
define command{
command_name check_netware_5load
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOAD5" -w 70 -c 90
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD5" -w 70 -c 90
}
# 'check_netware_15load' command definition
define command{
command_name check_netware_15load
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOAD15" -w 70 -c 90
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD15" -w 70 -c 90
}
# 'check_nwstat_vol_p' command definition
define command{
command_name check_nwstat_vol_p
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v VPF$ARG1$ -w $ARG2$ -c $ARG3$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VPF'$ARG1$' -w '$ARG2$' -c '$ARG3$'
}
# 'check_nwstat_vol_k' command definition
define command{
command_name check_nwstat_vol_k
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v VKF$ARG1$ -w $ARG2$ -c $ARG3$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VKF'$ARG1$' -w '$ARG2$' -c '$ARG3$'
}
# 'check_nwstat_ltch' command definition
define command{
command_name check_nwstat_ltch
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v LTCH -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v LTCH -w '$ARG1$' -c '$ARG2$'
}
# 'check_nwstat_puprb' command definition
define command{
command_name check_nwstat_puprb
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v PUPRB -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v PUPRB -w '$ARG1$' -c '$ARG2$'
}
# 'check_nwstat_dsdb' command definition
define command{
command_name check_nwstat_dsdb
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v DSDB
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v DSDB
}
# 'check_netware_abend' command definition
define command{
command_name check_netware_abend
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "ABENDS" -w 10 -c 30
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "ABENDS" -w 10 -c 30
}
# 'check_nwstat_csprocs' command definition
define command{
command_name check_nwstat_csprocs
- command_line /usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v CSPROCS -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CSPROCS -w '$ARG1$' -c '$ARG2$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/news.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/news.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/news.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/news.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,7 +1,7 @@
# 'check_nntp' command definition
define command{
command_name check_nntp
- command_line /usr/lib/nagios/plugins/check_nntp -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$'
}
####
@@ -11,5 +11,5 @@
# 'check_nntp_4' command definition
define command{
command_name check_nntp_4
- command_line /usr/lib/nagios/plugins/check_nntp -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$' -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/nt.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/nt.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/nt.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/nt.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,5 +1,5 @@
# 'check_nt' command definition
define command {
command_name check_nt
- command_line /usr/lib/nagios/plugins/check_nt -H $HOSTADDRESS$ -v $ARG1$
+ command_line /usr/lib/nagios/plugins/check_nt -H '$HOSTADDRESS$' -v '$ARG1$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/ntp.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/ntp.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/ntp.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/ntp.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,17 +1,17 @@
# 'check_ntp' command definition
define command{
command_name check_ntp
- command_line /usr/lib/nagios/plugins/check_ntp_peer -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$'
}
# 'check_ntp_ntpq' command definition
define command{
command_name check_ntp_ntpq
- command_line /usr/lib/nagios/plugins/check_ntp_peer -H $HOSTADDRESS$ -j 10 -k 15
+ command_line /usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$' -j 10 -k 15
}
# 'check_time' command definition
define command{
command_name check_time
- command_line /usr/lib/nagios/plugins/check_time -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_time -H '$HOSTADDRESS$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/pgsql.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/pgsql.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/pgsql.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/pgsql.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,7 +1,7 @@
# 'check_pgsql' command definition
define command{
command_name check_pgsql
- command_line /usr/lib/nagios/plugins/check_pgsql -H $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$'
}
####
@@ -11,5 +11,5 @@
# 'check_pgsql_4' command definition
define command{
command_name check_pgsql_4
- command_line /usr/lib/nagios/plugins/check_pgsql -H $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$' -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/ping.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/ping.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/ping.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/ping.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,35 +1,35 @@
# 'check_ping' command definition
define command{
command_name check_ping
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$'
}
# 'check-host-alive' command definition
define command{
command_name check-host-alive
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
}
# 'check-printer-alive' command definition
define command{
command_name check-printer-alive
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
}
# 'check-switch-alive' command definition
define command{
command_name check-switch-alive
- command_line /usr/lib/nagios/plugins/check_ping $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+ command_line /usr/lib/nagios/plugins/check_ping '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
}
# 'check-router-alive' command definition
define command{
command_name check-router-alive
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
}
####
@@ -39,34 +39,34 @@
# 'check_ping_4' command definition
define command{
command_name check_ping_4
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -4
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' -4
}
# 'check-host-alive_4' command definition
define command{
command_name check-host-alive_4
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
}
# 'check-printer-alive_4' command definition
define command{
command_name check-printer-alive_4
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
}
# 'check-switch-alive_4' command definition
define command{
command_name check-switch-alive_4
- command_line /usr/lib/nagios/plugins/check_ping $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+ command_line /usr/lib/nagios/plugins/check_ping '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
}
# 'check-router-alive_4' command definition
define command{
command_name check-router-alive_4
- command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+ command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/procs.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/procs.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/procs.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/procs.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,20 +1,20 @@
# 'check_procs' command definition
define command{
command_name check_procs
- command_line /usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$'
}
# 'check_procs_zombie' command definition
define command{
command_name check_procs_zombie
- command_line /usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s Z
+ command_line /usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$' -s Z
}
# 'check_procs_httpd' command definition
define command{
command_name check_procs_httpd
- command_line /usr/lib/nagios/plugins/check_procs -w 5:$ARG1$ -c 1:$ARG2$ -C httpd
+ command_line /usr/lib/nagios/plugins/check_procs -w 5:'$ARG1$' -c 1:'$ARG2$' -C httpd
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/radius.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/radius.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/radius.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/radius.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,6 +1,6 @@
# 'check_radius' command definition
define command{
command_name check_radius
- command_line /usr/lib/nagios/plugins/check_radius $ARG1$ $ARG2$ $HOSTADDRESS$ 1812 $ARG3$
+ command_line /usr/lib/nagios/plugins/check_radius '$ARG1$' '$ARG2$' '$HOSTADDRESS$' 1812 '$ARG3$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/real.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/real.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/real.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/real.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,13 +1,13 @@
# 'check_real_url' command definition
define command{
command_name check_real_url
- command_line /usr/lib/nagios/plugins/check_real $HOSTADDRESS$ -p $ARG1$ -wt $ARG2$ -ct $ARG3$ -to 5 -u $ARG4$
+ command_line /usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5 -u '$ARG4$'
}
# 'check_real' command definition
define command{
command_name check_real
- command_line /usr/lib/nagios/plugins/check_real $HOSTADDRESS$ -p $ARG1$ -wt $ARG2$ -ct $ARG3$ -to 5
+ command_line /usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/rpc-nfs.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/rpc-nfs.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/rpc-nfs.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/rpc-nfs.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -2,13 +2,13 @@
# 'check-rpc' command definition
define command{
command_name check-rpc
- command_line /usr/lib/nagios/plugins/check_rpc -H $HOSTADDRESS$ -C $ARG1$
+ command_line /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C '$ARG1$'
}
# 'check-nfs' command definition
define command{
command_name check-nfs
- command_line /usr/lib/nagios/plugins/check_rpc -H $HOSTADDRESS$ -C nfs -c2,3
+ command_line /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C nfs -c2,3
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/snmp.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/snmp.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/snmp.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/snmp.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,139 +1,139 @@
# 'snmp_load' command definition
define command{
command_name snmp_load
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.10.1.5.1,.1.3.6.1.4.1.2021.10.1.5.2,.1.3.6.1.4.1.2021.10.1.5.3 -w :$ARG2$,:$ARG3$,:$ARG4$ -c :$ARG5$,:$ARG6$,:$ARG7$ -l load
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.10.1.5.1,.1.3.6.1.4.1.2021.10.1.5.2,.1.3.6.1.4.1.2021.10.1.5.3 -w :'$ARG2$',:'$ARG3$',:'$ARG4$' -c :'$ARG5$',:'$ARG6$',:'$ARG7$' -l load
}
# 'snmp_cpustats' command definition
define command{
command_name snmp_cpustats
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.11.9.0,.1.3.6.1.4.1.2021.11.10.0,.1.3.6.1.4.1.2021.11.11.0 -l 'CPU usage (user system idle)' -u '%'
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.11.9.0,.1.3.6.1.4.1.2021.11.10.0,.1.3.6.1.4.1.2021.11.11.0 -l 'CPU usage (user system idle)' -u '%'
}
# 'snmp_procname' command definition
define command{
command_name snmp_procname
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.2.1.5.$ARG2$ -w $ARG3$:$ARG4$ -c $ARG5$:$ARG6$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.2.1.5.'$ARG2$' -w '$ARG3$':'$ARG4$' -c '$ARG5$':'$ARG6$'
}
# 'snmp_disk' command definition
define command{
command_name snmp_disk
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.9.1.7.$ARG2$,.1.3.6.1.4.1.2021.9.1.9.$ARG2$ -w $ARG3$:,:$ARG4$ -c $ARG5$:,:$ARG6$ -u 'kB free (','% used)' -l 'disk space'
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.9.1.7.'$ARG2$',.1.3.6.1.4.1.2021.9.1.9.'$ARG2$' -w '$ARG3$':,:'$ARG4$' -c '$ARG5$':,:'$ARG6$' -u 'kB free (','% used)' -l 'disk space'
}
# 'snmp_mem' command definition
define command{
command_name snmp_mem
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.4.6.0,.1.3.6.1.4.1.2021.4.5.0 -w $ARG2$: -c $ARG3$:
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.6.0,.1.3.6.1.4.1.2021.4.5.0 -w '$ARG2$': -c '$ARG3$':
}
# 'snmp_swap' command definition
define command{
command_name snmp_swap
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.4.4.0,.1.3.6.1.4.1.2021.4.3.0 -w $ARG2$: -c $ARG3$:
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.4.0,.1.3.6.1.4.1.2021.4.3.0 -w '$ARG2$': -c '$ARG3$':
}
# 'snmp_procs' command definition
define command{
command_name snmp_procs
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrSystem.hrSystemProcesses -w :$ARG2$ -c :$ARG3$ -l processes
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemProcesses -w :'$ARG2$' -c :'$ARG3$' -l processes
}
# 'snmp_users' command definition
define command{
command_name snmp_users
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrSystem.hrSystemNumUsers -w :$ARG2$ -c :$ARG3$ -l users
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers -w :'$ARG2$' -c :'$ARG3$' -l users
}
# 'snmp_mem2' command definition
define command{
command_name snmp_mem2
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
}
# 'snmp_swap2' command definition
define command{
command_name snmp_swap2
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
}
# 'snmp_mem3' command definition
define command{
command_name snmp_mem3
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
}
# 'snmp_swap3' command definition
define command{
command_name snmp_swap3
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
}
# 'snmp_disk2' command definition
define command{
command_name snmp_disk2
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$ -w $ARG3$ -c $ARG4$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
}
# 'snmp_tcpopen' command definition
define command{
command_name snmp_tcpopen
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o tcp.tcpCurrEstab.0 -w $ARG2$ -c $ARG3$
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpCurrEstab.0 -w '$ARG2$' -c '$ARG3$'
}
# 'snmp_tcpstats' command definition
define command{
command_name snmp_tcpstats
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o tcp.tcpActiveOpens.0,tcp.tcpPassiveOpens.0,tcp.tcpInSegs.0,tcp.tcpOutSegs.0,tcp.tcpRetransSegs.0 -l 'TCP stats'
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpActiveOpens.0,tcp.tcpPassiveOpens.0,tcp.tcpInSegs.0,tcp.tcpOutSegs.0,tcp.tcpRetransSegs.0 -l 'TCP stats'
}
# 'check_snmp_bgpstate' command definition
define command{
command_name check_snmp_bgpstate
- command_line /usr/lib/nagios/plugins/check_bgpstate $HOSTADDRESS$ -c $ARG1$
+ command_line /usr/lib/nagios/plugins/check_bgpstate '$HOSTADDRESS$' -c '$ARG1$'
}
# 'check_netapp_uptime' command definition
define command{
command_name check_netapp_uptime
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.2.1.1.3.0 --delimiter=')' -l "Uptime is"
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.2.1.1.3.0 --delimiter=')' -l "Uptime is"
}
# 'check_netapp_cpuload' command definition
define command{
command_name check_netapp_cpuload
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.789.1.2.1.3.0 -w 90 -c 95 -u '%' -l "CPU LOAD "
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.2.1.3.0 -w 90 -c 95 -u '%' -l "CPU LOAD "
}
# 'check_netapp_numdisks' command definition
define command{
command_name check_netapp_numdisks
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.789.1.6.4.1.0,.1.3.6.1.4.1.789.1.6.4.2.0,.1.3.6.1.4.1.789.1.6.4.8.0,.1.3.6.1.4.1.789.1.6.4.7.0 -u 'Total Disks','Active','Spare','Failed' -l ""
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.6.4.1.0,.1.3.6.1.4.1.789.1.6.4.2.0,.1.3.6.1.4.1.789.1.6.4.8.0,.1.3.6.1.4.1.789.1.6.4.7.0 -u 'Total Disks','Active','Spare','Failed' -l ""
}
# 'check_compaq_thermalCondition' command definition
define command{
command_name check_compaq_thermalCondition
- command_line /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status "
+ command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status "
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/ssh.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/ssh.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/ssh.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/ssh.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,13 +1,13 @@
# 'check_ssh' command definition
define command{
command_name check_ssh
- command_line /usr/lib/nagios/plugins/check_ssh $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$'
}
# 'check_ssh_port' command definition
define command{
command_name check_ssh_port
- command_line /usr/lib/nagios/plugins/check_ssh -p $ARG1$ $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_ssh -p '$ARG1$' '$HOSTADDRESS$'
}
####
@@ -17,11 +17,11 @@
# 'check_ssh_4' command definition
define command{
command_name check_ssh_4
- command_line /usr/lib/nagios/plugins/check_ssh $HOSTADDRESS$ -4
+ command_line /usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$' -4
}
# 'check_ssh_port_4' command definition
define command{
command_name check_ssh_port_4
- command_line /usr/lib/nagios/plugins/check_ssh -4 -p $ARG1$ $HOSTADDRESS$
+ command_line /usr/lib/nagios/plugins/check_ssh -4 -p '$ARG1$' '$HOSTADDRESS$'
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/tcp_udp.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/tcp_udp.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/tcp_udp.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/tcp_udp.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,13 +1,13 @@
# 'check_tcp' command definition
define command{
command_name check_tcp
- command_line /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p $ARG1$
+ command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$'
}
# 'check_udp' command definition
define command{
command_name check_udp
- command_line /usr/lib/nagios/plugins/check_udp -H $HOSTADDRESS$ -p $ARG1$
+ command_line /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$'
}
####
@@ -17,11 +17,11 @@
# 'check_tcp_4' command definition
define command{
command_name check_tcp_4
- command_line /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p $ARG1$ -4
+ command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$' -4
}
# 'check_udp_4' command definition
define command{
command_name check_udp_4
- command_line /usr/lib/nagios/plugins/check_udp -H $HOSTADDRESS$ -p $ARG1$ -4
+ command_line /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$' -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/telnet.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/telnet.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/telnet.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/telnet.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,7 +1,7 @@
# 'check_telnet' command definition
define command{
command_name check_telnet
- command_line /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p 23
+ command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23
}
####
@@ -11,5 +11,5 @@
# 'check_telnet_4' command definition
define command{
command_name check_telnet_4
- command_line /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p 23 -4
+ command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23 -4
}
diff -aur nagios-plugins-1.4.11/debian/pluginconfig/users.cfg nagios-plugins-1.4.11.new/debian/pluginconfig/users.cfg
--- nagios-plugins-1.4.11/debian/pluginconfig/users.cfg 2008-05-01 21:07:27.000000000 +0100
+++ nagios-plugins-1.4.11.new/debian/pluginconfig/users.cfg 2008-05-01 14:55:12.000000000 +0100
@@ -1,6 +1,6 @@
# 'check_users' command definition
define command{
command_name check_users
- command_line /usr/lib/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
+ command_line /usr/lib/nagios/plugins/check_users -w '$ARG1$' -c '$ARG2$'
}
diff -aur nagios-plugins-1.4.11/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.11.new/plugins-scripts/check_disk_smb.pl
--- nagios-plugins-1.4.11/plugins-scripts/check_disk_smb.pl 2008-05-01 21:08:05.000000000 +0100
+++ nagios-plugins-1.4.11.new/plugins-scripts/check_disk_smb.pl 2008-05-01 21:04:39.000000000 +0100
@@ -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,32 +55,30 @@
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
-($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");
-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) || ($opt_p = "");
+defined($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = "");
my $pass = $1 if ($opt_p =~ /(.*)/);
-($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");
@@ -162,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);
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_file_age
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_flexlm
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_ifoperstatus
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_ifstatus
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_ircd
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_log
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_mailq
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_oracle
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_rpc
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_sensors
Only in nagios-plugins-1.4.11.new/plugins-scripts: check_wave
Only in nagios-plugins-1.4.11.new/plugins-scripts: Makefile
Only in nagios-plugins-1.4.11.new/plugins-scripts: subst
Only in nagios-plugins-1.4.11.new/plugins-scripts: utils.pm
diff -aur nagios-plugins-1.4.11/plugins-scripts/utils.pm.in nagios-plugins-1.4.11.new/plugins-scripts/utils.pm.in
--- nagios-plugins-1.4.11/plugins-scripts/utils.pm.in 2007-07-07 12:55:48.000000000 +0100
+++ nagios-plugins-1.4.11.new/plugins-scripts/utils.pm.in 2008-05-01 14:38:48.000000000 +0100
@@ -8,7 +8,8 @@
require Exporter;
@ISA = qw(Exporter);
- at EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage);
+ at 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;
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.24.2
Locale: LANG=en_GB.ISO-8859-15, LC_CTYPE=en_GB.ISO-8859-15 (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
Versions of packages nagios-plugins depends on:
ii nagios-plugins-basic 1.4.11-2 Plugins for the nagios network mon
ii nagios-plugins-standard 1.4.11-2 Plugins for the nagios network mon
nagios-plugins recommends no packages.
-- no debconf information
More information about the Pkg-nagios-devel
mailing list