[Pkg-nagios-changes] nagios/patches 00list, 1.10, 1.11 15_submit_check_result_via_nsca-nagioshost.dpatch, NONE, 1.1

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv22711/patches

Modified Files:
	00list 
Added Files:
	15_submit_check_result_via_nsca-nagioshost.dpatch 
Log Message:
oooooh boy.  i added dbconfig-common support along with a few other
fixes/tweaks here and there.  still need to test the pgsql support,
but things look good for mysql!


Index: 00list
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/00list,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- 00list	2 Dec 2005 07:51:39 -0000	1.10
+++ 00list	8 Dec 2005 13:12:24 -0000	1.11
@@ -14,3 +14,4 @@
 12_xrddb.c-errorhandling.dpatch
 13_config.h.in-traceroute_hardcoded.dpatch
 14_xdata_check-fulldisks.dpatch
+15_submit_check_result_via_nsca-nagioshost.dpatch

--- NEW FILE: 15_submit_check_result_via_nsca-nagioshost.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_submit_check_result_via_nsca-nagioshost.dpatch by  <seanius at debian.org>
##
## DP: provide a way to specify nagioshost on the cmdline

@DPATCH@
diff -urNad sid~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca sid/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
--- sid~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2005-12-05 12:12:03.000000000 +0100
+++ sid/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2005-12-05 12:13:12.000000000 +0100
@@ -32,11 +32,18 @@
 # parse the state_string into an integer return code
 return_value=`eval echo "\$STATE_\`echo $3\`"`
 
+if [ "$1" = "-H" ]; then
+	NagiosHost="$2"
+	shift 2
+else
+	NagiosHost="nagioshost"
+fi
+
 printfcmd="/usr/bin/printf"
 
 NscaBin="/usr/sbin/send_nsca" 
 NscaCfg="/etc/send_nsca.cfg"
-NagiosHost="nagioshost"
+#NagiosHost="nagioshost"
 
 # Fire the data off to the NSCA daemon using the send_nsca script 
 $printfcmd "%s\t%s\t%s\t%s\n" "$1" "$2" "$return_value" "$4" | $NscaBin $NagiosHost -c $NscaCfg