From 1e0dcd6fa1abea9c561f46556f7f7561b2a46e62 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Jul 2020 11:53:22 +0200
Subject: [PATCH] fileio: add explicit flag for generating world executable
 warning when reading file

(cherry picked from commit 684aa979f1c4ce5f75ccdc131f32fc0434999918)

Signed-off-by: Guorui Yu <GuoRui.Yu@linux.alibaba.com>
---
 src/basic/fileio.c | 2 +-
 src/basic/fileio.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index bb804e3afa..833c55b030 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -420,7 +420,7 @@ int read_full_stream_full(
                         if (st.st_size > 0)
                                 n_next = st.st_size + 1;
 
-                        if (flags & READ_FULL_FILE_SECURE)
+                        if (flags & READ_FULL_FILE_WARN_WORLD_READABLE)
                                 (void) warn_file_is_world_accessible(filename, &st, NULL, 0);
                 }
         }
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 3e572dc0de..be10ac77b6 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -26,7 +26,8 @@ typedef enum {
 } WriteStringFileFlags;
 
 typedef enum {
-        READ_FULL_FILE_SECURE = 1 << 0,
+        READ_FULL_FILE_SECURE              = 1 << 0,
+        READ_FULL_FILE_WARN_WORLD_READABLE = 1 << 3,
 } ReadFullFileFlags;
 
 int write_string_stream_ts(FILE *f, const char *line, WriteStringFileFlags flags, struct timespec *ts);
-- 
2.39.1