Changeset 412 for trunk/scripts

Timestamp:

Sep 1, 2012, 4:25:30 PM (12 years ago)

Author:

katerina

Message:

Enhancements for ticket #312 (logrotate) and #313 (--enable-suid).

Location:

trunk/scripts

Files:

• check_samhain.pl.in (modified) (6 diffs)
• redhat_i386.client.spec.in (modified) (1 diff)
• samhain.spec.in (modified) (1 diff)

trunk/scripts/check_samhain.pl.in

@@ -4 +4 @@
 #   by the samhain file integrity checker.
 #
-# Copyright Rainer Wichmann (2004)
+# Copyright Rainer Wichmann (2004, 2012)
 #
 # License Information:
@@ -28 +28 @@
 use Getopt::Long;
 use vars qw($PROGNAME $SAMHAIN $opt_V $opt_h $opt_v $verbose $opt_w $opt_c $opt_t $status $msg $state $retval);
-use lib  "utils.pm";
+use lib  "/usr/local/nagios/libexec" ;
 use utils qw(%ERRORS &print_revision);
 
@@ -49 +49 @@
 # -----------------------------------------------------------------[ Global ]--
 
-$PROGNAME = "check_samhain";
+$PROGNAME = "check_@install_name@";
 $SAMHAIN = "@sbindir@/@install_name@"; 
 
@@ -99 +99 @@
     $state = $ERRORS{'WARNING'};
 } else {
-    $msg = "CRITICAL: $status policy violations (threshold w=$opt_w)";
+    $msg = "CRITICAL: $status policy violations (threshold c=$opt_c)";
     $state = $ERRORS{'CRITICAL'};
 }
@@ -143 +143 @@
     
     if ($opt_V) {
-        print_revision($PROGNAME,'$Revision: 1.0 $ ');
+        print_revision($PROGNAME,'$Revision: 1.1 $ ');
         exit $ERRORS{'OK'};
     }
@@ -182 +182 @@
 
 sub print_help () {
-    print_revision($PROGNAME, '$Revision: 1.0 $');
-    print "Copyright (c) 2004 Rainer Wichmann
+    print_revision($PROGNAME, '1.1');
+    print "Copyright (c) 2004,2012 Rainer Wichmann
 
 This plugin checks the number of policy violations reported by the

trunk/scripts/redhat_i386.client.spec.in

@@ -141 +141 @@
 /usr/local/sbin/samhain_setpwd
 /lib/modules
+%attr(644,root,root) /etc/logrotate.d/@install_name@
 #%attr(644,root,root) /usr/local/man/man5/samhain*
 #%attr(644,root,root) /usr/local/man/man8/samhain*

trunk/scripts/samhain.spec.in

@@ -127 +127 @@
 %attr(644,root,root) %{_mandir}/man5/samhain*
 %attr(644,root,root) %{_mandir}/man8/samhain*
+%attr(644,root,root) /etc/logrotate.d/@install_name@
 %config(noreplace) %{_sysconfdir}/samhainrc