diff --git a/Fix-radeapclient-option-q.patch b/Fix-radeapclient-option-q.patch new file mode 100644 index 0000000..5a0b4c9 --- /dev/null +++ b/Fix-radeapclient-option-q.patch @@ -0,0 +1,43 @@ +From 8a6cdf29ea6427cd8e96c00bc3d03abe1a67e8a3 Mon Sep 17 00:00:00 2001 +From: lingsheng +Date: Thu, 11 Mar 2021 16:03:35 +0800 +Subject: [PATCH] Fix radeapclient option -q + +--- + src/modules/rlm_eap/radeapclient.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/modules/rlm_eap/radeapclient.c b/src/modules/rlm_eap/radeapclient.c +index 553a6a6..d505ae8 100644 +--- a/src/modules/rlm_eap/radeapclient.c ++++ b/src/modules/rlm_eap/radeapclient.c +@@ -1899,8 +1899,6 @@ int main(int argc, char **argv) + .debug_file = NULL, + }; + +- radlog_init(&radclient_log, false); +- + /* + * We probably don't want to free the talloc autofree context + * directly, so we'll allocate a new context beneath it, and +@@ -1938,6 +1936,8 @@ int main(int argc, char **argv) + break; + case 'q': + do_output = 0; ++ radclient_log.dst = L_DST_NULL; ++ radclient_log.fd = 0; + break; + case 'x': + rad_debug_lvl++; +@@ -2013,6 +2013,8 @@ int main(int argc, char **argv) + usage(); + } + ++ radlog_init(&radclient_log, false); ++ + /* Prepare the timeout. */ + rc_float_to_timeval(&tv_timeout, timeout); + +-- +2.23.0 + diff --git a/freeradius.spec b/freeradius.spec index 2748c14..8bfb849 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -4,7 +4,7 @@ Name: freeradius Version: 3.0.15 -Release: 22 +Release: 23 Summary: Remote Authentication Dial-In User Service License: GPLv2+ and LGPLv2+ @@ -22,6 +22,7 @@ Patch6002: CVE-2019-10143.patch Patch6003: remove-unused-arguement.patch Patch6004: backport-CVE-2019-13456.patch Patch6005: CVE-2019-17185.patch +Patch6006: Fix-radeapclient-option-q.patch BuildRequires: autoconf gdbm-devel openssl openssl-devel pam-devel zlib-devel net-snmp-devel BuildRequires: net-snmp-utils readline-devel libpcap-devel systemd-units libtalloc-devel @@ -437,6 +438,9 @@ exit 0 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/ldap %changelog +* Thu Mar 11 2021 lingsheng - 3.0.15-23 +- Fix radeapclient option -q + * Mon Jan 18 2021 wangxiao - 3.0.15-22 - fix CVE-2019-17185