Adding d/p/12_check_curl_add_docu from upstream

https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2012.patch
This commit is contained in:
Jan Wagner 2024-08-19 23:53:46 +02:00
parent 15760add88
commit a6b1db0c7c
2 changed files with 43 additions and 0 deletions

42
debian/patches/12_check_curl_add_docu vendored Normal file
View file

@ -0,0 +1,42 @@
From 9cdf2aec7fa3277237c078fc9da32f40d0292299 Mon Sep 17 00:00:00 2001
From: Alvar Penning <alvar.penning@icinga.com>
Date: Fri, 16 Aug 2024 10:38:02 +0200
Subject: [PATCH] check_curl: Documentation for --certificate, --cookie-jar
From the mere help output for -C / --certificate, I was confused about
what its two integer parameters do. Unfortunately, I also missed out on
the explaining examples later. Since I like to have basic documentation
for each flag, I tried to make the arguments as short as possible.
The other fix was one hyphen too many for the --cookie-jar option.
---
plugins/check_curl.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 4522e6c9f..e9c15e648 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -2008,8 +2008,11 @@ print_help (void)
printf (" %s\n", _("Note: SNI is not supported in libcurl before 7.18.1"));
#endif
printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
- printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
- printf (" %s\n", _("(when this option is used the URL is not checked by default. You can use"));
+ printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443."));
+ printf (" %s\n", _("A STATE_WARNING is returned if the certificate has a validity less than the"));
+ printf (" %s\n", _("first agument's value. If there is a second argument and the certificate's"));
+ printf (" %s\n", _("validity is less than its value, a STATE_CRITICAL is returned."));
+ printf (" %s\n", _("(When this option is used the URL is not checked by default. You can use"));
printf (" %s\n", _(" --continue-after-certificate to override this behavior)"));
printf (" %s\n", "--continue-after-certificate");
printf (" %s\n", _("Allows the HTTP check to continue after performing the certificate check."));
@@ -2092,7 +2095,7 @@ print_help (void)
printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
printf(" %s\n", "--haproxy-protocol");
printf(" %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL)."));
- printf (" %s\n", "---cookie-jar=FILE");
+ printf (" %s\n", "--cookie-jar=FILE");
printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested."));
printf ("\n");

View file

@ -3,4 +3,5 @@
# commited upstream
10_check_curl_fix_redirects
11_check_curl_raise_ssl_issue
12_check_curl_add_docu
# feature patches