From 534d0c884234ae2536802a98a6ec69490d944c04 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 13 Mar 2023 08:31:34 +0000 Subject: [PATCH] Adding d/p/30_check_radius_radcli_1.3.1_support from upstream --- .../30_check_radius_radcli_1.3.1_support | 26 +++++++++++++++++++ debian/patches/series | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 debian/patches/30_check_radius_radcli_1.3.1_support diff --git a/debian/patches/30_check_radius_radcli_1.3.1_support b/debian/patches/30_check_radius_radcli_1.3.1_support new file mode 100644 index 0000000..4e07da2 --- /dev/null +++ b/debian/patches/30_check_radius_radcli_1.3.1_support @@ -0,0 +1,26 @@ +From 6bbe0b7b0f609ecab831dec9be7690842bf0a0fc Mon Sep 17 00:00:00 2001 +From: Stuart Henderson +Date: Wed, 8 Feb 2023 16:35:22 +0000 +Subject: [PATCH] cope with radcli-1.3.1 RC_BUFFER_LEN + +radcli 1.3.1 now uses RC_BUFFER_LEN instead of BUFFER_LEN. Add an #ifdef to allow working with either. +--- + plugins/check_radius.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/check_radius.c b/plugins/check_radius.c +index be1001b4d..96a955536 100644 +--- a/plugins/check_radius.c ++++ b/plugins/check_radius.c +@@ -155,7 +155,11 @@ main (int argc, char **argv) + { + struct sockaddr_storage ss; + char name[HOST_NAME_MAX]; ++#ifdef RC_BUFFER_LEN ++ char msg[RC_BUFFER_LEN]; ++#else + char msg[BUFFER_LEN]; ++#endif + SEND_DATA data; + int result = STATE_UNKNOWN; + uint32_t client_id, service; diff --git a/debian/patches/series b/debian/patches/series index 7a2debc..a89e3a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ 12_check_curl_improvements 13_check_icmp_improvements 14_check_curl_fix_SSL_with_multiple_IPs +# feature patches +30_check_radius_radcli_1.3.1_support