packages/freeradius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!38 Add missing backslash that precluded server from starting

Browse Source 
From: @ultra_planet
Reviewed-by: @si-gui,@small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-04-26 19:49:44 +08:00 committed by Gitee
commit f19ab4c9a1
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Add-missing-backslash-that-precluded-server-from-starting.patch Normal file
View File

@ -0,0 +1,28 @@
From eef366956e2e4a689ab33a0d1f265eb15f749d8d Mon Sep 17 00:00:00 2001
From: Alejandro Perez <alex.perez-mendez@jisc.ac.uk>
Date: Mon, 6 Apr 2020 15:52:38 +0200
Subject: [PATCH] Add missing backslash that precluded server from starting
Server did not start, because it found an unterminated string. Adding the previous-existing backslash fixed it.
```
including configuration file /etc/raddb/mods-config/sql/main/postgresql/queries.conf
/etc/raddb/mods-config/sql/main/postgresql/queries.conf[505]: Parse error: Unterminated string
Errors reading or parsing /etc/raddb/radiusd.conf
```
---
raddb/mods-config/sql/main/postgresql/queries.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index da82467aea5..b868238306a 100644
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -502,7 +502,7 @@ accounting {
FramedInterfaceId = NULLIF('%{Framed-Interface-Id}', ''), \
DelegatedIPv6Prefix = NULLIF('%{Delegated-IPv6-Prefix}', '')::inet, \
AcctUpdateTime = ${....event_timestamp}, \
- AcctSessionTime = COALESCE(%{%{Acct-Session-Time}:-NULL},
+ AcctSessionTime = COALESCE(%{%{Acct-Session-Time}:-NULL}, \
(${....event_timestamp_epoch} - EXTRACT(EPOCH FROM(AcctStartTime)))), \
AcctInputOctets = (('%{%{Acct-Input-Gigawords}:-0}'::bigint << 32) + \
'%{%{Acct-Input-Octets}:-0}'::bigint), \

6
freeradius.spec
View File

@ -4,7 +4,7 @@
Name: freeradius
Version: 3.0.21
Release: 5
Release: 6
Summary: Remote Authentication Dial-In User Service
License: GPLv2+ and LGPLv2+
@ -17,6 +17,7 @@ Source4: freeradius-tmpfiles.conf
Patch0000: remove-unused-arguement.patch
Patch0001: Fix-radeapclient-option-q.patch
Patch0002: Add-missing-backslash-that-precluded-server-from-starting.patch
# patch for backport CVE
BuildRequires: autoconf gdbm-devel openssl openssl-devel pam-devel zlib-devel net-snmp-devel
@ -441,6 +442,9 @@ exit 0
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/ldap
%changelog
* Mon Apr 26 2021 lingsheng <lingsheng@huawei.com> - 3.0.21-6
- Add missing backslash that precluded server from starting
* Thu Mar 11 2021 lingsheng <lingsheng@huawei.com> - 3.0.21-5
* Fix radeapclient option -q