Made connection error messages in check_nrpe better

build-aux/ax_nagios_get_ssl

@@ -162,6 +162,7 @@ if test x$SSL_TYPE != xNONE; then
 			LDFLAGS="$LDFLAGS `$PKG_CONFIG $SSL_TYPE --libs-only-L 2>/dev/null`"
 			LIBS="$LIBS `$PKG_CONFIG $SSL_TYPE --libs-only-l 2>/dev/null`"
 			found_ssl=yes
+			AC_DEFINE_UNQUOTED(HAVE_SSL,[1],[Have SSL support])
 		fi
 	fi
 

configure

@@ -7493,6 +7493,11 @@ fi
 			LDFLAGS="$LDFLAGS `$PKG_CONFIG $SSL_TYPE --libs-only-L 2>/dev/null`"
 			LIBS="$LIBS `$PKG_CONFIG $SSL_TYPE --libs-only-l 2>/dev/null`"
 			found_ssl=yes
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SSL 1
+_ACEOF
+
 		fi
 	fi
 

src/check_nrpe.c

@@ -785,7 +785,7 @@ int connect_to_remote()
 	struct sockaddr addr;
 	struct in_addr *inaddr;
 	socklen_t addrlen;
-	int result, rc;
+	int result, rc, ssl_err, ern;
 
 	/* try to connect to the host at the given port number */
 	if ((sd =
@@ -820,6 +820,9 @@ int connect_to_remote()
 
 	SSL_set_fd(ssl, sd);
 	if ((rc = SSL_connect(ssl)) != 1) {
+		ern = errno;
+		ssl_err = SSL_get_error(ssl, rc);
+
 		if (sslprm.log_opts & (SSL_LogCertDetails | SSL_LogIfClientCert)) {
 			int x, nerrs = 0;
 			rc = 0;
@@ -829,15 +832,24 @@ int connect_to_remote()
 				++nerrs;
 			}
 			if (nerrs == 0)
-				syslog(LOG_ERR, "Error: Could not complete SSL handshake with %s: %d",
-					   rem_host, SSL_get_error(ssl, rc));
+				syslog(LOG_ERR, "Error: Could not complete SSL handshake with %s: rc=%d SSL-error=%d",
+					   rem_host, rc, ssl_err);
 
 		} else
-			syslog(LOG_ERR, "Error: Could not complete SSL handshake with %s: %d",
-				   rem_host, SSL_get_error(ssl, rc));
-
-		printf("CHECK_NRPE: Error - Could not complete SSL handshake with %s: %d\n",
-			   rem_host, SSL_get_error(ssl, rc));
+			syslog(LOG_ERR, "Error: Could not complete SSL handshake with %s: rc=%d SSL-error=%d",
+				   rem_host, rc, ssl_err);
+
+		if (ssl_err == 5) {
+			/* Often, errno will be zero, so print a generic message here */
+			if (ern == 0)
+				printf("CHECK_NRPE: Error - Could not connect to %s. Check system logs on %s\n",
+					   rem_host, rem_host);
+			else
+				printf("CHECK_NRPE: Error - Could not connect to %s: %s\n",
+					   rem_host, strerror(ern));
+		} else
+			printf("CHECK_NRPE: Error - Could not complete SSL handshake with %s: %d\n",
+				   rem_host, ssl_err);
 
 # ifdef DEBUG
 		printf("SSL_connect=%d\n", rc);