Author: glen Date: Thu Dec 22 12:27:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- formatting
---- Files affected:
packages/nagios-plugin-check_amavis:
check_amavis.pl (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/nagios-plugin-check_amavis/check_amavis.pl
diff -u packages/nagios-plugin-check_amavis/check_amavis.pl:1.5
packages/nagios-plugin-check_amavis/check_amavis.pl:1.6
--- packages/nagios-plugin-check_amavis/check_amavis.pl:1.5 Thu Dec 22
13:25:37 2011
+++ packages/nagios-plugin-check_amavis/check_amavis.pl Thu Dec 22 13:27:17 2011
@@ -19,15 +19,15 @@
);
$result = GetOptions (
- "server|s=s" => \$server,
- "port|p=s" => \$port,
- "from|f=s" => \$from,
- "debug|d" => \$debug,
- "to|t=s" => \$to,
+ "server|s=s" => \$server,
+ "port|p=s" => \$port,
+ "from|f=s" => \$from,
+ "debug|d" => \$debug,
+ "to|t=s" => \$to,
);
if (!$server || !$from) {
- print "Please specify server, from\n";
+ print "ERROR: Please specify --server, --from\n";
exit $STATES{UNKNOWN};
}
@@ -40,7 +40,7 @@
EOF
my $top = MIME::Entity->build(
- Type =>"multipart/mixed",
+ Type => "multipart/mixed",
From => $from,
To => $to,
Subject => "EICAR test",
@@ -48,9 +48,9 @@
);
$top->attach(
- Data => $EICAR,
- Type => "application/x-msdos-program",
- Encoding => "base64",
+ Data => $EICAR,
+ Type => "application/x-msdos-program",
+ Encoding => "base64",
);
my $smtp = new Net::SMTP(
@@ -73,9 +73,9 @@
$smtp->close();
if ($result =~/2.7.[01] Ok, discarded/) {
- print "OK - All fine\n"
+ print "OK - All fine\n";
exit $STATES{OK};
} else {
- print "CRITICAL - amavisd-new returned $result";
+ print "CRITICAL - amavisd-new returned $result\n";
exit $STATES{CRITICAL};
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_amavis/check_amavis.pl?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
