Fixed a bug in the proxy command line options validation

matteocorti · Aug 10, 2023 · d737b85 · d737b85
1 parent f7ba87d
commit d737b85
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -254,7 +254,7 @@ authors:
   given-names: "Дилян"
   website: https://github.com/dilyanpalauzov
 title: "check_ssl_cert"
-version: 2.71.0
+version: 2.72.0
 date-released: 2023-07-28
 url: "https://github.com/matteocorti/check_ssl_cert"
 repository-code: "https://github.com/matteocorti/check_ssl_cert"

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-10  Matteo Corti  <[email protected]>
+
+        * check_ssl_cert (main): Fixed a bug in the proxy command line options validation
+
 2023-07-28  Matteo Corti  <[email protected]>
 
         * check_ssl_cert (main): Fixed a bug if the host cannot be resolved and --resolve is specified

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1 +1 @@
-Fixed a bug if the host cannot be resolved and ```--resolve``` is specified
+Fixed a bug in the proxy command line options validation
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.71.0
+2.72.0
diff --git a/check_ssl_cert b/check_ssl_cert
@@ -31,7 +31,7 @@
 ################################################################################
 # Constants
 
-VERSION=2.71.0
+VERSION=2.72.0
 SHORTNAME="SSL_CERT"
 
 VALID_ATTRIBUTES=",startdate,enddate,subject,issuer,modulus,serial,hash,email,ocsp_uri,fingerprint,"
@@ -5224,12 +5224,7 @@ main() {
         fi
     fi
 
-    if [ -n "${PROXY}" ] &&
-        {
-            [ -n "${NO_PROXY}" ] ||
-                [ -n "${NO_PROXY_CURL}" ] ||
-                [ -n "${NO_PROXY_S_CLIENT}" ]
-        }; then
+    if [ -n "${PROXY}" ] && [ -n "${NO_PROXY}" ] ; then
         unknown "Only one of --proxy or --no_proxy can be specified"
     fi
 

diff --git a/check_ssl_cert.1 b/check_ssl_cert.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii check_ssl_cert.1
 .\"
-.TH "check_ssl_cert" 1 "July, 2023" "2.71.0" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "August, 2023" "2.72.0" "USER COMMANDS"
 .SH NAME
 check_ssl_cert \- checks the validity of X.509 certificates
 .SH SYNOPSIS

diff --git a/check_ssl_cert.spec b/check_ssl_cert.spec
@@ -1,4 +1,4 @@
-%global version          2.71.0
+%global version          2.72.0
 %global release          0
 %global sourcename       check_ssl_cert
 %global packagename      nagios-plugins-check_ssl_cert
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug  10 2023 Matteo Corti <[email protected]> - 2.72.0-0
+- Updated to 2.72.0
+
 * Fri Jul  28 2023 Matteo Corti <[email protected]> - 2.71.0-0
 - Updated to 2.71.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Fixed a bug if the host cannot be resolved and ```--resolve``` is specified
		Fixed a bug in the proxy command line options validation