[pkg-nagios-changes] [Git][nagios-team/nagios-plugins-contrib][master] check_email_delivery: Add back --imaptls option by adding d/p/check_email_delivery/add_imap_tls

[Jan Wagner (@waja)]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / nagios-plugins-contrib


Commits:
1cdb2c60 by Jan Wagner at 2023-02-13T12:28:23+00:00
check_email_delivery: Add back --imaptls option by adding d/p/check_email_delivery/add_imap_tls

- - - - -


2 changed files:

- + debian/patches/check_email_delivery/add_imap_tls
- debian/patches/series


Changes:

=====================================
debian/patches/check_email_delivery/add_imap_tls
=====================================
@@ -0,0 +1,80 @@
+--- a/check_email_delivery/src/check_email_delivery
++++ b/check_email_delivery/src/check_email_delivery
+@@ -38,6 +38,7 @@
+ my $password = "";
+ my $ssl = "";
+ my $imap_ssl = "";
++my $imap_tls = "";
+ my $mailto = "";
+ my $mailfrom = "";
+ my @header = ();
+@@ -93,6 +94,7 @@
+ 	"imap-mailbox=s"=>\$imap_mailbox,
+ 	"imap-check-interval=i"=>\$imap_interval,"imap-retries=i"=>\$imap_retries,
+ 	"imapssl!"=>\$imap_ssl,
++	"imaptls!"=>\$imap_tls,
+ 	# Time
+ 	"hires"=>\$time_hires,
+ 	);
+@@ -130,6 +132,7 @@
+ 
+ if( $ssl ) {
+ 	$imap_ssl = $ssl if $imap_ssl eq "";
++	$imap_tls = $ssl if $imap_tls eq "";
+ 	$smtp_tls = $ssl if $smtp_tls eq "";
+ }
+ 
+@@ -201,6 +204,7 @@
+ $imap_options .= "-P ".shellquote($imap_password)." " if defined $imap_password and $imap_password ne "";
+ $imap_options .= "--mailbox ".shellquote($imap_mailbox)." " if defined $imap_mailbox and $imap_mailbox ne "";
+ $imap_options .= "--ssl " if defined $imap_ssl and $imap_ssl;
++$imap_options .= "--tls " if defined $imap_tls and $imap_tls;
+ 
+ 
+ # create the report object
+@@ -693,6 +697,11 @@
+ 
+ This argument is shell-escaped; special characters or angle brackets around the address are ok. 
+ 
++=item --imaptls
++=item --noimaptls
++
++Use this to enable or disable TLS/AUTH for the IMAP plugin. 
++
+ =item --smtptls
+ =item --nosmtptls
+ 
+--- a/check_email_delivery/src/check_email_delivery_epn
++++ b/check_email_delivery/src/check_email_delivery_epn
+@@ -36,6 +36,7 @@
+ my $password = "";
+ my $ssl = "";
+ my $imap_ssl = "";
++my $imap_tls = "";
+ my $mailto = "";
+ my $mailfrom = "";
+ my @header = ();
+@@ -91,6 +92,7 @@
+ 	"imap-mailbox=s"=>\$imap_mailbox,
+ 	"imap-check-interval=i"=>\$imap_interval,"imap-retries=i"=>\$imap_retries,
+ 	"imapssl!"=>\$imap_ssl,
++	"imaptls!"=>\$imap_tls,
+ 	# Time
+ 	"hires"=>\$time_hires,
+ 	);
+@@ -128,6 +130,7 @@
+ 
+ if( $ssl ) {
+ 	$imap_ssl = $ssl if $imap_ssl eq "";
++	$imap_tls = $ssl if $imap_tls eq "";
+ 	$smtp_tls = $ssl if $smtp_tls eq "";
+ }
+ 
+@@ -199,6 +202,7 @@
+ $imap_options .= "-P ".shellquote($imap_password)." " if defined $imap_password and $imap_password ne "";
+ $imap_options .= "--mailbox ".shellquote($imap_mailbox)." " if defined $imap_mailbox and $imap_mailbox ne "";
+ $imap_options .= "--ssl " if defined $imap_ssl and $imap_ssl;
++$imap_options .= "--tls " if defined $imap_tls and $imap_tls;
+ 
+ 
+ # create the report object


=====================================
debian/patches/series
=====================================
@@ -12,6 +12,7 @@ check_drbd/fix_for_oos_and_cosmetic
 check_email_delivery/epn
 check_email_delivery/paths
 check_email_delivery/fix_tls
+check_email_delivery/add_imap_tls
 check_haproxy/epn
 check_haproxy/monitoring-plugin
 check_haproxy_stats/interpreter



View it on GitLab: https://salsa.debian.org/nagios-team/nagios-plugins-contrib/-/commit/1cdb2c604f617de159ba785a6775d041f043cdf1

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/nagios-plugins-contrib/-/commit/1cdb2c604f617de159ba785a6775d041f043cdf1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20230213/5582b8b9/attachment-0001.htm>