!21 [sync] PR-20: 修复userproxxy测试BUG

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2023-10-16 02:59:45 +00:00 committed by Gitee
commit 519adcbc69
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From f52e60fad1e202a8f9c06ec6ce8bada69c62c93c Mon Sep 17 00:00:00 2001
From: Kai Zhang <zhangkai@iscas.ac.cn>
Date: Wed, 6 Sep 2023 21:41:15 +0800
Subject: [PATCH] tests: fix userproxytest missed NULL argument pointer
Execv syscall needs the argument array of pointers must
be terminated by a null pointer, otherwise the garbage
data might break the test.
Signed-off-by: Kai Zhang <zhangkai@iscas.ac.cn>
---
tests/userproxytest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/userproxytest.c b/tests/userproxytest.c
index d035c8f..8aea41a 100644
--- a/tests/userproxytest.c
+++ b/tests/userproxytest.c
@@ -17,7 +17,8 @@ char *srv_args[] = {
"-u", "-i",
"-d", "--debug-level=1",
"-s", "./testdir/userproxytest.sock",
- "--idle-timeout=3"
+ "--idle-timeout=3",
+ NULL
};
int mock_activation_sockets(void)
--
2.40.1

View File

@ -7,7 +7,7 @@
Name: gssproxy Name: gssproxy
Version: 0.9.1 Version: 0.9.1
Release: 3 Release: 4
Summary: GSSAPI Proxy Summary: GSSAPI Proxy
License: MIT License: MIT
URL: https://github.com/gssapi/gssproxy URL: https://github.com/gssapi/gssproxy
@ -15,6 +15,7 @@ Source0: https://github.com/gssapi/%{name}/releases/download/v%{version}/%{name}
Patch1: backport-Typo-doc-fix.patch Patch1: backport-Typo-doc-fix.patch
Patch2: backport-More-typo-fixes-to-silence-Debian-lintian-typo-in-ma.patch Patch2: backport-More-typo-fixes-to-silence-Debian-lintian-typo-in-ma.patch
Patch3: backport-tests-fix-userproxytest-missed-NULL-argument-pointer.patch
Requires: krb5 keyutils libverto-module-base libini_config Requires: krb5 keyutils libverto-module-base libini_config
Requires(post): systemd Requires(post): systemd
@ -113,6 +114,9 @@ mkdir -p %{buildroot}%{gpstatedir}/rcache
%{_mandir}/man8/gssproxy-mech.8* %{_mandir}/man8/gssproxy-mech.8*
%changelog %changelog
* Fri Sep 8 2023 laokz <zhangkai@iscas.ac.cn> - 0.9.1-4
- backport upstream patch to fix userproxytest bug
* Fri Jul 7 2023 yixiangzhike <yixiangzhike007@163.com> - 0.9.1-3 * Fri Jul 7 2023 yixiangzhike <yixiangzhike007@163.com> - 0.9.1-3
- enable make check - enable make check