Date: Wed, 30 Aug 2017 14:32:10 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448983 - in head/net-mgmt/nagios-plugins: . files Message-ID: <201708301432.v7UEWAbo066043@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 30 14:32:09 2017 New Revision: 448983 URL: https://svnweb.freebsd.org/changeset/ports/448983 Log: Restore check_http's -C option to its former glory. Submitted by: feld Sponsored by: Absolight Added: head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c (contents, props changed) head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (contents, props changed) Modified: head/net-mgmt/nagios-plugins/Makefile (contents, props changed) Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Wed Aug 30 13:46:22 2017 (r448982) +++ head/net-mgmt/nagios-plugins/Makefile Wed Aug 30 14:32:09 2017 (r448983) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins PORTVERSION= 2.2.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ Added: head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c Wed Aug 30 14:32:09 2017 (r448983) @@ -0,0 +1,17 @@ +--- plugins/check_http.c.orig 2017-04-19 16:03:12 UTC ++++ plugins/check_http.c +@@ -1026,11 +1026,9 @@ check_http (void) + elapsed_time_ssl = (double)microsec_ssl / 1.0e6; + if (check_cert == TRUE) { + result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); +- if (result != STATE_OK) { +- np_net_ssl_cleanup(); +- if (sd) close(sd); +- return result; +- } ++ np_net_ssl_cleanup(); ++ if (sd) close(sd); ++ return result; + } + } + #endif /* HAVE_SSL */ Added: head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c Wed Aug 30 14:32:09 2017 (r448983) @@ -0,0 +1,21 @@ +--- plugins/sslutils.c.orig 2017-04-19 16:03:12 UTC ++++ plugins/sslutils.c +@@ -211,9 +211,6 @@ int np_net_ssl_check_cert(int days_till_ + int time_remaining; + time_t tm_t; + +- // Prefix whatever we're about to print with SSL +- printf("SSL "); +- + certificate=SSL_get_peer_certificate(s); + if (!certificate) { + printf("%s\n",_("CRITICAL - Cannot retrieve server certificate.")); +@@ -304,7 +301,7 @@ int np_net_ssl_check_cert(int days_till_ + else + status = STATE_CRITICAL; + } else { +- printf(_("OK - Certificate '%s' will expire on %s. "), cn, timestamp); ++ printf(_("OK - Certificate '%s' will expire on %s.\n"), cn, timestamp); + status = STATE_OK; + } + X509_free(certificate);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708301432.v7UEWAbo066043>