746410eb7a
- virnetsshsession: Adapt to change libssh2 API - selinux: Reflect context_str() type change - Revert "selinux: adapt to libselinux" - selinux: adapt to libselinux - fix error in printf format string Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 3c976f792656d514ef5ba649989144148b47f440)
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From 77403dd65dad4cc81a7f237642ff40d87479ae73 Mon Sep 17 00:00:00 2001
|
|
From: mayunlong <mayunlong6@huawei.com>
|
|
Date: Wed, 9 Aug 2023 21:03:21 +0800
|
|
Subject: [PATCH] selinux: Reflect context_str() type change
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
As of [1]. libselinux changed the type of context_str() - it now
|
|
returns a const string. Follow this change in our code base.
|
|
|
|
1: https://github.com/SELinuxProject/selinux/commit/dd98fa322766760c4e1f029cf19d2515a583304f
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/security/security_selinux.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
|
|
index c91c7ca484..cb4dc3e101 100644
|
|
--- a/src/security/security_selinux.c
|
|
+++ b/src/security/security_selinux.c
|
|
@@ -541,7 +541,7 @@ static char *
|
|
virSecuritySELinuxContextAddRange(char *src,
|
|
char *dst)
|
|
{
|
|
- char *str = NULL;
|
|
+ const char *str = NULL;
|
|
char *ret = NULL;
|
|
context_t srccon = NULL;
|
|
context_t dstcon = NULL;
|
|
@@ -582,7 +582,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext,
|
|
{
|
|
context_t context = NULL;
|
|
char *ret = NULL;
|
|
- char *str;
|
|
+ const char *str;
|
|
char *ourSecContext = NULL;
|
|
context_t ourContext = NULL;
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|