chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck: use _cleanup_close_pair_ where appropriate
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup.c
diff --git
a/src/cryptsetup/cryptsetup.c
b/src/cryptsetup/cryptsetup.c
index 15dea7b65b47b1c25ad2bfbf4bac312b5b51b0aa..9e0fef7c6a740dddaf0ed593b789a5ada2d159c6 100644
(file)
--- a/
src/cryptsetup/cryptsetup.c
+++ b/
src/cryptsetup/cryptsetup.c
@@
-32,7
+32,6
@@
#include "path-util.h"
#include "strv.h"
#include "ask-password-api.h"
#include "path-util.h"
#include "strv.h"
#include "ask-password-api.h"
-#include "def.h"
#include "libudev.h"
#include "udev-util.h"
#include "libudev.h"
#include "udev-util.h"
@@
-69,7
+68,7
@@
static int parse_one_option(const char *option) {
assert(option);
/* Handled outside of this tool */
assert(option);
/* Handled outside of this tool */
- if (
streq(option, "noauto") || streq(option, "no
fail"))
+ if (
STR_IN_SET(option, "noauto", "auto", "nofail", "
fail"))
return 0;
if (startswith(option, "cipher=")) {
return 0;
if (startswith(option, "cipher=")) {
@@
-295,7
+294,7
@@
static int get_password(const char *name, usec_t until, bool accept_cached, char
if (!escaped_name)
return log_oom();
if (!escaped_name)
return log_oom();
- id = str
append
a("cryptsetup:", escaped_name);
+ id = str
join
a("cryptsetup:", escaped_name);
r = ask_password_auto(text, "drive-harddisk", id, until, accept_cached, passwords);
if (r < 0)
r = ask_password_auto(text, "drive-harddisk", id, until, accept_cached, passwords);
if (r < 0)
@@
-309,7
+308,7
@@
static int get_password(const char *name, usec_t until, bool accept_cached, char
if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0)
return log_oom();
if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0)
return log_oom();
- id = str
append
a("cryptsetup-verification:", escaped_name);
+ id = str
join
a("cryptsetup-verification:", escaped_name);
r = ask_password_auto(text, "drive-harddisk", id, until, false, &passwords2);
if (r < 0)
r = ask_password_auto(text, "drive-harddisk", id, until, false, &passwords2);
if (r < 0)
@@
-624,7
+623,7
@@
int main(int argc, char *argv[]) {
/* Ideally we'd do this on the open fd, but since this is just a
* warning it's OK to do this in two steps. */
/* Ideally we'd do this on the open fd, but since this is just a
* warning it's OK to do this in two steps. */
- if (stat(key_file, &st) >= 0 && (st.st_mode & 0005))
+ if (stat(key_file, &st) >= 0 &&
S_ISREG(st.st_mode) &&
(st.st_mode & 0005))
log_warning("Key file %s is world-readable. This is not a good idea!", key_file);
}
log_warning("Key file %s is world-readable. This is not a good idea!", key_file);
}