From a9d2a52ed56ead744f0009e73a541ac956adbef4 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 5 Oct 2015 23:55:08 +0200 Subject: [PATCH] Add patches/14_sslutils_superfluous_parenthesis from upstream maint branch --- .../14_sslutils_superfluous_parenthesis | 49 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 50 insertions(+) create mode 100644 debian/patches/14_sslutils_superfluous_parenthesis diff --git a/debian/patches/14_sslutils_superfluous_parenthesis b/debian/patches/14_sslutils_superfluous_parenthesis new file mode 100644 index 0000000..0212369 --- /dev/null +++ b/debian/patches/14_sslutils_superfluous_parenthesis @@ -0,0 +1,49 @@ +From 0a406d8dcec816a94d283b872755b28f219bea2e Mon Sep 17 00:00:00 2001 +From: Sebastian Herbszt +Date: Sat, 20 Dec 2014 20:58:22 +0100 +Subject: [PATCH 1/2] sslutils: remove superfluous parenthesis + +Remove superfluous parenthesis. + +Signed-off-by: Sebastian Herbszt +--- + plugins/sslutils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/sslutils.c b/plugins/sslutils.c +index 4933dd0..494a1ec 100644 +--- a/plugins/sslutils.c ++++ b/plugins/sslutils.c +@@ -59,7 +59,7 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int + break; + case 2: /* SSLv2 protocol */ + #if defined(USE_GNUTLS) || defined(OPENSSL_NO_SSL2) +- printf(("%s\n", _("CRITICAL - SSL protocol version 2 is not supported by your SSL library."))); ++ printf("%s\n", _("CRITICAL - SSL protocol version 2 is not supported by your SSL library.")); + return STATE_CRITICAL; + #else + method = SSLv2_client_method(); + +From 8e661a3bd6c6892ed4db926eab769c167b0e9091 Mon Sep 17 00:00:00 2001 +From: Jan Wagner +Date: Sun, 4 Oct 2015 15:11:40 +0200 +Subject: [PATCH 2/2] sslutils: Remove superfluous parenthesis for sslv3 + function too + +--- + plugins/sslutils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/sslutils.c b/plugins/sslutils.c +index 494a1ec..f34c3d7 100644 +--- a/plugins/sslutils.c ++++ b/plugins/sslutils.c +@@ -67,7 +67,7 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int + break; + case 3: /* SSLv3 protocol */ + #if defined(OPENSSL_NO_SSL3) +- printf(("%s\n", _("CRITICAL - SSL protocol version 3 is not supported by your SSL library."))); ++ printf("%s\n", _("CRITICAL - SSL protocol version 3 is not supported by your SSL library.")); + return STATE_CRITICAL; + #else + method = SSLv3_client_method(); diff --git a/debian/patches/series b/debian/patches/series index 97303e9..d9ac7e3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 11_check_dhcp_parsing_option 12_check_ups_perf_data_hresholds 13_check_snmp_timeout +14_sslutils_superfluous_parenthesis