mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
fileio: add new flag WRITE_STRING_FILE_MODE_0444
With this write_string_file() will create the file with 0444 access mode (i.e. read-only).
This commit is contained in:
@@ -200,6 +200,19 @@ int write_string_stream_ts(
|
||||
return 0;
|
||||
}
|
||||
|
||||
static mode_t write_string_file_flags_to_mode(WriteStringFileFlags flags) {
|
||||
|
||||
/* We support three different modes, that are the ones that really make sense for text files like this:
|
||||
*
|
||||
* → 0600 (i.e. root-only)
|
||||
* → 0444 (i.e. read-only)
|
||||
* → 0644 (i.e. writable for root, readable for everyone else)
|
||||
*/
|
||||
|
||||
return FLAGS_SET(flags, WRITE_STRING_FILE_MODE_0600) ? 0600 :
|
||||
FLAGS_SET(flags, WRITE_STRING_FILE_MODE_0444) ? 0444 : 0644;
|
||||
}
|
||||
|
||||
static int write_string_file_atomic_at(
|
||||
int dir_fd,
|
||||
const char *fn,
|
||||
@@ -225,7 +238,7 @@ static int write_string_file_atomic_at(
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = fchmod_umask(fileno(f), FLAGS_SET(flags, WRITE_STRING_FILE_MODE_0600) ? 0600 : 0644);
|
||||
r = fchmod_umask(fileno(f), write_string_file_flags_to_mode(flags));
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
@@ -288,7 +301,7 @@ int write_string_file_ts_at(
|
||||
(FLAGS_SET(flags, WRITE_STRING_FILE_CREATE) ? O_CREAT : 0) |
|
||||
(FLAGS_SET(flags, WRITE_STRING_FILE_TRUNCATE) ? O_TRUNC : 0) |
|
||||
(FLAGS_SET(flags, WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL) ? O_RDWR : O_WRONLY),
|
||||
(FLAGS_SET(flags, WRITE_STRING_FILE_MODE_0600) ? 0600 : 0666));
|
||||
write_string_file_flags_to_mode(flags));
|
||||
if (fd < 0) {
|
||||
r = -errno;
|
||||
goto fail;
|
||||
|
||||
@@ -26,7 +26,8 @@ typedef enum {
|
||||
WRITE_STRING_FILE_NOFOLLOW = 1 << 8,
|
||||
WRITE_STRING_FILE_MKDIR_0755 = 1 << 9,
|
||||
WRITE_STRING_FILE_MODE_0600 = 1 << 10,
|
||||
WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL = 1 << 11,
|
||||
WRITE_STRING_FILE_MODE_0444 = 1 << 11,
|
||||
WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL = 1 << 12,
|
||||
|
||||
/* And before you wonder, why write_string_file_atomic_label_ts() is a separate function instead of just one
|
||||
more flag here: it's about linking: we don't want to pull -lselinux into all users of write_string_file()
|
||||
|
||||
Reference in New Issue
Block a user