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

!55 [sync] PR-54: fix up parsing in radiusclient.conf

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
This commit is contained in:
openeuler-ci-bot 2025-02-14 08:28:09 +00:00 committed by Gitee
commit 729030b271
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
backport-Fixing-up-parsing-in-radiusclient.conf.patch Normal file
View File

@ -0,0 +1,49 @@
From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001
From: Eivind Naess <eivnaes@yahoo.com>
Date: Sun, 23 Apr 2023 11:37:01 -0700
Subject: [PATCH] Closes #411, Fixing up parsing in radiusclient.conf
Adding curly braces to fix the code.
Signed-off-by: Eivind Naess <eivnaes@yahoo.com>
---
pppd/plugins/radius/config.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c
index 39744fca1..e1a481487 100644
--- a/pppd/plugins/radius/config.c
+++ b/pppd/plugins/radius/config.c
@@ -235,24 +235,28 @@ int rc_read_config(char *filename)
switch (option->type) {
case OT_STR:
- if (set_option_str(filename, line, option, p) < 0)
+ if (set_option_str(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
case OT_INT:
- if (set_option_int(filename, line, option, p) < 0)
+ if (set_option_int(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
case OT_SRV:
- if (set_option_srv(filename, line, option, p) < 0)
+ if (set_option_srv(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
case OT_AUO:
- if (set_option_auo(filename, line, option, p) < 0)
+ if (set_option_auo(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
default:
fatal("rc_read_config: impossible case branch!");

11
ppp.spec
View File

@ -1,6 +1,6 @@
Name: ppp
Version: 2.4.9
Release: 6
Release: 7
Summary: The Point-to-Point Protocol
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
@ -48,6 +48,8 @@ Patch0018: backport-pppd-Negotiate-IP-address-when-only-peer-addresses-are-
Patch0019: backport-CVE-2022-4603.patch
Patch0020: backport-add-fclose-operation-to-fix-file-pointer-not-closed.patch
Patch0021: backport-Fixing-up-parsing-in-radiusclient.conf.patch
%description
The Point-to-Point Protocol (PPP) provides a standard way to establish
a network connection over a serial link. At present, this package
@ -142,6 +144,13 @@ mkdir -p %{buildroot}%{_rundir}/lock/ppp
%{_mandir}/man8/*.8.gz
%changelog
* Fri Feb 14 2025 gaihuiying <eaglegai@163.com> - 2.4.9-7
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:backport upstream
Fixing up parsing in radiusclient.conf
* Mon Sep 11 2023 xingwei <xingwei14@h-partners.com> - 2.4.9-6
- Type:bugfix
- ID:NA