!24 [sync] PR-20: 回合社区补丁

From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504

0003-acl_nfs4_get_who-removed-an-always-false-evaluate-wa.patch

@@ -0,0 +1,26 @@
+From 09668147a05b45ba0e1134b6ddd2be28cadfbc11 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Thu, 16 Jun 2022 16:24:19 -0400
+Subject: [PATCH] acl_nfs4_get_who: removed an always false evaluate warning
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ libnfs4acl/acl_nfs4_get_who.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnfs4acl/acl_nfs4_get_who.c b/libnfs4acl/acl_nfs4_get_who.c
+index 695db2e..3e2fd7c 100644
+--- a/libnfs4acl/acl_nfs4_get_who.c
++++ b/libnfs4acl/acl_nfs4_get_who.c
+@@ -49,7 +49,7 @@ int acl_nfs4_get_who(struct nfs4_ace* ace, int* type, char** who)
+ 	char* iwho = NULL;
+ 	int wholen;
+ 
+-	if (ace == NULL || ace->who == NULL)
++	if (ace == NULL)
+ 		goto inval_failed;
+ 
+ 	itype = acl_nfs4_get_whotype(ace->who);
+-- 
+2.39.2
+

nfs4-acl-tools.spec

@@ -1,6 +1,6 @@
 Name:           nfs4-acl-tools
 Version:        0.3.7
-Release:        5
+Release:        6
 Summary:        The nfs4 ACL tools
 License:        BSD or GPLv2+ or LGPLv2.1
 URL:            http://www.citi.umich.edu/projects/nfsv4/linux/
@@ -10,6 +10,7 @@ BuildRequires: libtool libattr-devel
 
 Patch1:        0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch
 Patch2:        0002-build-do-not-generate-aclocal.m4.patch
+Patch3:        0003-acl_nfs4_get_who-removed-an-always-false-evaluate-wa.patch
 
 %description
 It contains commandline NFSv4 ACL tools, which deal directly with NFSv4 ACLs.
@@ -45,6 +46,9 @@ make DESTDIR=%{buildroot} install
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jul 30 2024 wuguanghao <wuguanghao3@huawei.com> - 0.3.7-6
+- acl_nfs4_get_who: removed an always false evaluate warning
+
 * Tue Oct 18 2022 zhanchengbin <zhanchengbin1@huawei.com> - 0.3.7-5
 - license: fix license error.