chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
firstboot: don't prohibit re-generating the machine id on the current root fs
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup.c
diff --git
a/src/cryptsetup/cryptsetup.c
b/src/cryptsetup/cryptsetup.c
index 812b32f6cab2e140635e8ca362da817653cd5535..94570eb82d07ac9b836907d86b8cadfb34305176 100644
(file)
--- a/
src/cryptsetup/cryptsetup.c
+++ b/
src/cryptsetup/cryptsetup.c
@@
-175,16
+175,16
@@
static int parse_one_option(const char *option) {
}
static int parse_options(const char *options) {
}
static int parse_options(const char *options) {
- c
har *state, *w
;
+ c
onst char *word, *state
;
size_t l;
int r;
assert(options);
size_t l;
int r;
assert(options);
- FOREACH_WORD_SEPARATOR(w, l, options, ",", state) {
+ FOREACH_WORD_SEPARATOR(w
ord
, l, options, ",", state) {
_cleanup_free_ char *o;
_cleanup_free_ char *o;
- o = strndup(w, l);
+ o = strndup(w
ord
, l);
if (!o)
return -ENOMEM;
r = parse_one_option(o);
if (!o)
return -ENOMEM;
r = parse_one_option(o);
@@
-344,7
+344,7
@@
static int attach_tcrypt(struct crypt_device *cd,
assert(cd);
assert(name);
assert(cd);
assert(name);
- assert(key_file ||
passwords
);
+ assert(key_file ||
(passwords && passwords[0])
);
if (arg_tcrypt_hidden)
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
if (arg_tcrypt_hidden)
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
@@
-549,13
+549,18
@@
int main(int argc, char *argv[]) {
description = NULL;
}
description = NULL;
}
+ k = 0;
if (mount_point && description)
if (mount_point && description)
- asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point);
+
k =
asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point);
else if (mount_point)
else if (mount_point)
- asprintf(&name_buffer, "%s on %s", argv[2], mount_point);
+
k =
asprintf(&name_buffer, "%s on %s", argv[2], mount_point);
else if (description)
else if (description)
- asprintf(&name_buffer, "%s (%s)", description, argv[2]);
+
k =
asprintf(&name_buffer, "%s (%s)", description, argv[2]);
+ if (k < 0) {
+ log_oom();
+ goto finish;
+ }
name = name_buffer ? name_buffer : argv[2];
k = crypt_init(&cd, argv[3]);
name = name_buffer ? name_buffer : argv[2];
k = crypt_init(&cd, argv[3]);