summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2016-06-07 06:45:06 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2016-06-07 06:45:06 (GMT)
commitbd4515bb1e37d536ce6a994595661a98bf289766 (patch) (side-by-side diff)
tree3b795a1a697c90f05b8b5a6673df55d8768a5df7
parent7ba60f1e59378fc697f9b60eb3cbbe88d8c7f058 (diff)
downloadnetsnmp-sendmail-bd4515bb1e37d536ce6a994595661a98bf289766.tar.gz
netsnmp-sendmail-bd4515bb1e37d536ce6a994595661a98bf289766.tar.bz2
Bugfixes
* Makefile.PL: Use DESTINSTALL.* instead of DESTINSTALLSITE.* * SENDMAIL-STATS.txt: Use Gauge32 for integer values that may increase and decrease. * install-mib.pl: Use make_path instead of mkdir
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.PL6
-rw-r--r--SENDMAIL-STATS.txt9
-rwxr-xr-xinstall-mib.pl3
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 1cc23a6..4129fa9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -40,13 +40,13 @@ Sendmail.pm: Sendmail.mib2c sendmail.pl SENDMAIL-STATS.txt
MIBS="+SENDMAIL-STATS" \
mib2c -c Sendmail.mib2c -f Sendmail.pm -S prologue=sendmail.pl SENDMAIL-STATS::sendmail
-INSTALLSITEMIB = $(SITEPREFIX)/share/snmp/mibs
-DESTINSTALLSITEMIB = $(DESTDIR)$(INSTALLSITEMIB)
+INSTALLMIB = $(PREFIX)/share/snmp/mibs
+DESTINSTALLMIB = $(DESTDIR)$(INSTALLMIB)
install:: install-mib
install-mib:
- $(PERLRUN) install-mib.pl SENDMAIL-STATS.txt $(DESTINSTALLSITEMIB)
+ $(PERLRUN) install-mib.pl SENDMAIL-STATS.txt $(DESTINSTALLMIB)
_MAKE_
}
diff --git a/SENDMAIL-STATS.txt b/SENDMAIL-STATS.txt
index bf6f7e8..ab1280e 100644
--- a/SENDMAIL-STATS.txt
+++ b/SENDMAIL-STATS.txt
@@ -7,7 +7,8 @@ SENDMAIL-STATS DEFINITIONS ::= BEGIN
-- *************************************************************
IMPORTS
- MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, Integer32
+ MODULE-IDENTITY, OBJECT-TYPE, enterprises, Integer32, Counter64,
+ Gauge32
FROM SNMPv2-SMI
TEXTUAL-CONVENTION
FROM SNMPv2-TC
@@ -28,7 +29,7 @@ sendmail MODULE-IDENTITY
queue OBJECT IDENTIFIER ::= { sendmail 1 }
queueTotal OBJECT-TYPE
- SYNTAX Counter64
+ SYNTAX Gauge32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
@@ -51,7 +52,7 @@ QueueEntry ::= SEQUENCE {
queueIndex Integer32,
queueName QueueNameString,
queueDirectory QueuePathString,
- queueMessages Counter64
+ queueMessages Gauge32
}
queueTable OBJECT-TYPE
@@ -96,7 +97,7 @@ queueDirectory OBJECT-TYPE
::= { queueEntry 3 }
queueMessages OBJECT-TYPE
- SYNTAX Counter64
+ SYNTAX Gauge32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
diff --git a/install-mib.pl b/install-mib.pl
index 56461a8..54d9e5e 100755
--- a/install-mib.pl
+++ b/install-mib.pl
@@ -3,6 +3,7 @@
use strict;
use File::Basename;
use File::Copy;
+use File::Path qw(make_path);
use autodie;
# install-mib FILE DIR
@@ -25,7 +26,7 @@ close($fd);
die "no MIB definition in $file" unless defined $mibname;
-mkdir($destdir) unless -e $destdir;
+make_path($destdir) unless -e $destdir;
copy($file, $destdir);

Return to:

Send suggestions and report system problems to the System administrator.