From: Ray Strode <rstrode@redhat.com>
Date: Thu, 11 May 2017 14:52:30 +0000 (-0400)
Subject: Revert "Make boot.log world readable by default"
X-Git-Tag: 0.9.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fa54b06c70313ecb347cda09dbe549b755a56da;p=thirdparty%2Fplymouth.git

Revert "Make boot.log world readable by default"

This reverts commit fc5cd88767db61805519fef53182386ba56c6405.

It's better to let the admin of the system decide the permissions,
than forcefully change them.
---

diff --git a/src/libply/ply-logger.c b/src/libply/ply-logger.c
index 429e1ff1..1b56ea82 100644
--- a/src/libply/ply-logger.c
+++ b/src/libply/ply-logger.c
@@ -310,8 +310,7 @@ ply_logger_free (ply_logger_t *logger)
 
 bool
 ply_logger_open_file (ply_logger_t *logger,
-                      const char   *filename,
-                      bool          world_readable)
+                      const char   *filename)
 {
         int fd;
         mode_t mode;
@@ -319,21 +318,11 @@ ply_logger_open_file (ply_logger_t *logger,
         assert (logger != NULL);
         assert (filename != NULL);
 
-        if (world_readable)
-                mode = 0644;
-        else
-                mode = 0600;
-
-        fd = open (filename, PLY_LOGGER_OPEN_FLAGS, mode);
+        fd = open (filename, PLY_LOGGER_OPEN_FLAGS, 0600);
 
         if (fd < 0)
                 return false;
 
-        if (fchmod (fd, mode) < 0) {
-                close (fd);
-                return false;
-        }
-
         ply_logger_set_output_fd (logger, fd);
 
         free (logger->filename);
diff --git a/src/libply/ply-logger.h b/src/libply/ply-logger.h
index 545e64cc..53d1ad9d 100644
--- a/src/libply/ply-logger.h
+++ b/src/libply/ply-logger.h
@@ -46,8 +46,7 @@ typedef void (*ply_logger_filter_handler_t) (void         *user_data,
 ply_logger_t *ply_logger_new (void);
 void ply_logger_free (ply_logger_t *logger);
 bool ply_logger_open_file (ply_logger_t *logger,
-                           const char   *filename,
-                           bool          world_readable);
+                           const char   *filename);
 void ply_logger_close_file (ply_logger_t *logger);
 void ply_logger_set_output_fd (ply_logger_t *logger,
                                int           fd);
@@ -108,7 +107,7 @@ bool ply_logger_is_tracing_enabled (ply_logger_t *logger);
 /* convenience macros
  */
 #define ply_open_log_file(filename)                                            \
-        ply_logger_open_file (ply_logger_get_default (), filename, false)
+        ply_logger_open_file (ply_logger_get_default (), filename)
 #define ply_close_log_file()                                                   \
         ply_logger_close_file (ply_logger_get_default ())
 #define ply_flush_log()                                                        \
diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
index a697b8fa..7c2cf078 100644
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -555,7 +555,7 @@ ply_terminal_session_open_log (ply_terminal_session_t *session,
 
         ply_save_errno ();
         unlink (filename);
-        log_is_opened = ply_logger_open_file (session->logger, filename, true);
+        log_is_opened = ply_logger_open_file (session->logger, filename);
         if (log_is_opened)
                 ply_logger_flush (session->logger);
         ply_restore_errno ();