From 147b819856120fe3752102d3b1a024c683a0be01 Mon Sep 17 00:00:00 2001
From: garnier-quentin <qgarnier@centreon.com>
Date: Tue, 19 Jan 2016 20:47:00 +0100
Subject: [PATCH 1/3] + Fix empty message for x509

---
 apps/protocols/x509/mode/validity.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/protocols/x509/mode/validity.pm b/apps/protocols/x509/mode/validity.pm
index 430ac5e43..ae7fc2363 100644
--- a/apps/protocols/x509/mode/validity.pm
+++ b/apps/protocols/x509/mode/validity.pm
@@ -87,21 +87,21 @@ sub run {
         $self->{option_results}->{servername} ? ( SSL_hostname => $self->{option_results}->{servername} ):(),
     ) };
     if ($@) {
-            $self->{output}->output_add(severity => 'CRITICAL',
-                                        short_msg => sprintf ("%s", $!));
+        $self->{output}->output_add(severity => 'CRITICAL',
+                                    short_msg => sprintf("%s", $@));
 
-            $self->{output}->display();
-            $self->{output}->exit()
+        $self->{output}->display();
+        $self->{output}->exit()
     }
 
     #Retrieve Certificat
     eval { $cert = $client->peer_certificate() };
     if ($@) {
-            $self->{output}->output_add(severity => 'CRITICAL',
-                                        short_msg => sprintf("%s", $!));
+        $self->{output}->output_add(severity => 'CRITICAL',
+                                    short_msg => sprintf("%s", $@));
 
-            $self->{output}->display();
-            $self->{output}->exit()
+        $self->{output}->display();
+        $self->{output}->exit()
     }
 
     #Expiration Date

From dba1f7cb21a51e387781d4a0059e422751b51609 Mon Sep 17 00:00:00 2001
From: garnier-quentin <qgarnier@centreon.com>
Date: Tue, 19 Jan 2016 20:54:38 +0100
Subject: [PATCH 2/3] + Fix error message for x509 plugin

---
 apps/protocols/x509/mode/validity.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/protocols/x509/mode/validity.pm b/apps/protocols/x509/mode/validity.pm
index ae7fc2363..ff178fa51 100644
--- a/apps/protocols/x509/mode/validity.pm
+++ b/apps/protocols/x509/mode/validity.pm
@@ -79,27 +79,25 @@ sub run {
     my ($self, %options) = @_;
 
     # Global variables
-    my ($cert, $client);
 
-    eval { $client = IO::Socket::SSL->new(
+    my $client = IO::Socket::SSL->new(
         PeerHost => $self->{option_results}->{hostname},
         PeerPort => $self->{option_results}->{port},
         $self->{option_results}->{servername} ? ( SSL_hostname => $self->{option_results}->{servername} ):(),
-    ) };
-    if ($@) {
+    )
+    if (!defined($client)) {
         $self->{output}->output_add(severity => 'CRITICAL',
-                                    short_msg => sprintf("%s", $@));
-
+                                    short_msg => "failed to accept or ssl handshake: $!,$SSL_ERROR");
         $self->{output}->display();
         $self->{output}->exit()
     }
 
     #Retrieve Certificat
+    my $cert;
     eval { $cert = $client->peer_certificate() };
     if ($@) {
         $self->{output}->output_add(severity => 'CRITICAL',
                                     short_msg => sprintf("%s", $@));
-
         $self->{output}->display();
         $self->{output}->exit()
     }

From fb2dc791cafc769df64379e8f0ebfbe33210ec70 Mon Sep 17 00:00:00 2001
From: garnier-quentin <qgarnier@centreon.com>
Date: Tue, 19 Jan 2016 20:57:54 +0100
Subject: [PATCH 3/3] + Fix x509

---
 apps/protocols/x509/mode/validity.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/protocols/x509/mode/validity.pm b/apps/protocols/x509/mode/validity.pm
index ff178fa51..f08b8756f 100644
--- a/apps/protocols/x509/mode/validity.pm
+++ b/apps/protocols/x509/mode/validity.pm
@@ -84,7 +84,7 @@ sub run {
         PeerHost => $self->{option_results}->{hostname},
         PeerPort => $self->{option_results}->{port},
         $self->{option_results}->{servername} ? ( SSL_hostname => $self->{option_results}->{servername} ):(),
-    )
+    );
     if (!defined($client)) {
         $self->{output}->output_add(severity => 'CRITICAL',
                                     short_msg => "failed to accept or ssl handshake: $!,$SSL_ERROR");