041eacc63c
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libselinux-3.2..32611aea6543 -- libselinux
Related: rhbz#1938789
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From d23421c65a4e53bef900d9e015833015fa123765 Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||
Date: Mon, 3 May 2021 17:10:40 +0200
|
||
Subject: [PATCH] libselinux: selinux_file_context_cmp(): do not discard const
|
||
qualifier
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
matchpathcon.c: In function ‘selinux_file_context_cmp’:
|
||
matchpathcon.c:487:18: warning: cast discards ‘const’ qualifier from pointer target type [-Wcast-qual]
|
||
487 | rest_a = strchr((char *)a, ':');
|
||
| ^
|
||
matchpathcon.c:488:18: warning: cast discards ‘const’ qualifier from pointer target type [-Wcast-qual]
|
||
488 | rest_b = strchr((char *)b, ':');
|
||
| ^
|
||
|
||
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||
---
|
||
libselinux/src/matchpathcon.c | 6 +++---
|
||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
||
diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c
|
||
index 2ec66650cae0..9e1fab593266 100644
|
||
--- a/libselinux/src/matchpathcon.c
|
||
+++ b/libselinux/src/matchpathcon.c
|
||
@@ -477,15 +477,15 @@ void matchpathcon_checkmatches(char *str __attribute__((unused)))
|
||
int selinux_file_context_cmp(const char * a,
|
||
const char * b)
|
||
{
|
||
- char *rest_a, *rest_b; /* Rest of the context after the user */
|
||
+ const char *rest_a, *rest_b; /* Rest of the context after the user */
|
||
if (!a && !b)
|
||
return 0;
|
||
if (!a)
|
||
return -1;
|
||
if (!b)
|
||
return 1;
|
||
- rest_a = strchr((char *)a, ':');
|
||
- rest_b = strchr((char *)b, ':');
|
||
+ rest_a = strchr(a, ':');
|
||
+ rest_b = strchr(b, ':');
|
||
if (!rest_a && !rest_b)
|
||
return 0;
|
||
if (!rest_a)
|
||
--
|
||
2.32.0
|
||
|