import freeradius-3.0.20-11.module+el8.5.0+13640+a9514344
This commit is contained in:
parent
8826a6d860
commit
87cdcf2065
@ -0,0 +1,51 @@
|
|||||||
|
From e2de6fab148e800380f1929fe4ea88a38de42053 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Alan T. DeKok" <aland@freeradius.org>
|
||||||
|
Date: Wed, 20 Nov 2019 13:59:54 -0500
|
||||||
|
Subject: [PATCH] a better fix for commit 30ffd21
|
||||||
|
|
||||||
|
Which still runs post-proxy-type fail if all of the home servers
|
||||||
|
are dead
|
||||||
|
|
||||||
|
[antorres@redhat.com: solved in FR 3.0.21, resolves bz#2030173]
|
||||||
|
[antorres@redhat.com: removed first hunk of commit, already present]
|
||||||
|
---
|
||||||
|
src/main/process.c | 9 +++------
|
||||||
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/main/process.c b/src/main/process.c
|
||||||
|
index c8b3af24e2..1a48517d43 100644
|
||||||
|
--- a/src/main/process.c
|
||||||
|
+++ b/src/main/process.c
|
||||||
|
@@ -2475,13 +2474,12 @@ static int process_proxy_reply(REQUEST *request, RADIUS_PACKET *reply)
|
||||||
|
}
|
||||||
|
|
||||||
|
old_server = request->server;
|
||||||
|
- rad_assert(request->home_server != NULL);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the home server is virtual, just run pre_proxy from
|
||||||
|
* that section.
|
||||||
|
*/
|
||||||
|
- if (request->home_server->server) {
|
||||||
|
+ if (request->home_server && request->home_server->server) {
|
||||||
|
request->server = request->home_server->server;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
@@ -3182,13 +3180,12 @@ do_home:
|
||||||
|
}
|
||||||
|
|
||||||
|
old_server = request->server;
|
||||||
|
- rad_assert(request->home_server != NULL);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the home server is virtual, just run pre_proxy from
|
||||||
|
* that section.
|
||||||
|
*/
|
||||||
|
- if (request->home_server->server) {
|
||||||
|
+ if (request->home_server && request->home_server->server) {
|
||||||
|
request->server = request->home_server->server;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -9,7 +9,7 @@
|
|||||||
Summary: High-performance and highly configurable free RADIUS server
|
Summary: High-performance and highly configurable free RADIUS server
|
||||||
Name: freeradius
|
Name: freeradius
|
||||||
Version: 3.0.20
|
Version: 3.0.20
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://www.freeradius.org/
|
URL: http://www.freeradius.org/
|
||||||
@ -43,6 +43,7 @@ Patch10: freeradius-Fix-resource-hard-limit-error.patch
|
|||||||
Patch11: freeradius-FIPS-exit-if-md5-not-allowed.patch
|
Patch11: freeradius-FIPS-exit-if-md5-not-allowed.patch
|
||||||
Patch12: freeradius-bootstrap-run-only-once.patch
|
Patch12: freeradius-bootstrap-run-only-once.patch
|
||||||
Patch13: freeradius-Fix-unterminated-strings-in-SQL-queries.patch
|
Patch13: freeradius-Fix-unterminated-strings-in-SQL-queries.patch
|
||||||
|
Patch14: freeradius-Fix-segfault-when-home_server-is-null.patch
|
||||||
|
|
||||||
%global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
%global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
@ -244,6 +245,7 @@ This plugin provides the REST support for the FreeRADIUS server project.
|
|||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
%patch12 -p1
|
%patch12 -p1
|
||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
|
%patch14 -p1
|
||||||
|
|
||||||
# Add fixed dhparam file to the source to ensure `make tests` can run.
|
# Add fixed dhparam file to the source to ensure `make tests` can run.
|
||||||
cp %{SOURCE105} raddb/certs/rfc3526-group-18-8192.dhparam
|
cp %{SOURCE105} raddb/certs/rfc3526-group-18-8192.dhparam
|
||||||
@ -894,6 +896,10 @@ exit 0
|
|||||||
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest
|
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 10 2021 Antonio Torres <antorres@redhat.com> - 3.0.20-11
|
||||||
|
- Fix segfault when home_server is null
|
||||||
|
Resolves: bz#2031168
|
||||||
|
|
||||||
* Tue Nov 23 2021 Antonio Torres <antorres@redhat.com> - 3.0.20-10
|
* Tue Nov 23 2021 Antonio Torres <antorres@redhat.com> - 3.0.20-10
|
||||||
- Fix unterminated strings in SQL queries
|
- Fix unterminated strings in SQL queries
|
||||||
Resolves: bz#2025888
|
Resolves: bz#2025888
|
||||||
|
Loading…
Reference in New Issue
Block a user