daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From d066c82a5a5c63c50617be27409ae0bb4bd3a356 Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
923a60
Date: Sat, 14 Mar 2015 22:35:30 -0400
923a60
Subject: [PATCH] cryptsetup-generator: remove warning about crypttab access
923a60
 mode
923a60
MIME-Version: 1.0
923a60
Content-Type: text/plain; charset=UTF-8
923a60
Content-Transfer-Encoding: 8bit
923a60
923a60
This file contains no privileged data — just names of devices to decrypt
923a60
and files containing keys. On a running system most of this can be inferred from
923a60
the device tree anyway.
923a60
923a60
(cherry picked from commit 71e4e1258436e7e81d772aed52a02bb5d9c87cb8)
923a60
---
923a60
 src/cryptsetup/cryptsetup-generator.c | 7 -------
923a60
 1 file changed, 7 deletions(-)
923a60
923a60
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
923a60
index dfbca8754f..d191def5f8 100644
923a60
--- a/src/cryptsetup/cryptsetup-generator.c
923a60
+++ b/src/cryptsetup/cryptsetup-generator.c
923a60
@@ -377,13 +377,6 @@ static int add_crypttab_devices(void) {
923a60
                 return 0;
923a60
         }
923a60
 
923a60
-        /* If we readd support for specifying passphrases
923a60
-         * directly in crypttab we should upgrade the warning
923a60
-         * below, though possibly only if a passphrase is
923a60
-         * specified directly. */
923a60
-        if (st.st_mode & 0005)
923a60
-                log_debug("/etc/crypttab is world-readable. This is usually not a good idea.");
923a60
-
923a60
         for (;;) {
923a60
                 int r, k;
923a60
                 char line[LINE_MAX], *l, *uuid;