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

!45 fix -q doesn't work when use with 'unbound-control stats_shm'

Browse Source 
From: @zengwefeng 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-03-23 08:57:21 +00:00 committed by Gitee
commit 44fedbcff2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backport-fix-q-doesnt-work-when-use-with-unbound-control-stats_shm.patch Normal file
View File

@ -0,0 +1,46 @@
From c60bed8eef8962c6f7d8deb266d438ff77baaaf5 Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Fri, 18 Mar 2022 19:08:02 +0800
Subject: [PATCH] fix -q doesn't work when use with 'unbound-control stats_shm'
Signed-off-by: eaglegai <eaglegai@163.com>
---
smallapp/unbound-control.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index c7c38276f..b0835e3e1 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -444,7 +444,7 @@ static void do_stats_shm(struct config_file* cfg, struct ub_stats_info* stats,
#endif /* HAVE_SHMGET */
/** print statistics from shm memory segment */
-static void print_stats_shm(const char* cfgfile)
+static void print_stats_shm(const char* cfgfile, int quiet)
{
#ifdef HAVE_SHMGET
struct config_file* cfg;
@@ -474,8 +474,11 @@ static void print_stats_shm(const char* cfgfile)
fatal_exit("shmat(%d): %s", id_arr, strerror(errno));
}
- /* print the stats */
- do_stats_shm(cfg, stats, shm_stat);
+
+ if (!quiet) {
+ /* print the stats */
+ do_stats_shm(cfg, stats, shm_stat);
+ }
/* shutdown */
shmdt(shm_stat);
@@ -987,7 +990,7 @@ int main(int argc, char* argv[])
#endif
}
if(argc >= 1 && strcmp(argv[0], "stats_shm")==0) {
- print_stats_shm(cfgfile);
+ print_stats_shm(cfgfile, quiet);
return 0;
}
check_args_for_listcmd(argc, argv);

9
unbound.spec
View File

@ -2,7 +2,7 @@
Name: unbound
Version: 1.11.0
Release: 4
Release: 5
Summary: Unbound is a validating, recursive, caching DNS resolver
License: BSD
Url: https://nlnetlabs.nl/projects/unbound/about/
@ -25,6 +25,7 @@ Patch0: CVE-2020-28935.patch
Patch6000: backport-fix-610-undefine-shift-in-sldns_str2wire_hip_buf.patch
Patch6001: backport-fix-for-611-integer-overflow-in-sldns_wire2str_pkt_s.patch
Patch6002: backport-fix-q-doesnt-work-when-use-with-unbound-control-stats_shm.patch
BuildRequires: make flex swig pkgconfig systemd python-unversioned-command
BuildRequires: libevent-devel expat-devel openssl-devel python3-devel
@ -230,6 +231,12 @@ popd
%{_mandir}/man*
%changelog
* Wed Mar 23 2022 zengweifeng<zwfeng@huawei.com> - 1.11.0-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix -q doesn't work when use with 'unbound-control stats_shm'
* Mon Feb 07 2022 jiangheng<jiangheng12@huawei.com> - 1.11.0-4
- Type:bugfix
- ID:NA