From fdf9660842848c00fc06a9e342c4a4fee5ca97b9 Mon Sep 17 00:00:00 2001 From: eaglegai Date: Fri, 14 Feb 2025 07:40:30 +0000 Subject: [PATCH] fix up parsing in radiusclient.conf (cherry picked from commit 32c94de8ae108bce46acb3c1c1f7111118aac880) --- ...xing-up-parsing-in-radiusclient.conf.patch | 49 +++++++++++++++++++ ppp.spec | 11 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 backport-Fixing-up-parsing-in-radiusclient.conf.patch diff --git a/backport-Fixing-up-parsing-in-radiusclient.conf.patch b/backport-Fixing-up-parsing-in-radiusclient.conf.patch new file mode 100644 index 0000000..a898e25 --- /dev/null +++ b/backport-Fixing-up-parsing-in-radiusclient.conf.patch @@ -0,0 +1,49 @@ +From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001 +From: Eivind Naess +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 +--- + 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!"); diff --git a/ppp.spec b/ppp.spec index ff16602..4eec6b3 100644 --- a/ppp.spec +++ b/ppp.spec @@ -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 - 2.4.9-7 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:backport upstream + Fixing up parsing in radiusclient.conf + * Mon Sep 11 2023 xingwei - 2.4.9-6 - Type:bugfix - ID:NA -- Gitee