!31 Fix radeapclient option -q

From: @ultra_planet
Reviewed-by: @si-gui,@small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-03-11 17:37:42 +08:00 committed by Gitee
commit 89e3079fde
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From 8a6cdf29ea6427cd8e96c00bc3d03abe1a67e8a3 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
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

View File

@ -4,7 +4,7 @@
Name: freeradius
Version: 3.0.21
Release: 4
Release: 5
Summary: Remote Authentication Dial-In User Service
License: GPLv2+ and LGPLv2+
@ -16,6 +16,7 @@ Source3: freeradius-pam-conf
Source4: freeradius-tmpfiles.conf
Patch0000: remove-unused-arguement.patch
Patch0001: Fix-radeapclient-option-q.patch
# patch for backport CVE
BuildRequires: autoconf gdbm-devel openssl openssl-devel pam-devel zlib-devel net-snmp-devel
@ -440,6 +441,9 @@ exit 0
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/ldap
%changelog
* Thu Mar 11 2021 lingsheng <lingsheng@huawei.com> - 3.0.21-5
* Fix radeapclient option -q
* Thu Feb 25 2021 lingsheng <lingsheng@huawei.com> - 3.0.21-4
- Fix file conflicts in freeradius-mysql and freeradius-postgresql