X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=3961d5d965425fc6d9233efd58a9b5c8e17bac68;hp=a48b7a45626abad773f2cf7c92871e0eafb13e59;hb=d2e54fae5ca7a0f71b5ac8b356a589ff0a09ea0a;hpb=b4d0195b0598df76d30f006507fa8466f5a5d330 diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index a48b7a456..3961d5d96 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -6,16 +6,16 @@ Copyright 2010 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . ***/ @@ -26,6 +26,7 @@ #include "log.h" #include "util.h" #include "unit-name.h" +#include "mkdir.h" const char *arg_dest = "/tmp"; @@ -75,39 +76,46 @@ static int create_disk( noauto = has_option(options, "noauto"); nofail = has_option(options, "nofail"); - if (!(n = unit_name_build_escape("cryptsetup", name, ".service"))) { + n = unit_name_build_escape("cryptsetup", name, ".service"); + if (!n) { r = -ENOMEM; log_error("Failed to allocate unit name."); goto fail; } - if (asprintf(&p, "%s/%s", arg_dest, n) < 0) { + p = join(arg_dest, "/", n, NULL); + if (!p) { r = -ENOMEM; log_error("Failed to allocate unit file name."); goto fail; } - if (!(u = fstab_node_to_udev_node(device))) { + u = fstab_node_to_udev_node(device); + if (!u) { r = -ENOMEM; log_error("Failed to allocate device node."); goto fail; } - if (!(d = unit_name_from_path(u, ".device"))) { + d = unit_name_from_path(u, ".device"); + if (!d) { r = -ENOMEM; log_error("Failed to allocate device name."); goto fail; } - if (!(f = fopen(p, "wxe"))) { + f = fopen(p, "wxe"); + if (!f) { r = -errno; log_error("Failed to create unit file: %m"); goto fail; } fprintf(f, + "# Automatically generated by systemd-cryptsetup-generator\n\n" "[Unit]\n" "Description=Cryptography Setup for %%I\n" + "SourcePath=/etc/crypttab\n" "Conflicts=umount.target\n" "DefaultDependencies=no\n" "BindTo=%s dev-mapper-%%i.device\n" @@ -122,11 +130,9 @@ static int create_disk( if (password && (streq(password, "/dev/urandom") || streq(password, "/dev/random") || streq(password, "/dev/hw_random"))) - fprintf(f, - "After=systemd-random-seed-load.service\n"); + fputs("After=systemd-random-seed-load.service\n", f); else - fprintf(f, - "Before=local-fs.target\n"); + fputs("Before=local-fs.target\n", f); fprintf(f, "\n[Service]\n" @@ -163,13 +169,13 @@ static int create_disk( if (!noauto) { - if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) { + to = join(arg_dest, "/", d, ".wants/", n, NULL); + if (!to) { r = -ENOMEM; goto fail; } - mkdir_parents(to, 0755); - + mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { log_error("Failed to create symlink '%s' to '%s': %m", from, to); r = -errno; @@ -177,38 +183,35 @@ static int create_disk( } free(to); - to = NULL; if (!nofail) - asprintf(&to, "%s/cryptsetup.target.requires/%s", arg_dest, n); + to = join(arg_dest, "/cryptsetup.target.requires/", n, NULL); else - asprintf(&to, "%s/cryptsetup.target.wants/%s", arg_dest, n); - + to = join(arg_dest, "/cryptsetup.target.wants/", n, NULL); if (!to) { r = -ENOMEM; goto fail; } - mkdir_parents(to, 0755); - + mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { log_error("Failed to create symlink '%s' to '%s': %m", from, to); r = -errno; goto fail; } - } - free(to); - to = NULL; + free(to); + to = NULL; + } e = unit_name_escape(name); - if (asprintf(&to, "%s/dev-mapper-%s.device.requires/%s", arg_dest, e, n) < 0) { + to = join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); + if (!to) { r = -ENOMEM; goto fail; } - mkdir_parents(to, 0755); - + mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { log_error("Failed to create symlink '%s' to '%s': %m", from, to); r = -errno; @@ -237,21 +240,22 @@ int main(int argc, char *argv[]) { int r = EXIT_SUCCESS; unsigned n = 0; - if (argc > 2) { - log_error("This program takes one or no arguments."); + if (argc > 1 && argc != 4) { + log_error("This program takes three or no arguments."); return EXIT_FAILURE; } if (argc > 1) arg_dest = argv[1]; - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); + log_set_target(LOG_TARGET_SAFE); log_parse_environment(); log_open(); umask(0022); - if (!(f = fopen("/etc/crypttab", "re"))) { + f = fopen("/etc/crypttab", "re"); + if (!f) { if (errno == ENOENT) r = EXIT_SUCCESS; @@ -268,7 +272,7 @@ int main(int argc, char *argv[]) { char *name = NULL, *device = NULL, *password = NULL, *options = NULL; int k; - if (!(fgets(line, sizeof(line), f))) + if (!fgets(line, sizeof(line), f)) break; n++; @@ -277,7 +281,8 @@ int main(int argc, char *argv[]) { if (*l == '#' || *l == 0) continue; - if ((k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options)) < 2 || k > 4) { + k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); + if (k < 2 || k > 4) { log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); r = EXIT_FAILURE; goto next;