3bf271807e
1.maint-avoid-new-warning-about-deprecated-security_co.patch 2.maint-update-obsolete-constructs-in-configure.ac.patch 3.sed-avoid-potential-double-fclose.patch 4.sed-fix-temp-file-cleanup.patch 5.adapt sed-c-flag.patch Signed-off-by: laotan2 <tanjinghui1@huawei.com> (cherry picked from commit 805226fb095690044748f410acf3df9778c94069)
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 9cfcd061737955b7732585bbd5e4bf2c934dd52f Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@fb.com>
|
|
Date: Sat, 10 Jul 2021 12:55:38 -0700
|
|
Subject: [PATCH 08/44] maint: avoid new warning about deprecated
|
|
security_context_t
|
|
|
|
* sed/execute.c (open_next_file): Use char * in place of
|
|
deprecated security_context_t.
|
|
---
|
|
sed/execute.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sed/execute.c b/sed/execute.c
|
|
index 10b7296..4862e52 100644
|
|
--- a/sed/execute.c
|
|
+++ b/sed/execute.c
|
|
@@ -572,7 +572,7 @@ open_next_file (const char *name, struct input *input)
|
|
{
|
|
int input_fd;
|
|
char *tmpdir, *p;
|
|
- security_context_t old_fscreatecon;
|
|
+ char *old_fscreatecon;
|
|
int reset_fscreatecon = 0;
|
|
memset (&old_fscreatecon, 0, sizeof (old_fscreatecon));
|
|
|
|
@@ -593,7 +593,7 @@ open_next_file (const char *name, struct input *input)
|
|
|
|
if (is_selinux_enabled () > 0)
|
|
{
|
|
- security_context_t con;
|
|
+ char *con;
|
|
if (lgetfilecon (input->in_file_name, &con) != -1)
|
|
{
|
|
/* Save and restore the old context for the sake of w and W
|
|
--
|
|
2.27.0
|
|
|