From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 22 Sep 2008 06:46:24 +0000 (+0000)
Subject: [project @ zobel@debian.org-20080922064624-kgcoumj0gq0eiby8]
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=b5a2d1f91fcc3f9c0b3ad0e80a8e6344f329970b;p=mirror%2Fdsa-nagios.git

[project @ zobel@debian.org-20080922064624-kgcoumj0gq0eiby8]
fix dsa-check-samhain
---

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index 210b9c0..79d2795 100644
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,10 @@
+dsa-nagios-nrpe-config (56) unstable; urgency=low
+
+  * fix dsa-check-samhain.
+    sudo is not in $PATH.
+
+ -- Martin Zobel-Helas <zobel@debian.org>  Mon, 22 Sep 2008 06:45:19 +0000
+
 dsa-nagios-nrpe-config (55) unstable; urgency=low
 
   * And another one, weasel should sleep.
diff --git a/dsa-nagios-nrpe-config/dsa-check-samhain b/dsa-nagios-nrpe-config/dsa-check-samhain
index b4b4046..c6b3f4f 100755
--- a/dsa-nagios-nrpe-config/dsa-check-samhain
+++ b/dsa-nagios-nrpe-config/dsa-check-samhain
@@ -50,7 +50,7 @@ $ENV{'ENV'}='';
 # -----------------------------------------------------------------[ Global ]--
 
 $PROGNAME = "dsa-check-samhain";
-$SAMHAIN = "sudo /usr/sbin/samhain"; 
+$SAMHAIN = "/usr/sbin/samhain"; 
 
 # ----------------------------------------------------------------[ options ]--
 
@@ -72,7 +72,7 @@ alarm($opt_t);
 # ----------------------------------------------------------[ start samhain ]--
 
 if ( defined $SAMHAIN && -x $SAMHAIN ) {
-    if (! open (SHPIPE, "$SAMHAIN -t check --foreground -p err -s none -l none -m none 2>&1 | " ) ) {
+    if (! open (SHPIPE, "/usr/bin/sudo $SAMHAIN -t check --foreground -p err -s none -l none -m none 2>&1 | " ) ) {
 	print "ERROR: could not popen $SAMHAIN \n";
 	exit $ERRORS{'UNKNOWN'};
     }