0 files changed, 0 insertions, 0 deletions

diff --git a/plugins/netutils.c b/plugins/netutils.c
index 0044046..83f8942 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -167,11 +167,12 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
         char port_str[6], host[MAX_HOST_ADDRESS_LENGTH];
         size_t len;
         int socktype, result;
+        short is_socket = (host_name[0] == '/');
 
         socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
 
         /* as long as it doesn't start with a '/', it's assumed a host or ip */
-        if(host_name[0] != '/'){
+        if (!is_socket){
                 memset (&hints, 0, sizeof (hints));
                 hints.ai_family = address_family;
                 hints.ai_protocol = proto;
@@ -253,7 +254,11 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                         return econn_refuse_state;
                         break;
                 case STATE_CRITICAL: /* user did not set econn_refuse_state */
-                        printf ("%s\n", strerror(errno));
+                        if (is_socket)
+                                printf("connect to file socket %s: %s\n", host_name, strerror(errno));
+                        else
+                                printf("connect to address %s and port %d: %s\n",
+                                       host_name, port, strerror(errno));
                         return econn_refuse_state;
                         break;
                 default: /* it's a logic error if we do not end up in STATE_(OK|WARNING|CRITICAL) */
@@ -262,7 +267,11 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                 }
         }
         else {
-                printf ("%s\n", strerror(errno));
+                if (is_socket)
+                        printf("connect to file socket %s: %s\n", host_name, strerror(errno));
+                else
+                        printf("connect to address %s and port %d: %s\n",
+                               host_name, port, strerror(errno));
                 return STATE_CRITICAL;
         }
 }
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 687bffb..d0ae474 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -153,7 +153,8 @@ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
         struct tm stamp;
         float time_left;
         int days_left;
-        char timestamp[17] = "";
+        char timestamp[50] = "";
+        time_t tm_t;
 
         certificate=SSL_get_peer_certificate(s);
         if (!certificate) {
@@ -211,10 +212,8 @@ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
 
         time_left = difftime(timegm(&stamp), time(NULL));
         days_left = time_left / 86400;
-        snprintf
-                (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
-                 stamp.tm_mon + 1,
-                 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+        tm_t = mktime (&stamp);
+        strftime(timestamp, 50, "%c", localtime(&tm_t));
 
         if (days_left > 0 && days_left <= days_till_exp_warn) {
                 printf (_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", cn, days_left, timestamp);